Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/intro/learning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ no previous programming experience.


Learn to Program in Python with Codeacademy
~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

A Codeacademy course for the absolute Python beginner. This free and interactive course provides and teaches the basics (and beyond) of Python programming whilst testing the user's knowledge in between progress.

Expand Down
2 changes: 1 addition & 1 deletion docs/intro/news.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Python News is the news section in the official Python web site
`Python News <http://www.python.org/news/>`_

Import Python Weekly
~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~

Weekly Python Newsletter containing Python Articles, Projects, Videos, Tweets
delivered in your inbox. Keep Your Python Programming Skills Updated.
Expand Down
2 changes: 1 addition & 1 deletion docs/scenarios/gui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and the mailing list https://groups.google.com/forum/#!forum/project-camelot

Cocoa
-----
.. note:: The Cocoa framework is only available on 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 Down
10 changes: 4 additions & 6 deletions docs/scenarios/imaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Installation
~~~~~~~~~~~~

Before installing Pillow, you'll have to install Pillow's prerequisites. Find
the instructions for your platform
`here <https://pillow.readthedocs.org/en/3.0.0/installation.html>`_.
the instructions for your platform in the
`Pillow installation instructions <https://pillow.readthedocs.org/en/3.0.0/installation.html>`_.

After that, it's straightforward:

Expand Down Expand Up @@ -53,7 +53,5 @@ Example
exif_data = im._getexif()
exif_data

There are more examples of the Pillow library
`here <http://pillow.readthedocs.org/en/3.0.x/handbook/tutorial.html>`_.


There are more examples of the Pillow library in the
`Pillow tutorial <http://pillow.readthedocs.org/en/3.0.x/handbook/tutorial.html>`_.
4 changes: 2 additions & 2 deletions docs/scenarios/web.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ programming languages and protocols - including Python and WSGI. uWSGI can
either be run as a stand-alone web router, or be run behind a full web
server (such as Nginx or Apache). In the latter case, a web server can
configure uWSGI and an application's operation over the
`uwsgi <https://uwsgi-docs.readthedocs.org/en/latest/Protocol.html>`_
protocol. uWSGI's web server support allows for dynamically configuring
`uwsgi protocol <https://uwsgi-docs.readthedocs.org/en/latest/Protocol.html>`_.
uWSGI's web server support allows for dynamically configuring
Python, passing environment variables and further tuning. For full details,
see `uWSGI magic
variables <https://uwsgi-docs.readthedocs.org/en/latest/Vars.html>`_.
Expand Down
4 changes: 2 additions & 2 deletions docs/shipping/freezing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Prerequisite is to install :ref:`Python on Windows <install-windows>`.

1. Download and install http://sourceforge.net/projects/py2exe/files/py2exe/

2. Write :file:`setup.py` (`List of configuration options <http://www.py2exe.org/index.cgi/ListOfOptions>`_)::
2. Write :file:`setup.py` (`List of configuration options <http://www.py2exe.org/index.cgi/ListOfOptions>`_):

.. code-block:: python

Expand Down Expand Up @@ -107,7 +107,7 @@ 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
----


Expand Down