Skip to content

Commit cf3a875

Browse files
committed
Merge pull request realpython#409 from Zearin/text
Minor text fixes
2 parents c8725bc + 841fa9c commit cf3a875

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

docs/scenarios/ci.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ Travis-CI
5555
---------
5656
`Travis-CI <https://travis-ci.org/>`_ is a distributed CI server which builds tests
5757
for open source projects for free. It provides multiple workers to run Python tests
58-
on and seamlessly integrates with Github. You can even have it comment on your Pull
58+
on and seamlessly integrates with GitHub. You can even have it comment on your Pull
5959
Requests whether this particular changeset breaks the build or not. So if you are
60-
hosting your code on Github, travis-ci is a great and easy way to get started with
60+
hosting your code on GitHub, travis-ci is a great and easy way to get started with
6161
Continuous Integration.
6262

6363
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
8383
thorough.
8484

8585
In order to activate testing for your project, go to `the travis-ci site <https://travis-ci.org/>`_
86-
and login with your Github account. Then activate your project in your profile settings and that's
87-
it. From now on, your project's tests will be run on every push to Github.
86+
and login with your GitHub account. Then activate your project in your profile settings and that's
87+
it. From now on, your project's tests will be run on every push to GitHub.

docs/scenarios/gui.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and the mailinglist https://groups.google.com/forum/#!forum/project-camelot
1818

1919
Cocoa
2020
-----
21-
.. note:: The Cocoa framework is only available on Mac OSX. Don't pick this if you're writing a cross-platform application!
21+
.. note:: The Cocoa framework is only available on OS X. Don't pick this if you're writing a cross-platform application!
2222

2323
GTk
2424
---
@@ -45,7 +45,7 @@ The main resource for information is the website: http://kivy.org
4545

4646
PyObjC
4747
~~~~~~
48-
.. note:: Only available on Mac OSX. Don't pick this if you're writing a cross-platform application.
48+
.. note:: Only available on OS X. Don't pick this if you're writing a cross-platform application.
4949

5050
PySide
5151
~~~~~~

docs/scenarios/scrape.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module instead of the already built-in urlib2 due to improvements in speed and
2424
readability. You can easily install both using ``pip install lxml`` and
2525
``pip install requests``.
2626

27-
Lets start with the imports:
27+
Let's start with the imports:
2828

2929
.. code-block:: python
3030
@@ -71,7 +71,7 @@ Knowing this we can create the correct XPath query and use the lxml
7171
#This will create a list of prices
7272
prices = tree.xpath('//span[@class="item-price"]/text()')
7373
74-
Lets see what we got exactly:
74+
Let's see what we got exactly:
7575

7676
.. code-block:: python
7777

docs/scenarios/speed.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ in a similar way like in standard C. For example `cdef int n,k,i` in line 3. Th
153153
allows the Cython compiler to generate more efficient C code from the second code. While standard Python code is saved in :file:`*.py` files,
154154
Cython code is saved in :file:`*.pyx` files.
155155

156-
And what is with the speed? So lets try it!
156+
And what is with the speed? So let's try it!
157157

158158
.. code-block:: python
159159

docs/shipping/freezing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc
8989
- `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_
9090

9191

92-
OSX
93-
---
92+
OS X
93+
----
9494

9595

9696
py2app

0 commit comments

Comments
 (0)