Merge pull request #11 from dudash/gh-pages33quikfix

Gh pages33quikfix

www/3.1/default/LABS-MASTERLIST.md

@@ -17,22 +17,22 @@ How to install the prerequisites
 Shows attendees how to login and provides and overview of the web console and CLI.  4 min.
 
 ## workshop-lab-byodocker.md
-Covers how to deploy exisiting docker images to Open Shift.  5 min.
+Covers how to deploy exisiting docker images to OpenShift.  5 min.
 
 ## workshop-lab-s2i.md
-Covers the Source to Image capability of Open Shift.  5 min.
+Covers the Source to Image capability of OpenShift.  5 min.
 
 ## workshop-lab-devmanage.md
-Covers basic developer focused tasks to manage an app in your Open Shift development environment.  9 min.
+Covers basic developer focused tasks to manage an app in your OpenShift development environment.  9 min.
 
 ## workshop-lab-rollbacks.md
 Covers how to setup webhooks and perform rollbacks.  10 min.
 
 ## workshop-lab-replicationrecovery.md
-Covers replication of pods and the recovery features Open Shift provides
+Covers replication of pods and the recovery features OpenShift provides
 
 ## workshop-lab-labels.md
-Covers the topic of labels within Open Shift and when/how to use them
+Covers the topic of labels within OpenShift and when/how to use them
 
 ## workshop-lab-bluegreen.md
 Covers the DevOps concept of Blue/Green deployments.
@@ -44,7 +44,7 @@ Covers integration with some example CI/CD tools and walks through an example us
 Covers developer usage of secrets to hide sensitive information and make it available to your containers - Coming soon.
 
 ## workshop-lab-storage.md
-Covers hooking up a database in your Open Shift environment - Coming soon.
+Covers hooking up a database in your OpenShift environment - Coming soon.
 
 ## workshop-lab-templates.md
 Covers creating and using templates - Coming soon.
@@ -62,7 +62,7 @@ Covers how to setup autoscaling in OpenShift - Coming soon.
 Covers how to create and install custom S2I builders - Coming soon.
 
 ## workshop-lab-ops.md
-Covers some ops/administrative focused tasks to manage a procuction Open Shift environment - Coming soon.
+Covers some ops/administrative focused tasks to manage a procuction OpenShift environment - Coming soon.
 
 ## workshop-lab-nodeselectors.md
 Covers ops/administrative focused node selectors to place pods and define policy - Coming soon.

www/3.1/default/workshop-finally.md

@@ -6,14 +6,14 @@ html_title: Fin.
 ---
 
 ## That's it!
-Hopefully, these labs provided you some idea of how to perform common tasks within the Open Shift environment.  And hopefully, you have a deeper understanding of how containers and container orchestration works.  Please feel free to continue to "kick the tires" in the demo environment we've setup and explore both the web console and the oc command line client.
+Hopefully, these labs provided you some idea of how to perform common tasks within the OpenShift environment.  And hopefully, you have a deeper understanding of how containers and container orchestration works.  Please feel free to continue to "kick the tires" in the demo environment we've setup and explore both the web console and the oc command line client.
 
 ## Get even deeper
 While you're here, we can help you install the [Container Development Kit (CDK)][3] on your laptop.  It requires a couple large downloads, but the install process is reallly easy.  You can find the [install and getting started guides here][4].
 
