realpython · sigmavirus24 · Apr 14, 2014 · Apr 11, 2014 · Apr 11, 2014 · Apr 11, 2014
diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst
@@ -55,9 +55,9 @@ Travis-CI
 ---------
 `Travis-CI <https://travis-ci.org/>`_ is a distributed CI server which builds tests
 for open source projects for free. It provides multiple workers to run Python tests
-on and seamlessly integrates with Github. You can even have it comment on your Pull
+on and seamlessly integrates with GitHub. You can even have it comment on your Pull
 Requests whether this particular changeset breaks the build or not. So if you are
-hosting your code on Github, travis-ci is a great and easy way to get started with
+hosting your code on GitHub, travis-ci is a great and easy way to get started with
 Continuous Integration.
 
 In order to get started, add a :file:`.travis.yml` file to your repository with this
@@ -83,5 +83,5 @@ notifications, before and after steps and much more. The
 thorough.
 
 In order to activate testing for your project, go to `the travis-ci site <https://travis-ci.org/>`_
-and login with your Github account. Then activate your project in your profile settings and that's
-it. From now on, your project's tests will be run on every push to Github.
+and login with your GitHub account. Then activate your project in your profile settings and that's
+it. From now on, your project's tests will be run on every push to GitHub.
diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst
@@ -18,7 +18,7 @@ and the mailinglist https://groups.google.com/forum/#!forum/project-camelot
 
 Cocoa
 -----
-.. note:: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!
+.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
 
 GTk
 ---
@@ -45,7 +45,7 @@ The main resource for information is the website: http://kivy.org
 
 PyObjC
 ~~~~~~
-.. note:: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.
+.. note:: Only available on OS X. Don't pick this if you're writing a cross-platform application.
 
 PySide
 ~~~~~~

diff --git a/docs/scenarios/scrape.rst b/docs/scenarios/scrape.rst
@@ -24,7 +24,7 @@ module instead of the already built-in urlib2 due to improvements in speed and
 readability. You can easily install both using ``pip install lxml`` and
 ``pip install requests``.
 
-Lets start with the imports:
+Let's start with the imports:
 
 .. code-block:: python
 
@@ -71,7 +71,7 @@ Knowing this we can create the correct XPath query and use the lxml
     #This will create a list of prices
     prices = tree.xpath('//span[@class="item-price"]/text()')
 
-Lets see what we got exactly:
+Let's see what we got exactly:
 
 .. code-block:: python
 

diff --git a/docs/scenarios/speed.rst b/docs/scenarios/speed.rst
@@ -153,7 +153,7 @@ in a similar way like in standard C. For example `cdef int n,k,i` in line 3.  Th
 allows the Cython compiler to generate more efficient C code from the second code. While standard Python code is saved in :file:`*.py` files,
 Cython code is saved in :file:`*.pyx` files.
 
-And what is with the speed? So lets try it!
+And what is with the speed? So let's try it!
 
 .. code-block:: python
 

diff --git a/docs/shipping/freezing.rst b/docs/shipping/freezing.rst
@@ -89,8 +89,8 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc
 - `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_
 
 
-OSX
----
+OS X
+----
 
 
 py2app
-Original file line number
+Diff line change
@@ Expand Up @@
     Cocoa
     -----
-    .. note:: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!
+    .. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
     GTk
     ---
@@ Expand All @@
     PyObjC
     ~~~~~~
-    .. note:: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.
+    .. note:: Only available on OS X. Don't pick this if you're writing a cross-platform application.
     PySide
     ~~~~~~
@@ Expand Down @@