Selaa lähdekoodia

Mostly tw=80, also a few dockerfile links from update.sh

Joe Ferguson 11 vuotta sitten
vanhempi
sitoutus
c920ff0075

+ 10 - 10
debian/README.md

@@ -1,15 +1,15 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`jessie` (*jessie/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/jessie/Dockerfile)
-- [`oldstable` (*oldstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/oldstable/Dockerfile)
-- [`sid` (*sid/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/sid/Dockerfile)
-- [`6.0.10`, `6.0`, `6`, `squeeze` (*squeeze/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/squeeze/Dockerfile)
-- [`stable` (*stable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/stable/Dockerfile)
-- [`testing` (*testing/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/testing/Dockerfile)
-- [`unstable` (*unstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/unstable/Dockerfile)
-- [`7.6`, `7`, `wheezy`, `latest` (*wheezy/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/c126f932c08746c6be9b287d2f16d1257b6187ec/wheezy/Dockerfile)
-- [`rc-buggy` (*debian/rc-buggy/Dockerfile*)](https://github.com/tianon/dockerfiles/blob/8c304e884f4b5b418dfdae524099ca6081a9c09a/debian/rc-buggy/Dockerfile)
-- [`experimental` (*debian/experimental/Dockerfile*)](https://github.com/tianon/dockerfiles/blob/8c304e884f4b5b418dfdae524099ca6081a9c09a/debian/experimental/Dockerfile)
+- [`jessie` (*jessie/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/jessie/Dockerfile)
+- [`oldstable` (*oldstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/oldstable/Dockerfile)
+- [`sid` (*sid/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/sid/Dockerfile)
+- [`6.0.10`, `6.0`, `6`, `squeeze` (*squeeze/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/squeeze/Dockerfile)
+- [`stable` (*stable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/stable/Dockerfile)
+- [`testing` (*testing/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/testing/Dockerfile)
+- [`unstable` (*unstable/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/unstable/Dockerfile)
+- [`7.7`, `7`, `wheezy`, `latest` (*wheezy/Dockerfile*)](https://github.com/tianon/docker-brew-debian/blob/b34a02cb006a698c1b4be59fb1d4ba8eabc502b6/wheezy/Dockerfile)
+- [`rc-buggy` (*debian/rc-buggy/Dockerfile*)](https://github.com/tianon/dockerfiles/blob/7ac078092e6e247b4df508c4838f314a3f749b94/debian/rc-buggy/Dockerfile)
+- [`experimental` (*debian/experimental/Dockerfile*)](https://github.com/tianon/dockerfiles/blob/7ac078092e6e247b4df508c4838f314a3f749b94/debian/experimental/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 20 - 7
jenkins/README.md

@@ -22,7 +22,9 @@ release [http://jenkins-ci.org/](http://jenkins-ci.org/).
 
     docker run -p 8080:8080 jenkins
 
-This will store the workspace in /var/jenkins_home. All Jenkins data lives in there - including plugins and configuration. You will probably want to make that a persistent volume:
+This will store the workspace in /var/jenkins_home. All Jenkins data lives in
+there - including plugins and configuration. You will probably want to make that
+a persistent volume:
 
     docker run --name myjenkins -p 8080:8080 -v /var/jenkins_home jenkins
 
@@ -30,25 +32,36 @@ The volume for the "myjenkins" named container will then be persistent.
 
 You can also bind mount in a volume from the host:
 
-First, ensure that /your/home is accessible by the jenkins user in container (jenkins user - uid 102 normally - or use -u root), then:
+First, ensure that /your/home is accessible by the jenkins user in container
+(jenkins user - uid 102 normally - or use -u root), then:
 
     docker run -p 8080:8080 -v /your/home:/var/jenkins_home jenkins
 
 ## Backing up data
 
-If you bind mount in a volume - you can simply back up that directory (which is jenkins_home) at any time.
+If you bind mount in a volume - you can simply back up that directory (which is
+jenkins_home) at any time.
 
-If your volume is inside a container - you can use `docker cp $ID:/var/jenkins_home` command to extract the data.
+If your volume is inside a container - you can use `docker cp
+$ID:/var/jenkins_home` command to extract the data.
 
 ## Attaching build executors 
 
-You can run builds on the master (out of the box) buf if you want to attach build slave servers: make sure you map the port: `-p 50000:50000` - which will be used when you connect a slave agent.
+You can run builds on the master (out of the box) buf if you want to attach
+build slave servers: make sure you map the port: `-p 50000:50000` - which will
+be used when you connect a slave agent.
 
-[Here](https://registry.hub.docker.com/u/maestrodev/build-agent/) is an example docker container you can use as a build server with lots of good tools installed - which is well worth trying.
+[Here](https://registry.hub.docker.com/u/maestrodev/build-agent/) is an example
+docker container you can use as a build server with lots of good tools installed
+- which is well worth trying.
 
 ## Upgrading
 
-All the data needed is in the /var/jenkins_home directory - so depending on how you manage that - depends on how you upgrade. Generally - you can copy it out - and then "docker pull" the image again - and you will have the latest LTS - you can then start up with -v pointing to that data (/var/jenkins_home) and everything will be as you left it.
+All the data needed is in the /var/jenkins_home directory - so depending on how
+you manage that - depends on how you upgrade. Generally - you can copy it out -
+and then "docker pull" the image again - and you will have the latest LTS - you
+can then start up with -v pointing to that data (/var/jenkins_home) and
+everything will be as you left it.
 
 # User Feedback
 

+ 20 - 7
jenkins/content.md

@@ -11,7 +11,9 @@ release [http://jenkins-ci.org/](http://jenkins-ci.org/).
 
     docker run -p 8080:8080 jenkins
 
-This will store the workspace in /var/jenkins_home. All Jenkins data lives in there - including plugins and configuration. You will probably want to make that a persistent volume:
+This will store the workspace in /var/jenkins_home. All Jenkins data lives in
+there - including plugins and configuration. You will probably want to make that
+a persistent volume:
 
     docker run --name myjenkins -p 8080:8080 -v /var/jenkins_home jenkins
 
@@ -19,22 +21,33 @@ The volume for the "myjenkins" named container will then be persistent.
 
 You can also bind mount in a volume from the host:
 
-First, ensure that /your/home is accessible by the jenkins user in container (jenkins user - uid 102 normally - or use -u root), then:
+First, ensure that /your/home is accessible by the jenkins user in container
+(jenkins user - uid 102 normally - or use -u root), then:
 
     docker run -p 8080:8080 -v /your/home:/var/jenkins_home jenkins
 
 ## Backing up data
 
-If you bind mount in a volume - you can simply back up that directory (which is jenkins_home) at any time.
+If you bind mount in a volume - you can simply back up that directory (which is
+jenkins_home) at any time.
 
-If your volume is inside a container - you can use `docker cp $ID:/var/jenkins_home` command to extract the data.
+If your volume is inside a container - you can use `docker cp
+$ID:/var/jenkins_home` command to extract the data.
 
 ## Attaching build executors 
 
-You can run builds on the master (out of the box) buf if you want to attach build slave servers: make sure you map the port: `-p 50000:50000` - which will be used when you connect a slave agent.
+You can run builds on the master (out of the box) buf if you want to attach
+build slave servers: make sure you map the port: `-p 50000:50000` - which will
+be used when you connect a slave agent.
 
-[Here](https://registry.hub.docker.com/u/maestrodev/build-agent/) is an example docker container you can use as a build server with lots of good tools installed - which is well worth trying.
+[Here](https://registry.hub.docker.com/u/maestrodev/build-agent/) is an example
+docker container you can use as a build server with lots of good tools installed
+- which is well worth trying.
 
 ## Upgrading
 
-All the data needed is in the /var/jenkins_home directory - so depending on how you manage that - depends on how you upgrade. Generally - you can copy it out - and then "docker pull" the image again - and you will have the latest LTS - you can then start up with -v pointing to that data (/var/jenkins_home) and everything will be as you left it.
+All the data needed is in the /var/jenkins_home directory - so depending on how
+you manage that - depends on how you upgrade. Generally - you can copy it out -
+and then "docker pull" the image again - and you will have the latest LTS - you
+can then start up with -v pointing to that data (/var/jenkins_home) and
+everything will be as you left it.

+ 18 - 4
mongo/README.md

@@ -13,9 +13,21 @@ repo](https://github.com/docker-library/official-images).
 
 # What is MongoDB?
 
-MongoDB (from "humongous") is a cross-platform document-oriented database. Classified as a NoSQL database, MongoDB eschews the traditional table-based relational database structure in favor of JSON-like documents with dynamic schemas (MongoDB calls the format BSON), making the integration of data in certain types of applications easier and faster. Released under a combination of the GNU Affero General Public License and the Apache License, MongoDB is free and open-source software.
-
-First developed by the software company 10gen (now MongoDB Inc.) in October 2007 as a component of a planned platform as a service product, the company shifted to an open source development model in 2009, with 10gen offering commercial support and other services. Since then, MongoDB has been adopted as backend software by a number of major websites and services, including Craigslist, eBay, Foursquare, SourceForge, Viacom, and the New York Times, among others. MongoDB is the most popular NoSQL database system.
+MongoDB (from "humongous") is a cross-platform document-oriented database.
+Classified as a NoSQL database, MongoDB eschews the traditional table-based
+relational database structure in favor of JSON-like documents with dynamic
+schemas (MongoDB calls the format BSON), making the integration of data in
+certain types of applications easier and faster. Released under a combination of
+the GNU Affero General Public License and the Apache License, MongoDB is free
+and open-source software.
+
+First developed by the software company 10gen (now MongoDB Inc.) in October 2007
+as a component of a planned platform as a service product, the company shifted
+to an open source development model in 2009, with 10gen offering commercial
+support and other services. Since then, MongoDB has been adopted as backend
+software by a number of major websites and services, including Craigslist, eBay,
+Foursquare, SourceForge, Viacom, and the New York Times, among others. MongoDB
+is the most popular NoSQL database system.
 
 > [wikipedia.org/wiki/MongoDB](https://en.wikipedia.org/wiki/MongoDB)
 
@@ -27,7 +39,9 @@ First developed by the software company 10gen (now MongoDB Inc.) in October 2007
 
     docker run --name some-mongo -d mongo
 
-This image includes `EXPOSE 27017` (the mongo port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate).
+This image includes `EXPOSE 27017` (the mongo port), so standard container
+linking will make it automatically available to the linked containers (as the
+following examples illustrate).
 
 ## connect to it from an application
 

+ 18 - 4
mongo/content.md

@@ -1,8 +1,20 @@
 # What is MongoDB?
 
-MongoDB (from "humongous") is a cross-platform document-oriented database. Classified as a NoSQL database, MongoDB eschews the traditional table-based relational database structure in favor of JSON-like documents with dynamic schemas (MongoDB calls the format BSON), making the integration of data in certain types of applications easier and faster. Released under a combination of the GNU Affero General Public License and the Apache License, MongoDB is free and open-source software.
-
-First developed by the software company 10gen (now MongoDB Inc.) in October 2007 as a component of a planned platform as a service product, the company shifted to an open source development model in 2009, with 10gen offering commercial support and other services. Since then, MongoDB has been adopted as backend software by a number of major websites and services, including Craigslist, eBay, Foursquare, SourceForge, Viacom, and the New York Times, among others. MongoDB is the most popular NoSQL database system.
+MongoDB (from "humongous") is a cross-platform document-oriented database.
+Classified as a NoSQL database, MongoDB eschews the traditional table-based
+relational database structure in favor of JSON-like documents with dynamic
+schemas (MongoDB calls the format BSON), making the integration of data in
+certain types of applications easier and faster. Released under a combination of
+the GNU Affero General Public License and the Apache License, MongoDB is free
+and open-source software.
+
+First developed by the software company 10gen (now MongoDB Inc.) in October 2007
+as a component of a planned platform as a service product, the company shifted
+to an open source development model in 2009, with 10gen offering commercial
+support and other services. Since then, MongoDB has been adopted as backend
+software by a number of major websites and services, including Craigslist, eBay,
+Foursquare, SourceForge, Viacom, and the New York Times, among others. MongoDB
+is the most popular NoSQL database system.
 
 > [wikipedia.org/wiki/MongoDB](https://en.wikipedia.org/wiki/MongoDB)
 
@@ -14,7 +26,9 @@ First developed by the software company 10gen (now MongoDB Inc.) in October 2007
 
     docker run --name some-mongo -d mongo
 
-This image includes `EXPOSE 27017` (the mongo port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate).
+This image includes `EXPOSE 27017` (the mongo port), so standard container
+linking will make it automatically available to the linked containers (as the
+following examples illustrate).
 
 ## connect to it from an application
 

+ 28 - 7
mysql/README.md

@@ -11,9 +11,16 @@ repo](https://github.com/docker-library/official-images).
 
 # What is MySQL?
 
-MySQL is (as of March 2014) the world's second most widely used open-source relational database management system (RDBMS). It is named after co-founder Michael Widenius's daughter, My. The SQL phrase stands for Structured Query Language.
+MySQL is (as of March 2014) the world's second most widely used open-source
+relational database management system (RDBMS). It is named after co-founder
+Michael Widenius's daughter, My. The SQL phrase stands for Structured Query
+Language.
 
-MySQL is a popular choice of database for use in web applications, and is a central component of the widely used LAMP open source web application software stack (and other 'AMP' stacks). LAMP is an acronym for "Linux, Apache, MySQL, Perl/PHP/Python." Free-software-open source projects that require a full-featured database management system often use MySQL.
+MySQL is a popular choice of database for use in web applications, and is a
+central component of the widely used LAMP open source web application software
+stack (and other 'AMP' stacks). LAMP is an acronym for "Linux, Apache, MySQL,
+Perl/PHP/Python." Free-software-open source projects that require a
+full-featured database management system often use MySQL.
 
 Oracle Corporation and/or affiliates own the copyright and trademark for MySQL.
 
@@ -27,7 +34,9 @@ Oracle Corporation and/or affiliates own the copyright and trademark for MySQL.
 
     docker run --name some-mysql -e MYSQL_ROOT_PASSWORD=mysecretpassword -d mysql
 
-This image includes `EXPOSE 3306` (the mysql port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate).
+This image includes `EXPOSE 3306` (the mysql port), so standard container
+linking will make it automatically available to the linked containers (as the
+following examples illustrate).
 
 ## connect to it from an application
 
@@ -39,19 +48,31 @@ This image includes `EXPOSE 3306` (the mysql port), so standard container linkin
 
 ## Environment Variables
 
-The MySQL image uses several environment variables which are easy to miss. While not all the variables are required, they may significantly aid you in using the image.
+The MySQL image uses several environment variables which are easy to miss. While
+not all the variables are required, they may significantly aid you in using the
+image.
 
 ### `MYSQL_ROOT_PASSWORD`
 
-This is the one environment variable that is required for you to use the MySQL image. This environment variable should be what you want to set the root password for MySQL to. In the above example, it is being set to "mysecretpassword".
+This is the one environment variable that is required for you to use the MySQL
+image. This environment variable should be what you want to set the root
+password for MySQL to. In the above example, it is being set to
+"mysecretpassword".
 
 ### `MYSQL_USER`, `MYSQL_PASSWORD`
 
-These optional environment variables are used in conjunction to set both a MySQL user and password, which will subsequently be granted all permissions for the database specified by the optional `MYSQL_DATABASE` variable. Note that if you only have one of these two environment variables, then neither will actually do anything - these two are meant to be used in conjunction with one another.
+These optional environment variables are used in conjunction to set both a MySQL
+user and password, which will subsequently be granted all permissions for the
+database specified by the optional `MYSQL_DATABASE` variable. Note that if you
+only have one of these two environment variables, then neither will actually do
+anything - these two are meant to be used in conjunction with one another.
 
 ### `MYSQL_DATABASE`
 
-This optional environment variable denotes the name of a database to create. If a user/password was supplied (via the `MYSQL_USER` and `MYSQL_PASSWORD` environment variables) then that user account will be granted (`GRANT ALL`) access to this database.
+This optional environment variable denotes the name of a database to create. If
+a user/password was supplied (via the `MYSQL_USER` and `MYSQL_PASSWORD`
+environment variables) then that user account will be granted (`GRANT ALL`)
+access to this database.
 
 # User Feedback
 

+ 28 - 7
mysql/content.md

@@ -1,8 +1,15 @@
 # What is MySQL?
 
-MySQL is (as of March 2014) the world's second most widely used open-source relational database management system (RDBMS). It is named after co-founder Michael Widenius's daughter, My. The SQL phrase stands for Structured Query Language.
+MySQL is (as of March 2014) the world's second most widely used open-source
+relational database management system (RDBMS). It is named after co-founder
+Michael Widenius's daughter, My. The SQL phrase stands for Structured Query
+Language.
 
-MySQL is a popular choice of database for use in web applications, and is a central component of the widely used LAMP open source web application software stack (and other 'AMP' stacks). LAMP is an acronym for "Linux, Apache, MySQL, Perl/PHP/Python." Free-software-open source projects that require a full-featured database management system often use MySQL.
+MySQL is a popular choice of database for use in web applications, and is a
+central component of the widely used LAMP open source web application software
+stack (and other 'AMP' stacks). LAMP is an acronym for "Linux, Apache, MySQL,
+Perl/PHP/Python." Free-software-open source projects that require a
+full-featured database management system often use MySQL.
 
 Oracle Corporation and/or affiliates own the copyright and trademark for MySQL.
 
@@ -16,7 +23,9 @@ Oracle Corporation and/or affiliates own the copyright and trademark for MySQL.
 
     docker run --name some-mysql -e MYSQL_ROOT_PASSWORD=mysecretpassword -d mysql
 
-This image includes `EXPOSE 3306` (the mysql port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate).
+This image includes `EXPOSE 3306` (the mysql port), so standard container
+linking will make it automatically available to the linked containers (as the
+following examples illustrate).
 
 ## connect to it from an application
 
@@ -28,16 +37,28 @@ This image includes `EXPOSE 3306` (the mysql port), so standard container linkin
 
 ## Environment Variables
 
-The MySQL image uses several environment variables which are easy to miss. While not all the variables are required, they may significantly aid you in using the image.
+The MySQL image uses several environment variables which are easy to miss. While
+not all the variables are required, they may significantly aid you in using the
+image.
 
 ### `MYSQL_ROOT_PASSWORD`
 
-This is the one environment variable that is required for you to use the MySQL image. This environment variable should be what you want to set the root password for MySQL to. In the above example, it is being set to "mysecretpassword".
+This is the one environment variable that is required for you to use the MySQL
+image. This environment variable should be what you want to set the root
+password for MySQL to. In the above example, it is being set to
+"mysecretpassword".
 
 ### `MYSQL_USER`, `MYSQL_PASSWORD`
 
-These optional environment variables are used in conjunction to set both a MySQL user and password, which will subsequently be granted all permissions for the database specified by the optional `MYSQL_DATABASE` variable. Note that if you only have one of these two environment variables, then neither will actually do anything - these two are meant to be used in conjunction with one another.
+These optional environment variables are used in conjunction to set both a MySQL
+user and password, which will subsequently be granted all permissions for the
+database specified by the optional `MYSQL_DATABASE` variable. Note that if you
+only have one of these two environment variables, then neither will actually do
+anything - these two are meant to be used in conjunction with one another.
 
 ### `MYSQL_DATABASE`
 
-This optional environment variable denotes the name of a database to create. If a user/password was supplied (via the `MYSQL_USER` and `MYSQL_PASSWORD` environment variables) then that user account will be granted (`GRANT ALL`) access to this database.
+This optional environment variable denotes the name of a database to create. If
+a user/password was supplied (via the `MYSQL_USER` and `MYSQL_PASSWORD`
+environment variables) then that user account will be granted (`GRANT ALL`)
+access to this database.

+ 25 - 8
nginx/README.md

@@ -10,7 +10,13 @@ repo](https://github.com/docker-library/official-images).
 
 # What is Nginx?
 
-Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server). The nginx project started with a strong focus on high concurrency, high performance and low memory usage. It is licensed under the 2-clause BSD-like license and it runs on Linux, BSD variants, Mac OS X, Solaris, AIX, HP-UX, as well as on other *nix flavors. It also has a proof of concept port for Microsoft Windows.
+Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP,
+HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache,
+and a web server (origin server). The nginx project started with a strong focus
+on high concurrency, high performance and low memory usage. It is licensed under
+the 2-clause BSD-like license and it runs on Linux, BSD variants, Mac OS X,
+Solaris, AIX, HP-UX, as well as on other *nix flavors. It also has a proof of
+concept port for Microsoft Window..
 
 > [wikipedia.org/wiki/Nginx](https://en.wikipedia.org/wiki/Nginx)
 
@@ -22,12 +28,16 @@ Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, H
 
     docker run --name some-nginx -v /some/content:/usr/share/nginx/html:ro -d nginx
 
-Alternatively, a simple `Dockerfile` can be used to generate a new image that includes the necessary content (which is a much cleaner solution than the bind mount above):
+Alternatively, a simple `Dockerfile` can be used to generate a new image that
+includes the necessary content (which is a much cleaner solution than the bind
+mount above):
 
     FROM nginx
     COPY static-html-directory /usr/share/nginx/html
 
-Place this file in the same directory as your directory of content ("static-html-directory"), run `docker build -t some-content-nginx .`, then start your container:
+Place this file in the same directory as your directory of content
+("static-html-directory"), run `docker build -t some-content-nginx .`, then
+start your container:
 
     docker run --name some-nginx -d some-content-nginx
 
@@ -35,21 +45,28 @@ Place this file in the same directory as your directory of content ("static-html
 
     docker run --name some-nginx -d -p 8080:80 some-content-nginx
 
-Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your browser.
+Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your
+browser.
 
 ## complex configuration
 
     docker run --name some-nginx -v /some/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
 
-For information on the syntax of the Nginx configuration files, see [the official documentation](http://nginx.org/en/docs/) (specifically the [Beginner's Guide](http://nginx.org/en/docs/beginners_guide.html#conf_structure)).
+For information on the syntax of the Nginx configuration files, see [the
+official documentation](http://nginx.org/en/docs/) (specifically the [Beginner's
+Guide](http://nginx.org/en/docs/beginners_guide.html#conf_structure)).
 
-Be sure to include `daemon off;` in your custom configuration to ensure that Nginx stays in the foreground so that Docker can track the process properly (otherwise your container will stop immediately after starting)!
+Be sure to include `daemon off;` in your custom configuration to ensure that
+Nginx stays in the foreground so that Docker can track the process properly
+(otherwise your container will stop immediately after starting)!
 
-If you wish to adapt the default configuration, use something like the following to copy it from a running Nginx container:
+If you wish to adapt the default configuration, use something like the following
+to copy it from a running Nginx container:
 
     docker cp some-nginx:/etc/nginx/nginx.conf /some/nginx.conf
 
-As above, this can also be accomplished more cleanly using a simple `Dockerfile`:
+As above, this can also be accomplished more cleanly using a simple
+`Dockerfile`:
 
     FROM nginx
     COPY nginx.conf /etc/nginx/nginx.conf

+ 25 - 8
nginx/content.md

@@ -1,6 +1,12 @@
 # What is Nginx?
 
-Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server). The nginx project started with a strong focus on high concurrency, high performance and low memory usage. It is licensed under the 2-clause BSD-like license and it runs on Linux, BSD variants, Mac OS X, Solaris, AIX, HP-UX, as well as on other *nix flavors. It also has a proof of concept port for Microsoft Windows.
+Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP,
+HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache,
+and a web server (origin server). The nginx project started with a strong focus
+on high concurrency, high performance and low memory usage. It is licensed under
+the 2-clause BSD-like license and it runs on Linux, BSD variants, Mac OS X,
+Solaris, AIX, HP-UX, as well as on other *nix flavors. It also has a proof of
+concept port for Microsoft Window..
 
 > [wikipedia.org/wiki/Nginx](https://en.wikipedia.org/wiki/Nginx)
 
@@ -12,12 +18,16 @@ Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, H
 
     docker run --name some-nginx -v /some/content:/usr/share/nginx/html:ro -d nginx
 
-Alternatively, a simple `Dockerfile` can be used to generate a new image that includes the necessary content (which is a much cleaner solution than the bind mount above):
+Alternatively, a simple `Dockerfile` can be used to generate a new image that
+includes the necessary content (which is a much cleaner solution than the bind
+mount above):
 
     FROM nginx
     COPY static-html-directory /usr/share/nginx/html
 
-Place this file in the same directory as your directory of content ("static-html-directory"), run `docker build -t some-content-nginx .`, then start your container:
+Place this file in the same directory as your directory of content
+("static-html-directory"), run `docker build -t some-content-nginx .`, then
+start your container:
 
     docker run --name some-nginx -d some-content-nginx
 
@@ -25,21 +35,28 @@ Place this file in the same directory as your directory of content ("static-html
 
     docker run --name some-nginx -d -p 8080:80 some-content-nginx
 
-Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your browser.
+Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your
+browser.
 
 ## complex configuration
 
     docker run --name some-nginx -v /some/nginx.conf:/etc/nginx/nginx.conf:ro -d nginx
 
-For information on the syntax of the Nginx configuration files, see [the official documentation](http://nginx.org/en/docs/) (specifically the [Beginner's Guide](http://nginx.org/en/docs/beginners_guide.html#conf_structure)).
+For information on the syntax of the Nginx configuration files, see [the
+official documentation](http://nginx.org/en/docs/) (specifically the [Beginner's
+Guide](http://nginx.org/en/docs/beginners_guide.html#conf_structure)).
 
-Be sure to include `daemon off;` in your custom configuration to ensure that Nginx stays in the foreground so that Docker can track the process properly (otherwise your container will stop immediately after starting)!
+Be sure to include `daemon off;` in your custom configuration to ensure that
+Nginx stays in the foreground so that Docker can track the process properly
+(otherwise your container will stop immediately after starting)!
 
-If you wish to adapt the default configuration, use something like the following to copy it from a running Nginx container:
+If you wish to adapt the default configuration, use something like the following
+to copy it from a running Nginx container:
 
     docker cp some-nginx:/etc/nginx/nginx.conf /some/nginx.conf
 
-As above, this can also be accomplished more cleanly using a simple `Dockerfile`:
+As above, this can also be accomplished more cleanly using a simple
+`Dockerfile`:
 
     FROM nginx
     COPY nginx.conf /etc/nginx/nginx.conf

+ 39 - 6
postgres/README.md

@@ -15,9 +15,29 @@ repo](https://github.com/docker-library/official-images).
 
 # What is PostgreSQL?
 
-PostgreSQL, often simply "Postgres", is an object-relational database management system (ORDBMS) with an emphasis on extensibility and standards-compliance. As a database server, its primary function is to store data, securely and supporting best practices, and retrieve it later, as requested by other software applications, be it those on the same computer or those running on another computer across a network (including the Internet). It can handle workloads ranging from small single-machine applications to large Internet-facing applications with many concurrent users. Recent versions also provide replication of the database itself for security and scalability.
-
-PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant and transactional (including most DDL statements) avoiding locking issues using multiversion concurrency control (MVCC), provides immunity to dirty reads and full serializability; handles complex SQL queries using many indexing methods that are not available in other databases; has updateable views and materialized views, triggers, foreign keys; supports functions and stored procedures, and other expandability, and has a large number of extensions written by third parties. In addition to the possibility of working with the major proprietary and open source databases, PostgreSQL supports migration from them, by its extensive standard SQL support and available migration tools. And if proprietary extensions had been used, by its extensibility that can emulate many through some built-in and third-party open source compatibility extensions, such as for Oracle.
+PostgreSQL, often simply "Postgres", is an object-relational database management
+system (ORDBMS) with an emphasis on extensibility and standards-compliance. As a
+database server, its primary function is to store data, securely and supporting
+best practices, and retrieve it later, as requested by other software
+applications, be it those on the same computer or those running on another
+computer across a network (including the Internet). It can handle workloads
+ranging from small single-machine applications to large Internet-facing
+applications with many concurrent users. Recent versions also provide
+replication of the database itself for security and scalability.
+
+PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant
+and transactional (including most DDL statements) avoiding locking issues using
+multiversion concurrency control (MVCC), provides immunity to dirty reads and
+full serializability; handles complex SQL queries using many indexing methods
+that are not available in other databases; has updateable views and materialized
+views, triggers, foreign keys; supports functions and stored procedures, and
+other expandability, and has a large number of extensions written by third
+parties. In addition to the possibility of working with the major proprietary
+and open source databases, PostgreSQL supports migration from them, by its
+extensive standard SQL support and available migration tools. And if proprietary
+extensions had been used, by its extensibility that can emulate many through
+some built-in and third-party open source compatibility extensions, such as for
+Oracle.
 
 > [wikipedia.org/wiki/PostgreSQL](https://en.wikipedia.org/wiki/PostgreSQL)
 
@@ -29,8 +49,13 @@ PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant a
 
     docker run --name some-postgres -d postgres
 
-This image includes `EXPOSE 5432` (the postgres port), so standard container linking will make it automatically available to the linked containers. The default `postgres` user and database are created in the entrypoint with `initdb`.
-> The postgres database is a default database meant for use by users, utilities and third party applications. [postgresql.org/docs](http://www.postgresql.org/docs/9.3/interactive/app-initdb.html)
+This image includes `EXPOSE 5432` (the postgres port), so standard container
+linking will make it automatically available to the linked containers. The
+default `postgres` user and database are created in the entrypoint with
+`initdb`.
+> The postgres database is a default database meant for use by users, utilities
+> and third party applications.
+> [postgresql.org/docs](http://www.postgresql.org/docs/9.3/interactive/app-initdb.html)
 
 ## connect to it from an application
 
@@ -42,7 +67,15 @@ This image includes `EXPOSE 5432` (the postgres port), so standard container lin
 
 # How to extend this image
 
-If you would like to do additional initialization in an image derived from this one, add a `*.sh` script under `/docker-entrypoint-initdb.d` (creating the directory if necessary). After the entrypoint calls `initdb` to create the default `postgres` user and database, it will source any `*.sh` script found in that directory to do further initialization before starting the service. If you need to execute SQL commands as part of your initialization, the use of Postgres'' [single user mode](http://www.postgresql.org/docs/9.3/static/app-postgres.html#AEN90580) is highly recommended.
+If you would like to do additional initialization in an image derived from this
+one, add a `*.sh` script under `/docker-entrypoint-initdb.d` (creating the
+directory if necessary). After the entrypoint calls `initdb` to create the
+default `postgres` user and database, it will source any `*.sh` script found in
+that directory to do further initialization before starting the service. If you
+need to execute SQL commands as part of your initialization, the use of
+Postgres'' [single user
+mode](http://www.postgresql.org/docs/9.3/static/app-postgres.html#AEN90580) is
+highly recommended.
 
 # User Feedback
 

+ 39 - 6
postgres/content.md

@@ -1,8 +1,28 @@
 # What is PostgreSQL?
 
-PostgreSQL, often simply "Postgres", is an object-relational database management system (ORDBMS) with an emphasis on extensibility and standards-compliance. As a database server, its primary function is to store data, securely and supporting best practices, and retrieve it later, as requested by other software applications, be it those on the same computer or those running on another computer across a network (including the Internet). It can handle workloads ranging from small single-machine applications to large Internet-facing applications with many concurrent users. Recent versions also provide replication of the database itself for security and scalability.
-
-PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant and transactional (including most DDL statements) avoiding locking issues using multiversion concurrency control (MVCC), provides immunity to dirty reads and full serializability; handles complex SQL queries using many indexing methods that are not available in other databases; has updateable views and materialized views, triggers, foreign keys; supports functions and stored procedures, and other expandability, and has a large number of extensions written by third parties. In addition to the possibility of working with the major proprietary and open source databases, PostgreSQL supports migration from them, by its extensive standard SQL support and available migration tools. And if proprietary extensions had been used, by its extensibility that can emulate many through some built-in and third-party open source compatibility extensions, such as for Oracle.
+PostgreSQL, often simply "Postgres", is an object-relational database management
+system (ORDBMS) with an emphasis on extensibility and standards-compliance. As a
+database server, its primary function is to store data, securely and supporting
+best practices, and retrieve it later, as requested by other software
+applications, be it those on the same computer or those running on another
+computer across a network (including the Internet). It can handle workloads
+ranging from small single-machine applications to large Internet-facing
+applications with many concurrent users. Recent versions also provide
+replication of the database itself for security and scalability.
+
+PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant
+and transactional (including most DDL statements) avoiding locking issues using
+multiversion concurrency control (MVCC), provides immunity to dirty reads and
+full serializability; handles complex SQL queries using many indexing methods
+that are not available in other databases; has updateable views and materialized
+views, triggers, foreign keys; supports functions and stored procedures, and
+other expandability, and has a large number of extensions written by third
+parties. In addition to the possibility of working with the major proprietary
+and open source databases, PostgreSQL supports migration from them, by its
+extensive standard SQL support and available migration tools. And if proprietary
+extensions had been used, by its extensibility that can emulate many through
+some built-in and third-party open source compatibility extensions, such as for
+Oracle.
 
 > [wikipedia.org/wiki/PostgreSQL](https://en.wikipedia.org/wiki/PostgreSQL)
 
@@ -14,8 +34,13 @@ PostgreSQL implements the majority of the SQL:2011 standard, is ACID-compliant a
 
     docker run --name some-postgres -d postgres
 
-This image includes `EXPOSE 5432` (the postgres port), so standard container linking will make it automatically available to the linked containers. The default `postgres` user and database are created in the entrypoint with `initdb`.
-> The postgres database is a default database meant for use by users, utilities and third party applications. [postgresql.org/docs](http://www.postgresql.org/docs/9.3/interactive/app-initdb.html)
+This image includes `EXPOSE 5432` (the postgres port), so standard container
+linking will make it automatically available to the linked containers. The
+default `postgres` user and database are created in the entrypoint with
+`initdb`.
+> The postgres database is a default database meant for use by users, utilities
+> and third party applications.
+> [postgresql.org/docs](http://www.postgresql.org/docs/9.3/interactive/app-initdb.html)
 
 ## connect to it from an application
 
@@ -27,4 +52,12 @@ This image includes `EXPOSE 5432` (the postgres port), so standard container lin
 
 # How to extend this image
 
-If you would like to do additional initialization in an image derived from this one, add a `*.sh` script under `/docker-entrypoint-initdb.d` (creating the directory if necessary). After the entrypoint calls `initdb` to create the default `postgres` user and database, it will source any `*.sh` script found in that directory to do further initialization before starting the service. If you need to execute SQL commands as part of your initialization, the use of Postgres'' [single user mode](http://www.postgresql.org/docs/9.3/static/app-postgres.html#AEN90580) is highly recommended.
+If you would like to do additional initialization in an image derived from this
+one, add a `*.sh` script under `/docker-entrypoint-initdb.d` (creating the
+directory if necessary). After the entrypoint calls `initdb` to create the
+default `postgres` user and database, it will source any `*.sh` script found in
+that directory to do further initialization before starting the service. If you
+need to execute SQL commands as part of your initialization, the use of
+Postgres'' [single user
+mode](http://www.postgresql.org/docs/9.3/static/app-postgres.html#AEN90580) is
+highly recommended.

+ 19 - 7
redis/README.md

@@ -22,7 +22,11 @@ repo](https://github.com/docker-library/official-images).
 
 # What is Redis?
 
-Redis is an open-source, networked, in-memory, key-value data store with optional durability. It is written in ANSI C. The development of Redis has been sponsored by Pivotal since May 2013; before that, it was sponsored by VMware. According to the monthly ranking by DB-Engines.com, Redis is the most popular key-value store. The name Redis means REmote DIctionary Server.
+Redis is an open-source, networked, in-memory, key-value data store with
+optional durability. It is written in ANSI C. The development of Redis has been
+sponsored by Pivotal since May 2013; before that, it was sponsored by VMware.
+According to the monthly ranking by DB-Engines.com, Redis is the most popular
+key-value store. The name Redis means REmote DIctionary Server.
 
 > [wikipedia.org/wiki/Redis](https://en.wikipedia.org/wiki/Redis)
 
@@ -34,15 +38,20 @@ Redis is an open-source, networked, in-memory, key-value data store with optiona
 
     docker run --name some-redis -d redis
 
-This image includes `EXPOSE 6379` (the redis port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate).
+This image includes `EXPOSE 6379` (the redis port), so standard container
+linking will make it automatically available to the linked containers (as the
+following examples illustrate).
 
 ## start with persistent storage
 
     docker run --name some-redis -d redis redis-server --appendonly yes
 
-If persistence is enabled, data is stored in the `VOLUME /data`, which can be used with `--volumes-from some-volume-container` or `-v /docker/host/dir:/data` (see [docs.docker volumes](http://docs.docker.com/userguide/dockervolumes/)).
+If persistence is enabled, data is stored in the `VOLUME /data`, which can be
+used with `--volumes-from some-volume-container` or `-v /docker/host/dir:/data`
+(see [docs.docker volumes](http://docs.docker.com/userguide/dockervolumes/)).
 
-For more about Redis Persistence, see [http://redis.io/topics/persistence](http://redis.io/topics/persistence).
+For more about Redis Persistence, see
+[http://redis.io/topics/persistence](http://redis.io/topics/persistence).
 
 ## connect to it from an application
 
@@ -54,17 +63,20 @@ For more about Redis Persistence, see [http://redis.io/topics/persistence](http:
 
 ## Additionally, If you want to use your own redis.conf ...
 
-You can create your own Dockerfile that adds a redis.conf from the context into /data/, like so.
+You can create your own Dockerfile that adds a redis.conf from the context into
+/data/, like so.
 
     FROM redis
     redis.conf /data/
     CMD [ "redis-server", "/data/redis.conf" ]
 
-Alternatively, you can specify something along the same lines with `docker run` options.
+Alternatively, you can specify something along the same lines with `docker run`
+options.
 
     docker run --volumes-from datacontainer --name myredis redis
 
-Using this method means that there is no need for you to have a Dockerfile for your redis container.
+Using this method means that there is no need for you to have a Dockerfile for
+your redis container.
 
 # User Feedback
 

+ 19 - 7
redis/content.md

@@ -1,6 +1,10 @@
 # What is Redis?
 
-Redis is an open-source, networked, in-memory, key-value data store with optional durability. It is written in ANSI C. The development of Redis has been sponsored by Pivotal since May 2013; before that, it was sponsored by VMware. According to the monthly ranking by DB-Engines.com, Redis is the most popular key-value store. The name Redis means REmote DIctionary Server.
+Redis is an open-source, networked, in-memory, key-value data store with
+optional durability. It is written in ANSI C. The development of Redis has been
+sponsored by Pivotal since May 2013; before that, it was sponsored by VMware.
+According to the monthly ranking by DB-Engines.com, Redis is the most popular
+key-value store. The name Redis means REmote DIctionary Server.
 
 > [wikipedia.org/wiki/Redis](https://en.wikipedia.org/wiki/Redis)
 
@@ -12,15 +16,20 @@ Redis is an open-source, networked, in-memory, key-value data store with optiona
 
     docker run --name some-redis -d redis
 
-This image includes `EXPOSE 6379` (the redis port), so standard container linking will make it automatically available to the linked containers (as the following examples illustrate).
+This image includes `EXPOSE 6379` (the redis port), so standard container
+linking will make it automatically available to the linked containers (as the
+following examples illustrate).
 
 ## start with persistent storage
 
     docker run --name some-redis -d redis redis-server --appendonly yes
 
-If persistence is enabled, data is stored in the `VOLUME /data`, which can be used with `--volumes-from some-volume-container` or `-v /docker/host/dir:/data` (see [docs.docker volumes](http://docs.docker.com/userguide/dockervolumes/)).
+If persistence is enabled, data is stored in the `VOLUME /data`, which can be
+used with `--volumes-from some-volume-container` or `-v /docker/host/dir:/data`
+(see [docs.docker volumes](http://docs.docker.com/userguide/dockervolumes/)).
 
-For more about Redis Persistence, see [http://redis.io/topics/persistence](http://redis.io/topics/persistence).
+For more about Redis Persistence, see
+[http://redis.io/topics/persistence](http://redis.io/topics/persistence).
 
 ## connect to it from an application
 
@@ -32,14 +41,17 @@ For more about Redis Persistence, see [http://redis.io/topics/persistence](http:
 
 ## Additionally, If you want to use your own redis.conf ...
 
-You can create your own Dockerfile that adds a redis.conf from the context into /data/, like so.
+You can create your own Dockerfile that adds a redis.conf from the context into
+/data/, like so.
 
     FROM redis
     redis.conf /data/
     CMD [ "redis-server", "/data/redis.conf" ]
 
-Alternatively, you can specify something along the same lines with `docker run` options.
+Alternatively, you can specify something along the same lines with `docker run`
+options.
 
     docker run --volumes-from datacontainer --name myredis redis
 
-Using this method means that there is no need for you to have a Dockerfile for your redis container.
+Using this method means that there is no need for you to have a Dockerfile for
+your redis container.

+ 5 - 5
ubuntu-debootstrap/README.md

@@ -1,10 +1,10 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`10.04.4`, `10.04`, `lucid` (*10.04/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/f5662c420fe19351030b3fab6580cf69528fbf24/10.04/Dockerfile)
-- [`12.04.5`, `12.04`, `precise` (*12.04/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/f5662c420fe19351030b3fab6580cf69528fbf24/12.04/Dockerfile)
-- [`14.04.1`, `14.04`, `trusty`, `latest` (*14.04/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/f5662c420fe19351030b3fab6580cf69528fbf24/14.04/Dockerfile)
-- [`14.10`, `utopic` (*14.10/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/f5662c420fe19351030b3fab6580cf69528fbf24/14.10/Dockerfile)
-- [`devel` (*devel/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/f5662c420fe19351030b3fab6580cf69528fbf24/devel/Dockerfile)
+- [`10.04.4`, `10.04`, `lucid` (*10.04/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/914295f4d57271f13bb4a4f3c02f01320ce139c1/10.04/Dockerfile)
+- [`12.04.5`, `12.04`, `precise` (*12.04/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/914295f4d57271f13bb4a4f3c02f01320ce139c1/12.04/Dockerfile)
+- [`14.04.1`, `14.04`, `trusty`, `latest` (*14.04/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/914295f4d57271f13bb4a4f3c02f01320ce139c1/14.04/Dockerfile)
+- [`14.10`, `utopic` (*14.10/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/914295f4d57271f13bb4a4f3c02f01320ce139c1/14.10/Dockerfile)
+- [`devel` (*devel/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-debootstrap/blob/914295f4d57271f13bb4a4f3c02f01320ce139c1/devel/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 3 - 3
ubuntu/README.md

@@ -1,8 +1,8 @@
 # Supported tags and respective `Dockerfile` links
 
-- [`12.04.5`, `12.04`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/a138de6460b4fc33daf947b85fc3d902cca7ff77/precise/Dockerfile)
-- [`14.04.1`, `14.04`, `trusty`, `latest` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/a138de6460b4fc33daf947b85fc3d902cca7ff77/trusty/Dockerfile)
-- [`14.10`, `utopic` (*utopic/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/a138de6460b4fc33daf947b85fc3d902cca7ff77/utopic/Dockerfile)
+- [`12.04.5`, `12.04`, `precise` (*precise/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/85471971670295a9bad93402e18c52e4f3e1502e/precise/Dockerfile)
+- [`14.04.1`, `14.04`, `trusty`, `latest` (*trusty/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/85471971670295a9bad93402e18c52e4f3e1502e/trusty/Dockerfile)
+- [`14.10`, `utopic` (*utopic/Dockerfile*)](https://github.com/tianon/docker-brew-ubuntu-core/blob/85471971670295a9bad93402e18c52e4f3e1502e/utopic/Dockerfile)
 
 For more information about this image and its history, please see the [relevant
 manifest file

+ 17 - 5
wordpress/README.md

@@ -10,7 +10,13 @@ repo](https://github.com/docker-library/official-images).
 
 # What is WordPress?
 
-WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL, which runs on a web hosting service. Features include a plugin architecture and a template system. WordPress is used by more than 22.0% of the top 10 million websites as of August 2013. WordPress is the most popular blogging system in use on the Web, at more than 60 million websites. The most popular languages used are English, Spanish and Bahasa Indonesia.
+WordPress is a free and open source blogging tool and a content management
+system (CMS) based on PHP and MySQL, which runs on a web hosting service.
+Features include a plugin architecture and a template system. WordPress is used
+by more than 22.0% of the top 10 million websites as of August 2013. WordPress
+is the most popular blogging system in use on the Web, at more than 60 million
+websites. The most popular languages used are English, Spanish and Bahasa
+Indonesia.
 
 > [wikipedia.org/wiki/WordPress](https://en.wikipedia.org/wiki/WordPress)
 
@@ -20,20 +26,26 @@ WordPress is a free and open source blogging tool and a content management syste
 
     docker run --name some-wordpress --link some-mysql:mysql -d wordpress
 
-The following environment variables are also honored for configuring your WordPress instance:
+The following environment variables are also honored for configuring your
+WordPress instance:
 
  - `-e WORDPRESS_DB_USER=...` (defaults to "root")
  - `-e WORDPRESS_DB_PASSWORD=...` (defaults to the value of the `MYSQL_ROOT_PASSWORD` environment variable from the linked mysql container)
  - `-e WORDPRESS_DB_NAME=...` (defaults to "wordpress")
  - `-e WORDPRESS_AUTH_KEY=...`, `-e WORDPRESS_SECURE_AUTH_KEY=...`, `-e WORDPRESS_LOGGED_IN_KEY=...`, `-e WORDPRESS_NONCE_KEY=...`, `-e WORDPRESS_AUTH_SALT=...`, `-e WORDPRESS_SECURE_AUTH_SALT=...`, `-e WORDPRESS_LOGGED_IN_SALT=...`, `-e WORDPRESS_NONCE_SALT=...` (default to unique random SHA1s)
 
-If the `WORDPRESS_DB_NAME` specified does not already exist in the given MySQL container,  it will be created automatically upon container startup, provided that the `WORDPRESS_DB_USER` specified has the necessary permissions to create it.
+If the `WORDPRESS_DB_NAME` specified does not already exist in the given MySQL
+container,  it will be created automatically upon container startup, provided
+that the `WORDPRESS_DB_USER` specified has the necessary permissions to create
+it.
 
-If you'd like to be able to access the instance from the host without the container's IP, standard port mappings can be used:
+If you'd like to be able to access the instance from the host without the
+container's IP, standard port mappings can be used:
 
     docker run --name some-wordpress --link some-mysql:mysql -p 8080:80 -d wordpress
 
-Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a browser.
+Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a
+browser.
 
 # User Feedback
 

+ 17 - 5
wordpress/content.md

@@ -1,6 +1,12 @@
 # What is WordPress?
 
-WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL, which runs on a web hosting service. Features include a plugin architecture and a template system. WordPress is used by more than 22.0% of the top 10 million websites as of August 2013. WordPress is the most popular blogging system in use on the Web, at more than 60 million websites. The most popular languages used are English, Spanish and Bahasa Indonesia.
+WordPress is a free and open source blogging tool and a content management
+system (CMS) based on PHP and MySQL, which runs on a web hosting service.
+Features include a plugin architecture and a template system. WordPress is used
+by more than 22.0% of the top 10 million websites as of August 2013. WordPress
+is the most popular blogging system in use on the Web, at more than 60 million
+websites. The most popular languages used are English, Spanish and Bahasa
+Indonesia.
 
 > [wikipedia.org/wiki/WordPress](https://en.wikipedia.org/wiki/WordPress)
 
@@ -10,17 +16,23 @@ WordPress is a free and open source blogging tool and a content management syste
 
     docker run --name some-wordpress --link some-mysql:mysql -d wordpress
 
-The following environment variables are also honored for configuring your WordPress instance:
+The following environment variables are also honored for configuring your
+WordPress instance:
 
  - `-e WORDPRESS_DB_USER=...` (defaults to "root")
  - `-e WORDPRESS_DB_PASSWORD=...` (defaults to the value of the `MYSQL_ROOT_PASSWORD` environment variable from the linked mysql container)
  - `-e WORDPRESS_DB_NAME=...` (defaults to "wordpress")
  - `-e WORDPRESS_AUTH_KEY=...`, `-e WORDPRESS_SECURE_AUTH_KEY=...`, `-e WORDPRESS_LOGGED_IN_KEY=...`, `-e WORDPRESS_NONCE_KEY=...`, `-e WORDPRESS_AUTH_SALT=...`, `-e WORDPRESS_SECURE_AUTH_SALT=...`, `-e WORDPRESS_LOGGED_IN_SALT=...`, `-e WORDPRESS_NONCE_SALT=...` (default to unique random SHA1s)
 
-If the `WORDPRESS_DB_NAME` specified does not already exist in the given MySQL container,  it will be created automatically upon container startup, provided that the `WORDPRESS_DB_USER` specified has the necessary permissions to create it.
+If the `WORDPRESS_DB_NAME` specified does not already exist in the given MySQL
+container,  it will be created automatically upon container startup, provided
+that the `WORDPRESS_DB_USER` specified has the necessary permissions to create
+it.
 
-If you'd like to be able to access the instance from the host without the container's IP, standard port mappings can be used:
+If you'd like to be able to access the instance from the host without the
+container's IP, standard port mappings can be used:
 
     docker run --name some-wordpress --link some-mysql:mysql -p 8080:80 -d wordpress
 
-Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a browser.
+Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a
+browser.