-Here are some good resources to continue learning Open Shift:
-* [Open Shift Architecture][1]
-* [Open Shift Developer's Guide][2]
+Here are some good resources to continue learning OpenShift:
+* [OpenShift Architecture][1]
+* [OpenShift Developer's Guide][2]
 
 [1]: https://docs.openshift.com/enterprise/3.1/architecture/core_concepts/
 [2]: https://docs.openshift.com/enterprise/3.1/dev_guide/

www/3.1/default/workshop-lab-byodocker.md

@@ -157,4 +157,4 @@ $ oc delete all --all
 
 
 ## Summary
-In this lab you've deployed an example docker image, pulled from docker hub, into a pod running in Open Shift.  You exposed a route for clients to access that service via thier web browsers.  And you learned how to get and describe resources using the command line and the web console.  Hopefully, this basic lab also helped to get you familiar with using the CLI and navigating within the web console.
+In this lab you've deployed an example docker image, pulled from docker hub, into a pod running in OpenShift.  You exposed a route for clients to access that service via thier web browsers.  And you learned how to get and describe resources using the command line and the web console.  Hopefully, this basic lab also helped to get you familiar with using the CLI and navigating within the web console.

www/3.1/default/workshop-lab-cicd.md

@@ -7,7 +7,7 @@ categories: [lab, developers, ops]
 ---
 
 ## Overview
-In modern software projects many teams utilize the concept of continuous integration and continuous delivery (CI/CD).  By setting up a tool chain that continuously builds, tests, and stages software releases a team can ensure that their product can be reliably released at any time.  Open Shift can be an enabler in the creation and managecment of this tool chain.  In this lab we will walk through creating a simple example of a CI/CD [pipeline][1] utlizing Jenkins, all running on top of Open Shift!
+In modern software projects many teams utilize the concept of continuous integration and continuous delivery (CI/CD).  By setting up a tool chain that continuously builds, tests, and stages software releases a team can ensure that their product can be reliably released at any time.  OpenShift can be an enabler in the creation and managecment of this tool chain.  In this lab we will walk through creating a simple example of a CI/CD [pipeline][1] utlizing Jenkins, all running on top of OpenShift!
 
 ### Start by installing Jenkins
 First we will start by installing Jenkins to run in a pod within your workshop project.  Because this is just a workshop we use the ephemeral template to create our Jenkins sever (for a enterprise system you would probably want to use the persistent template).  Follow the steps below:
@@ -191,7 +191,7 @@ At this point you should see the following scenario play out:
 
 
 ## Summary
-Coming soon...  Read more about usage of [Jenkins on Open Shift here][4].  Read more about the concepts behind [pipelines in Jenkins here][1].
+Coming soon...  Read more about usage of [Jenkins on OpenShift here][4].  Read more about the concepts behind [pipelines in Jenkins here][1].
 
 
 [1]: https://jenkins.io/doc/pipeline/

www/3.1/default/workshop-lab-devmanage.md

@@ -6,11 +6,11 @@ html_title: App Development
 categories: [lab, developers]
 ---
 
-## Developing and managing an application in Open Shift
-In this lab we will explore some of the common activities undertaken by developers working in Open Shift.  You will become familiar with how to use environment variables, secrets, build configurations, and more.  Let's look at some of the basic things a developer might care about for a deployed app.
+## Developing and managing an application in OpenShift
+In this lab we will explore some of the common activities undertaken by developers working in OpenShift.  You will become familiar with how to use environment variables, secrets, build configurations, and more.  Let's look at some of the basic things a developer might care about for a deployed app.
 
 ### Setup
-From the previous lab you should have the DC Metro Maps web app running in Open Shift.  
+From the previous lab you should have the DC Metro Maps web app running in OpenShift.  
 
 <i class="fa fa-warning"></i> **Only if you don't already have it running already, add it with the following steps.**
 
@@ -23,7 +23,7 @@ $ oc expose service dc-metro-map
 
 
 ### See the app in action and inspect some details
-There is no more ambiguity or confusion about where the app came from.  Open Shift provides traceability for your running deployment back to the docker image and the registry it came from, as well as (for images built by openshift) back to the exact source code branch and commit.  Let's take a look at that.
+There is no more ambiguity or confusion about where the app came from.  OpenShift provides traceability for your running deployment back to the docker image and the registry it came from, as well as (for images built by openshift) back to the exact source code branch and commit.  Let's take a look at that.
 
 <div class="panel-group" id="accordionA" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
@@ -206,7 +206,7 @@ Now you can see in the output window the details of your app starting up and any
 
 
 ### How about we set some environment variables?
-Whether it's a database name or a configuration variable, most applications make use of environment variables.  It's best not to bake these into your containers because they do change and you don't want to rebuild an image just to change an environment variable.  Good news!  You don't have to.  Open Shift let's you specify environment variables in your deployment configuration and they get passed along through the pod to the container.  Let's try doing that.
+Whether it's a database name or a configuration variable, most applications make use of environment variables.  It's best not to bake these into your containers because they do change and you don't want to rebuild an image just to change an environment variable.  Good news!  You don't have to.  OpenShift let's you specify environment variables in your deployment configuration and they get passed along through the pod to the container.  Let's try doing that.
 
 <div class="panel-group" id="accordionC" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
@@ -232,7 +232,7 @@ $ oc env dc/dc-metro-map -e BEERME=true
 $ oc get pods -w
 {% endhighlight %}
 
-Due to the deployment config strategy being set to "Rolling" and the "ConfigChange" trigger being set, Open Shift auto deployed a new pod as soon as you updated with the env variable.  If you were quick enough you saw this happening with the get pods command
+Due to the deployment config strategy being set to "Rolling" and the "ConfigChange" trigger being set, OpenShift auto deployed a new pod as soon as you updated with the env variable.  If you were quick enough you saw this happening with the get pods command
 
 <blockquote>
 <i class="fa fa-terminal"></i> Type Ctrl+C to stop watching the pods
@@ -278,7 +278,7 @@ Add an env section to look like the following:
 <blockquote>
 Click "Save".  And go back to the summary view by clicking "Overview" on the left menu bar
 </blockquote>
-If you are quick enough you will see a new pod spin up and an the old pod spin down.  This is due to the deployment config strategy being set to "Rolling" and having a "ConfigChange" trigger, Open Shift auto deployed a new pod as soon as you updated with the env variable.
+If you are quick enough you will see a new pod spin up and an the old pod spin down.  This is due to the deployment config strategy being set to "Rolling" and having a "ConfigChange" trigger, OpenShift auto deployed a new pod as soon as you updated with the env variable.
       </div>
     </div>
   </div>
@@ -294,7 +294,7 @@ Environment variables are great, but sometimes we don't want sensitive data expo
 
 
 ### Getting into a pod
-There are situations when you might want to jump into a running pod, and Open Shift lets you do that pretty easily.  We set some environment variables and secrets in this lab, let's jump onto our pod to inspect them.  
+There are situations when you might want to jump into a running pod, and OpenShift lets you do that pretty easily.  We set some environment variables and secrets in this lab, let's jump onto our pod to inspect them.  
 
 <div class="panel-group" id="accordionD" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
@@ -380,7 +380,7 @@ $ oc delete all -l app=dc-metro-map
 {% endhighlight %}
 
 ## Summary
-In this lab you've seen how to trace running software back to its roots, how to see details on the pods running your software, how to update deployment configurations, how to inspect logs files, how to set environment variables consistently across your environment, and how to interactively attach to running containers.  All these things should come in handy for any developer working in an Open Shift platform.
+In this lab you've seen how to trace running software back to its roots, how to see details on the pods running your software, how to update deployment configurations, how to inspect logs files, how to set environment variables consistently across your environment, and how to interactively attach to running containers.  All these things should come in handy for any developer working in an OpenShift platform.
 
 To dig deeper in to details behind the steps you performed in this lab, check out the OSE [developer's guide][1].
 

www/3.1/default/workshop-lab-labels.md

@@ -12,7 +12,7 @@ This is a pretty simple lab, we are going to explore labels.  You can use labels
 For example, pods are "tagged" with labels, and then services use label selectors to identify the pods they proxy to. This makes it possible for services to reference groups of pods, even treating pods with potentially different docker containers as related entities.
 
 ### Labels a on pod
-In a previous lab we added our web app using a S2I template.  When we did that, Open Shift labeled our objects for us.  Let's look at the labels on our running pod.
+In a previous lab we added our web app using a S2I template.  When we did that, OpenShift labeled our objects for us.  Let's look at the labels on our running pod.
 
 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
   <div class="panel panel-default">
@@ -98,7 +98,7 @@ Your updated label will show up in the pod's list.
 </div>
 
 ## Summary
-That's it for this lab, now you know that all the objects in Open Shift can be labeled.  This is important because those labels can be used as part of your CI/CD process.  Advanced labs will cover using labels for Blue/Green deployments and running yours apps on specific nodes (e.g. just on SSD nodes or just on east coast nodes).  You can read more about labels [here][1] and [here][2].
+That's it for this lab, now you know that all the objects in OpenShift can be labeled.  This is important because those labels can be used as part of your CI/CD process.  Advanced labs will cover using labels for Blue/Green deployments and running yours apps on specific nodes (e.g. just on SSD nodes or just on east coast nodes).  You can read more about labels [here][1] and [here][2].
 
 
 [1]: https://docs.openshift.com/enterprise/latest/architecture/core_concepts/pods_and_services.html#labels

www/3.1/default/workshop-lab-ops.md

@@ -6,8 +6,8 @@ html_title: Basic Ops
 categories: [lab, ops]
 ---
 
-## Operations on Open Shift
-This lab walks you through some basic functionality that you might perform when working with your deployed apps and services.  We will cover how Open Shift can  auto recover from failures and how you can investigate the inner workings of the platform along with its configuration.  This is an advanced lab with the goal of getting you comfortable with the internal working components of Open Shift.
+## Operations on OpenShift
+This lab walks you through some basic functionality that you might perform when working with your deployed apps and services.  We will cover how OpenShift can  auto recover from failures and how you can investigate the inner workings of the platform along with its configuration.  This is an advanced lab with the goal of getting you comfortable with the internal working components of OpenShift.
 
 <i class="fa fa-warning"></i> Please note: many of the steps in this lab require additional privledges via an administrative of service account.  If only have access to via developer account with limited project access you might not be able to continue.
 
@@ -19,7 +19,7 @@ Coming soon...
 
 
 ### Checking on your cluster nodes and the master
-As an administrator you can view the health of the nodes in your cluster and look into events that occured within Open Shift.  Let's take a look at that:
+As an administrator you can view the health of the nodes in your cluster and look into events that occured within OpenShift.  Let's take a look at that:
 
 Coming soon...