From b7f0d20511dd83dcb476edd622c6761ed91f8f45 Mon Sep 17 00:00:00 2001 From: Zearin Date: Fri, 11 Apr 2014 14:32:40 -0400 Subject: [PATCH 1/4] =?UTF-8?q?scenarios/ci:=20Github=20=E2=96=B6=EF=B8=8E?= =?UTF-8?q?=20GitHub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/scenarios/ci.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/scenarios/ci.rst b/docs/scenarios/ci.rst index 7138893..19039de 100644 --- a/docs/scenarios/ci.rst +++ b/docs/scenarios/ci.rst @@ -55,9 +55,9 @@ Travis-CI --------- `Travis-CI `_ 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 `_ -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. From 3a2850bc346e161f89a257c6383ebd7a85306ca0 Mon Sep 17 00:00:00 2001 From: Zearin Date: Fri, 11 Apr 2014 14:35:30 -0400 Subject: [PATCH 2/4] =?UTF-8?q?Lets=20=E2=96=B6=EF=B8=8E=20Let's=20(where?= =?UTF-8?q?=20appropriate)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/scenarios/scrape.rst | 4 ++-- docs/scenarios/speed.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/scenarios/scrape.rst b/docs/scenarios/scrape.rst index cb2764b..69c6e34 100644 --- 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 index 96065c2..61cf80b 100644 --- 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 From 64d756feb986c68a044c6b21ce93dacb50ca5e02 Mon Sep 17 00:00:00 2001 From: Zearin Date: Fri, 11 Apr 2014 14:55:19 -0400 Subject: [PATCH 3/4] =?UTF-8?q?OSX=20=E2=96=B6=EF=B8=8E=20OS=C2=A0X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also removed “Mac”, as the official name was officially shortened to “OS X” a few releases ago. --- docs/scenarios/gui.rst | 4 ++-- docs/shipping/freezing.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/scenarios/gui.rst b/docs/scenarios/gui.rst index 2bde519..989f671 100644 --- 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/shipping/freezing.rst b/docs/shipping/freezing.rst index a54ea95..6859b73 100644 --- a/docs/shipping/freezing.rst +++ b/docs/shipping/freezing.rst @@ -89,7 +89,7 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc - `Manual `_ -OSX +OS X --- From 841fa9cf87b00250a4b75514819f749572be0d71 Mon Sep 17 00:00:00 2001 From: Tony Date: Mon, 14 Apr 2014 08:02:32 -0400 Subject: [PATCH 4/4] =?UTF-8?q?freezing.rst:=20Fix=20heading=E2=80=99s=20h?= =?UTF-8?q?yphen=20length?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/shipping/freezing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/shipping/freezing.rst b/docs/shipping/freezing.rst index 6859b73..7b118fe 100644 --- a/docs/shipping/freezing.rst +++ b/docs/shipping/freezing.rst @@ -90,7 +90,7 @@ Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependenc OS X ---- +---- py2app