Sync with upstream repository

gjtorikian · gjtorikian · commit 8f4ab69715f5 · 2015-07-15T14:12:44.000-07:00
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.4
+2.1.6
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.4
+  - 2.1.6
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-ruby '2.1.4'
+ruby '2.1.6'
 
 gem 'builder'
 gem 'coderay'
diff --git a/content/guides/managing-deploy-keys.md b/content/guides/managing-deploy-keys.md
@@ -92,7 +92,7 @@ If your server needs to access multiple repositories, you can choose to create a
 
 <div class="alert">
 <p>
-<strong>Tip</strong>: Our <a href="https://help.github.com/articles/github-terms-of-service">terms of service</a> do mention that <em>'Accounts registered by "bots" or other automated methods are not permitted.'</em> and that <em>'One person or legal entity may not maintain more than one free account.'</em>  But don't fear, we won't send rabid lawyers out to hunt you down if you create machine users for your server deploy scripts. Machine users are completely kosher.
+<strong>Tip</strong>: Our <a href="https://help.github.com/articles/github-terms-of-service">terms of service</a> do mention that <em>'Accounts registered by "bots" or other automated methods are not permitted.'</em> and that <em>'One person or legal entity may not maintain more than one free account.'</em>  But don't fear, we won't send rabid lawyers out to hunt you down if you create a single machine user for your organization's deploy scripts. Creating a single machine user for your project or organization is totally cool.
 </p>
 </div>
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 language: ruby
 rvm:
 -  - 2.1.4
 +  - 2.1.6