Formatting: headers, capitalization, bolded UI items, repository changed to repo (mostly) (#1)

Suzie Baunsgard · npwalker · commit a5fe635f22f6 · 2016-04-25T16:32:26.000-07:00
diff --git a/README.md b/README.md
@@ -1,134 +1,134 @@
-Table of Contents
+Table of contents
 =================
 
-* [Join The \#ramp\-up Channel on Puppet Community Slack](#join-the-ramp-up-channel-on-puppet-community-slack)
-* [Before Starting](#before-starting)
-* [What You Get From This control\-repo](#what-you-get-from-this-control-repo)
-* [How To Set It All Up](#how-to-set-it-all-up)
-  * [Copy This Repo Into Your Own Git Server](#copy-this-repo-into-your-own-git-server)
-    * [Gitlab](#gitlab)
+* [Join the \#ramp\-up channel on Puppet Community Slack](#join-the-ramp-up-channel-on-puppet-community-slack)
+* [Before starting](#before-starting)
+* [What you get from this control\-repo](#what-you-get-from-this-control-repo)
+* [How to set it all up](#how-to-set-it-all-up)
+  * [Copy this repo into your own Git server](#copy-this-repo-into-your-own-git-server)
+    * [GitLab](#gitlab)
     * [Stash](#stash)
-    * [Github](#github)
-  * [Configure PE to Use the Control\-Repo](#configure-pe-to-use-the-control-repo)
+    * [GitHub](#github)
+  * [Configure PE to use the control\-repo](#configure-pe-to-use-the-control-repo)
     * [Install PE](#install-pe)
-    * [Get the Control\-Repo Deployed On Your Master](#get-the-control-repo-deployed-on-your-master)
-  * [Setup a Webhook In Your Git Server](#setup-a-webhook-in-your-git-server)
+    * [Get the control\-repo deployed on your master](#get-the-control-repo-deployed-on-your-master)
+  * [Setup a webhook in your Git server](#setup-a-webhook-in-your-git-server)
   * [Test Code Manager](#test-code-manager)
-* [Updating From a Previous Version of PE](#updating-from-a-previous-version-of-pe)
+* [Updating from a previous version of PE](#updating-from-a-previous-version-of-pe)
   * [Upgrading to PE2015\.3\.z from PE 2015\.2\.z](#upgrading-to-pe20153z-from-pe-20152z)
 * [Appendix](#appendix)
-  * [Test The Zack/r10k Webhook](#test-the-zackr10k-webhook)
+  * [Test the zack/r10k webhook](#test-the-zackr10k-webhook)
 
-# Join The #ramp-up Channel on Puppet Community Slack
+# Join the #ramp-up channel on Puppet Community Slack
 
-Our [Puppet Community Slack](http://slack.puppet.com) is a great way to interact with other Puppet users.  The #ramp-up channel is specifically for users talking about starting with PE and using this repository.  
+Our [Puppet Community Slack](http://slack.puppet.com) is a great way to interact with other Puppet users.  The #ramp-up channel is specifically for users talking about starting with PE and using this repository.
 
-Other channels in the Puppet Community Slack are great for asking general Puppet questions as well.  
+Other channels in the Puppet Community Slack are great for asking general Puppet questions as well.
 
-# Before Starting
+# Before starting
 
-This control repo and the steps below are intended to be used during a new installation of PE.
+This control-repo and the steps below are intended to be used during a new installation of PE.
 
 The instructions are geared towards a new installation of PE2015.3.z.  However, the control-repo should work just fine on [PE2015.2.z](#upgrading-to-pe20153z-from-pe-20152z)
 
 If you intend to use this control-repo on an existing installation then be warned that if you've already written or downloaded modules when you start using r10k it will remove all of the existing modules and replace them with what you define in your Puppetfile.  Please copy or move your existing modules to another directory to ensure you do not lose any work you've already started.
 
-# What You Get From This control-repo
+# What you get from this control-repo
 
 As a result of following the instructions below you will receive the beginning of a best-practices installation of PE including...
 
- - A git server
- - The ability to push code to your git server and have it automatically deployed to your PE Master
+ - A Git server
+ - The ability to push code to your Git server and have it automatically deployed to your PE master
  - A config_version script to output the commit of code that your agent just applied
  - Optimal tuning of PE settings for this configuration
  - Working and example roles/profiles code
 
-# How To Set It All Up
+# How to set it all up
 
-## Copy This Repo Into Your Own Git Server
+## Copy this repo into your own Git server
 
-### Gitlab
+### GitLab
 
-1. On a new server, install Gitlab
+1. On a new server, install GitLab
  - https://about.gitlab.com/downloads/
 
-2. After Gitlab is installed you may sign into the web UI with the `root` user and password `5iveL!fe`
+2. After GitLab is installed you may sign into the web UI with the `root` user and password `5iveL!fe`
 
-3. In the Gitlab UI, make a user for yourself
+3. In the GitLab UI, make a user for yourself
 
-4. From your laptop or development machine, make an ssh key to link with your user.
- - Note: this is used for your laptop to communicate with your gitlab server to push code
+4. From your laptop or development machine, make an SSH key to link with your user.
+ - Note: this is used for your laptop to communicate with your GitLab server to push code
  - https://help.github.com/articles/generating-ssh-keys/
  - http://doc.gitlab.com/ce/ssh/README.html
 
-5. In the Gitlab UI, create a group called `puppet` ( this is case sensitive )
+5. In the GitLab UI, create a group called `puppet` ( this is case sensitive )
  - http://doc.gitlab.com/ce/workflow/groups.html
 
-7. In the Gitlab UI, add your user to the `puppet` group
+7. In the GitLab UI, add your user to the `puppet` group
  - Make sure to give your user at least master permissions so you can complete the below steps
  - Read more about permissions:
     - https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/permissions/permissions.md
 
-8. In the Gitlab UI, create a project called `control-repo` and set the Namespace to be the `puppet` group
+8. In the GitLab UI, create a project called `control-repo` and set the Namespace to be the `puppet` group
 
-10. On your laptop, clone this github control repository
- - `git clone <repository url>`
+10. On your laptop, clone this GitHub control repo
+ - `git clone <repo URL>`
  - `cd control-repo`
 
 14. On your laptop, remove the origin remote
  - `git remote remove origin`
 
-15. On your latptop, add your internal repository as the origin remote
- - `git remote add origin <ssh url of your gitlab repository>`
+15. On your latptop, add your internal repo as the origin remote
+ - `git remote add origin <SSH URL of your GitLab repo>`
 
-16. On your laptop, push the production branch of the repository from your machine up to your git server
+16. On your laptop, push the production branch of the repo from your machine up to your Git server
  - `git push origin production`
 
 ### Stash
 
 Coming soon!
 
-### Github
+### GitHub
 
 Coming soon!
 
-## Configure PE to Use the Control-Repo
+## Configure PE to use the control-repo
 
 ### Install PE
 
 1. Download the latest version of the PE installer for your platform
  - https://puppetlabs.com/download-puppet-enterprise
-2. SSH into your puppet master and copy the installer tarball into `/tmp`
+2. SSH into your Puppet master and copy the installer tarball into `/tmp`
 2. Expand the tarball and `cd` into the directory
 3. Run `puppet-enterprise-installer` to install
 
 If you run into any issues or have more questions about the installer you can see our docs here:
 
 http://docs.puppetlabs.com/pe/latest/install_basic.html
 
-### Get the Control-Repo Deployed On Your Master
+### Get the control-repo deployed on your master
 
-At this point you have our control-repo code deployed into your git server.  However, we have one final challenge: getting that code onto your puppet master.  In the end state the master will pull code from the git server via code manager, however, at this moment your puppet master does not have credentials to get code from the git server.
+At this point you have our control-repo code deployed into your Git server.  However, we have one final challenge: getting that code onto your Puppet master.  In the end state the master will pull code from the Git server via Code Manager, however, at this moment your Puppet master does not have credentials to get code from the Git server.
 
-So, we will set up a deploy key in the git server that will allow a ssh-key we make to deploy the code and configure everything else.
+So, we will set up a deploy key in the Git server that will allow an SSH key we make to deploy the code and configure everything else.
 
-1. On your puppet master, make an ssh key for r10k to connect to gitlab
+1. On your Puppet master, make an SSH key for r10k to connect to GitLab
  - `/usr/bin/ssh-keygen -t rsa -b 2048 -C 'code_manager' -f /etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa -q -N ''`
  - `cat /etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa.pub`
  - References:
     - https://help.github.com/articles/generating-ssh-keys/
     - http://doc.gitlab.com/ce/ssh/README.html
-2. In the Gitlab UI, create a deploy key on the `control-repo` project
+2. In the GitLab UI, create a deploy key on the `control-repo` project
  - Paste in the public key from above
 3. Login to the PE console
-4. Navigate to the Classification page
- - Click on the PE Master group
- - Click the Classes tab
+4. Navigate to the **Nodes > Classification** page
+ - Click on the **PE Master** group
+ - Click the **Classes** tab
  - Add the `puppet_enterprise::profile::master`
-    - Set the `r10k_remote` to the ssh url from the front page of your gitlab repo
+    - Set the `r10k_remote` to the SSH URL from the front page of your GitLab repo
     - Set the `r10k_private_key` parameter to `/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa`
- - Commit your changes
-5. On your puppet master
+ - **Commit** your changes
+5. On your Puppet master
  - Run:
 
     ~~~
@@ -137,20 +137,20 @@ So, we will set up a deploy key in the git server that will allow a ssh-key we m
     puppet agent -t
     ~~~
 
-5. Navigate back to the Classification page
+5. Navigate back to the **Nodes > Classification** page
  - Near the top of the page select "add a group"
  - Type `role::all_in_one_pe` for the group name
-    - Click the "Add Group" button
- - Click the "add membership rules, classes and variables" link that appears
-    - Below "Pin specific nodes to the group" type your master's fqdn into the box
-       - Click "pin node"
- - Select the "classes" tab
-    - On the right hand side, click the "refresh" link
+    - Click the **Add Group** button
+ - Click the **add membership rules, classes and variables** link that appears
+    - Below **Pin specific nodes to the group** type your master's FQDN into the box
+       - Click **pin node**
+ - Select the **Classes** tab
+    - On the right hand side, click the **Refresh** link
        - Wait for this to complete
-    - In the "add new classes" box type `role::all_in_one_pe`
-       - Click "add class"
- - Commit your changes
-8. On your puppet master
+    - In the **add new classes** box type `role::all_in_one_pe`
+       - Click **add class**
+ - **Commit** your changes
+8. On your Puppet master
  - Run:
 
     ~~~
@@ -161,19 +161,19 @@ So, we will set up a deploy key in the git server that will allow a ssh-key we m
 
 9. Code Manager is configured and has been used to deploy your code
 
-## Setup a Webhook In Your Git Server
+## Setup a webhook in your Git server
 
-1. On your puppet master
+1. On your Puppet master
  - `cat /etc/puppetlabs/puppetserver/.puppetlabs/webhook_url.txt`
 2. In your Git server's UI, add a webhook to the control-repo repository
- - You can paste the above webhook url
+ - You can paste the above webhook URL
 3. Disable SSL verification on the webhook
- - Since code manager uses a self-singed cert from the Puppet CA it is not generally trusted
+ - Since Code Manager uses a self-signed cert from the Puppet CA it is not generally trusted
 3. After you created the webhook use "test webhook" or similar functionality to confirm it works
 
 ## Test Code Manager
 
-One of the components setup by this control-repo is that when you "push" code to your git server, the git server will inform the puppet master to deploy branch you just pushed.
+One of the components setup by this control-repo is that when you "push" code to your Git server, the git server will inform the Puppet master to deploy branch you just pushed.
 
 1. In one terminal window, `tail -f /var/log/puppetlabs/puppetserver/puppetserver.log`
 2. In a second terminal window
@@ -187,26 +187,26 @@ One of the components setup by this control-repo is that when you "push" code to
 4. In your first terminal window review the `puppetserver.log` to see the type of logging each sync will create
 
 ----
-# Updating From a Previous Version of PE
+# Updating from a previous version of PE
 
-## Upgrading to PE2015.3.z from PE 2015.2.z
+## Upgrading to PE 2015.3.z from PE 2015.2.z
 
 Remove `pe_r10k` from the PE master group in the console and instead add the following two parameters to the `puppet_enterprise::profile::master` class under the PE master group.
 
-- `r10k_remote` = the ssh url for your internal repo
+- `r10k_remote` = the SSH URL for your internal repo
 - `r10k_private_key` = `/etc/puppetlabs/puppetserver/code_manager.key`
 
-When upgrading the `puppet_enterprise::profile::master` class has the `file_sync_enabled` parameter set to `false`.  This parameter should be removed so that code manager can configure file sync.
+When upgrading the `puppet_enterprise::profile::master` class has the `file_sync_enabled` parameter set to `false`.  This parameter should be removed so that Code Manager can configure file sync.
 
-Finally, you’ll need to `echo 'code_manager_mv_old_code=true' > /opt/puppetlabs/facter/facts.d/code_manager_mv_old_code.txt` so that my puppet code will redeploy all of your code with code manager.
+Finally, you’ll need to `echo 'code_manager_mv_old_code=true' > /opt/puppetlabs/facter/facts.d/code_manager_mv_old_code.txt` so that my Puppet code will redeploy all of your code with Code Manager.
 
 # Appendix
 
-## Test The Zack/r10k Webhook
+## Test the zack/r10k webhook
 
 If you are using PE2015.2.z or if you've forced the use of the zack/r10k webhook then you'll want to test that it works.
 
-One of the components setup by this control-repo is that when you "push" code to your git server, the git server will inform the puppet master to run `r10k deploy environment -p`.
+One of the components setup by this control-repo is that when you "push" code to your Git server, the Git server will inform the Puppet master to run `r10k deploy environment -p`.
 
 1. Edit README.md
  - Just add something to it
