Merge remote-tracking branch 'upstream/master'

Author: sixeyed

.github/ISSUE_TEMPLATE

@@ -1,45 +1 @@
-** PLEASE ONLY USE THIS ISSUE TRACKER TO SUBMIT ISSUES WITH THE DOCKER LABS TUTORIAL CONTENT **
-
-* If you have a bug working with Docker itself, not related to these labs, please file the bug on the [Docker repo](https://github.com/moby/moby) *
-* If you would like general support figuring out how to do something with Docker, please use the Docker Slack channel. If you're not on that channel, sign up for the [Docker Community](http://dockr.ly/MeetUp) and you'll get an invite. *
-* Or go to the [Docker Forums](https://forums.docker.com/) *
-
-Please provide the following information so we can assess the issue you're having
-
-**Which lab is it that you're having issues with?**
-
-<!--
-Title or URL of the lab
--->
-**Description**
-
-<!--
-Briefly describe the problem you are having in a few paragraphs.
--->
-
-**Steps to reproduce the issue, if relevant:**
-1.
-2.
-3.
-
-**Describe the results you received:**
-
-
-**Describe the results you expected:**
-
-
-**Additional information you deem important (e.g. issue happens only occasionally):**
-
-**Output of `docker version`:**
-
-```
-(paste your output here)
-```
-
-**Output of `docker info`:**
-
-```
-(paste your output here)
-```
-
-**Additional environment details (AWS, Docker for Mac, Docker for Windows, VirtualBox, physical, etc.):**
+At this time we are not actively adding labs to this repository. Our focus is on training.play-with-docker.com where new lab and workshop oriented content is being added. We welcome fixes to existing content. For any new content you wish to contribute, please use this repository:https://github.com/play-with-docker/play-with-docker.github.io. Issues filed against the repo may or may not be fixed.

developer-tools/java/chapters/ch01-setup.adoc

@@ -4,7 +4,7 @@
 
 = Setup Environments
 
-This section describes the hardware and software needed for this workshop, and how to configure them. This workshop is designed for a BYOL (Brying Your Own Laptop) style hands-on-lab.
+This section describes the hardware and software needed for this workshop, and how to configure them. This workshop is designed for a BYOL (Bring Your Own Laptop) style hands-on-lab.
 
 == Hardware & Software
 

developer-tools/ruby/README.md

@@ -10,7 +10,7 @@ There are many different versions of Ruby in use. Ruby applications can be based
 
 In contrast, there are also many many versions of Python in use, but the majority of applications use the lastest 2.X or 3.X versions. Similarly, Java applications use the last two major releases of either Java released by Oracle or OpenJDK. 
 
-Earlier versions of Ruby are used in production because upgrading presents challenges such as, critical gems are not backward-compatible. Debugging tools like pry, rubocop, byebug... do work on many versions, but not consistently on all Ruby verisons.
+Earlier versions of Ruby are used in production because upgrading presents challenges such as, critical gems are not backward-compatible. Debugging tools like pry, rubocop, byebug... do work on many versions, but not consistently on all Ruby versions.
 
 As a result, Ruby developers (and people deploying Ruby apps) rely on tools like [rvm](https://rvm.io/) or [rbenv](https://github.com/rbenv/rbenv) to install a specific version of Ruby. These tools enable developers to switch between different versions of Ruby, and between different sets of gems (when different applications have conflicting requirements).
 

dockercon-us-2017/README.md

@@ -4,7 +4,7 @@
 
 This repo contains the series of hands-on labs presented at DockerCon 2017 in Austin. They are designed to help you gain experience in various Docker features, products, and solutions. Depending on your experience, each lab requires between 30-45 minutes to complete. They range in difficulty from easy to advanced.
 
-At the Hands-on Labs at DockerCon 2017 in Austin, we issued [Microsoft Azure](https://azure.microsoft.com/) credentials and hostnames. Many of these labs assumes you have Azure VMs and Docker Datacenter licenses. You can sign up for Azure resources through the Azure site. Each lab will identify prerequists at the begining of the lab. For Linux base nodes you 
+At the Hands-on Labs at DockerCon 2017 in Austin, we issued [Microsoft Azure](https://azure.microsoft.com/) credentials and hostnames. Many of these labs assumes you have Azure VMs and Docker Datacenter licenses. You can sign up for Azure resources through the Azure site. Each lab will identify prerequists at the beginning of the lab. For Linux base nodes you 
 
 You can get a trial license for Docker Datacenter through [Docker Store](https://store.docker.com/search?offering=enterprise&type=edition).
 
@@ -140,4 +140,4 @@ This lab is aimed at ops and system admins. It steps through packaging an ASP.NE
 
 ## [DockerCon 2017 Austin Workshops](workshop-slides/README.md)
 
-At DockerCon 2017 in Austin, we had [10 workshops](https://2017.dockercon.com/workshops/), each lasting about 3 hours.
+At DockerCon 2017 in Austin, we had [10 workshops](https://2017.dockercon.com/workshops/), each lasting about 3 hours.

dockercon-us-2017/docker-cloud/README.md

@@ -154,7 +154,7 @@ Specify the Dockerfile path (in Step 7):
   + Enter **/voting/Dockerfile** for the **Dockerfile Path**
 
 ### Check to make sure the repositories were created
-If you click the **Repositories** menu on the left you should see both the ```voting``` and ```results``` respositories were created. 
+If you click the **Repositories** menu on the left you should see both the ```voting``` and ```results``` repositories were created. 
 
 Well done! You've created two new repos and configured them to autobuild whenever new changes are pushed to the associated GitHub repos.
 

dockercon-us-2017/docker-enterprise/README.md

@@ -129,7 +129,7 @@ It will take up to 30 seconds to install.
 
 4. Log in to UCP by going to `https://<node0-public-dns>` in your browswer
 
-Depending on what browser you are using, you will receive a warning about the connection. Proceed through to the UCP URL. The warning is occuring because we UCP uses privately signed certificates by default. In a production installation we would add our own certificates that would be trusted by our browser.
+Depending on what browser you are using, you will receive a warning about the connection. Proceed through to the UCP URL. The warning is occurring because we UCP uses privately signed certificates by default. In a production installation we would add our own certificates that would be trusted by our browser.
 
 ![](images/private.png) 
 
@@ -203,7 +203,7 @@ A [Docker Stack](https://docs.docker.com/engine/reference/commandline/stack_depl
 In this section we will deploy the [Docker Pets](https://github.com/mark-church/docker-paas) application using a compose file. In the following sections we will add features to our compose file and make our application progressively more complex and feature-full. Docker Pets is a simple web app that records votes for different animals and uses a persistent backend to record the votes. It's comprised of two images:
 
 - **`chrch/docker-pets`** is a front-end Python Flask container that serves up random images of housepets, depending on the given configuration
-- **`consul`** (which will be used in a later compose file) is a back-end KV store that stores the number of visits that the web services recieve. It's configured to bootstrap itself with 3 replicas so that we have fault tolerant persistence.
+- **`consul`** (which will be used in a later compose file) is a back-end KV store that stores the number of visits that the web services receive. It's configured to bootstrap itself with 3 replicas so that we have fault tolerant persistence.
 
 This is the first iteration of our compose file for the Docker Pets application:
 

dockercon-us-2017/securing-apps-docker-enterprise/README.md

@@ -333,7 +333,7 @@ Creating network pets_backend
 Creating service pets_web
 ```
 
-6. Go to your browser and in the address pane type in `<node0-public-ip>`. You should see that the app has succesfully deployed with the new change.
+6. Go to your browser and in the address pane type in `<node0-public-ip>`. You should see that the app has successfully deployed with the new change.
 
 ### <a name="Task 3.2"></a>Task 3.2: Rescan the Remediated Application
 

security/apparmor/README.md

@@ -52,7 +52,7 @@ For more information, see the [official AppArmor documentation wiki](http://wiki
 
 In this step you will check the status of AppArmor on your Docker Host and learn how to identify whether or not Docker containers are running with an AppArmor profile.
 
-1.  View the status of AppArmor on your Docker Host with the `apparmor_status` command. You may need to preceed the command with `sudo`.
+1.  View the status of AppArmor on your Docker Host with the `apparmor_status` command. You may need to precede the command with `sudo`.
 
    ```
    $ apparmor_status

security/apparmor/wordpress/zues/zues-framework/libraries/customizer/README.md

@@ -14,7 +14,7 @@ The Customizer Library adds sections, settings and controls to the customizer ba
 
 At the moment there is only one custom control (for textarea), but look for additional controls as the library matures.
 
-The Customizer Library includes additional classes and helper functions for creating inline styles and loading Google fonts.  These functions and classes were developed by [The Theme Foundry](https://thethemefoundry.com/) for their theme [Make](https://thethemefoundry.com/wordpress-themes/make/) and I've found them quite useful in my own projects.  However, I'm considering moving them into seperate modules in order to make the core library as focused as possible.  Feedback on this is welcome.
+The Customizer Library includes additional classes and helper functions for creating inline styles and loading Google fonts.  These functions and classes were developed by [The Theme Foundry](https://thethemefoundry.com/) for their theme [Make](https://thethemefoundry.com/wordpress-themes/make/) and I've found them quite useful in my own projects.  However, I'm considering moving them into separate modules in order to make the core library as focused as possible.  Feedback on this is welcome.
 
 ## Installation
 
@@ -390,4 +390,4 @@ Development
 1.0.0
 ===
 
-* Public Release
+* Public Release

security/capabilities/README.md

@@ -198,7 +198,7 @@ usage: capsh [args ...]
   --killit=<n>   send signal(n) to child
   --forkfor=<n>  fork and make child sleep for <n> sec
   ==             re-exec(capsh) with args as for --
-  --             remaing arguments are for /bin/bash
+  --             remaining arguments are for /bin/bash
                  (without -- [capsh] will simply exit(0))
 ```