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/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

# General information about the project.
project = u'pythonguide'
copyright = u'2013. A <a href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a> Project. <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/"> Creative Commons Share-Alike 3.0</a>.'
copyright = u'2013. A <a href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a> Project. <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/"> Creative Commons Share-Alike 3.0</a>'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
12 changes: 6 additions & 6 deletions docs/writing/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ from.
In general, these licenses tend to fall into one of two categories:

1. licenses that focus more on the user's freedom to do with the
software as they please (these are the more-permissive open
software as they please (these are the more permissive open
source licenses such as the MIT, BSD, & Apache).

2. licenses that focus more on making sure that the code itself —
including any changes made to it and distributed along with it —
always remains free (these are the less-permissive free software
licenses, for example, the GPL and LGPL).
always remains free (these are the less permissive free software
licenses such as the GPL and LGPL).

The latter are less-permissive in the sense that they don't permit
The latter are less permissive in the sense that they don't permit
someone to add code to the software and distribute it without also
including the source code for their changes.

To help you choose one for your project, there's a `license chooser <http://three.org/openart/license_chooser/>`_,
**use it**.

**More-Permissive**
**More Permissive**

- PSFL (Python Software Foundation License) -- for contributing to python itself
- MIT / BSD / ISC
Expand All @@ -40,7 +40,7 @@ To help you choose one for your project, there's a `license chooser <http://thre

- Apache

**Less-Permissive:**
**Less Permissive:**

- LGPL
- GPL
Expand Down
2 changes: 1 addition & 1 deletion docs/writing/style.rst
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ are a probable indication that such a refactoring is needed.
Idioms
------

A programming Idiom, put simply, is a *way* to write code. The notion of programming Idioms
A programming idiom, put simply, is a *way* to write code. The notion of programming idioms
is discussed amply at `c2 <http://c2.com/cgi/wiki?ProgrammingIdiom>`_ and at `Stack Overflow <http://stackoverflow.com/questions/302459/what-is-a-programming-idiom>`_.

Idiomatic Python code is often referred to as being *Pythonic*.
Expand Down
2 changes: 1 addition & 1 deletion docs/writing/tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ py.test is a no-boilerplate alternative to Python's standard unittest module.

$ pip install pytest

Despite being a fully-featured and extensible test tool it boasts a simple
Despite being a fully-featured and extensible test tool, it boasts a simple
syntax. Creating a test suite is as easy as writing a module with a couple of
functions

Expand Down