kennethreitz/python-guide
1
0
Fork 0
mirror of https://github.com/kennethreitz/python-guide.git synced 2026-06-05 23:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #286 from artloder/minor-changes

Browse Source 
Minor formatting changes.
This commit is contained in:
Kenneth Reitz
2013-07-15 06:26:30 -07:00
parent a061a7c11b 8d6f737438
commit 40caacfeed
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/conf.py
+1 -1
View File
@@ -46,7 +46,7 @@ master_doc = 'index'
# General information about the project. # General information about the project.
project = u'pythonguide' 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 # The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the # |version| and |release|, also used in various other places throughout the
docs/writing/license.rst
+6 -6
View File
@@ -14,22 +14,22 @@ from.
In general, these licenses tend to fall into one of two categories: 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 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). source licenses such as the MIT, BSD, & Apache).
2. licenses that focus more on making sure that the code itself — 2. licenses that focus more on making sure that the code itself —
including any changes made to it and distributed along with it — including any changes made to it and distributed along with it —
always remains free (these are the less-permissive free software always remains free (these are the less permissive free software
licenses, for example, the GPL and LGPL). 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 someone to add code to the software and distribute it without also
including the source code for their changes. 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/>`_, To help you choose one for your project, there's a `license chooser <http://three.org/openart/license_chooser/>`_,
**use it**. **use it**.
**More-Permissive** **More Permissive**
- PSFL (Python Software Foundation License) -- for contributing to python itself - PSFL (Python Software Foundation License) -- for contributing to python itself
- MIT / BSD / ISC - MIT / BSD / ISC
@@ -40,7 +40,7 @@ To help you choose one for your project, there's a `license chooser <http://thre
- Apache - Apache
**Less-Permissive:** **Less Permissive:**
- LGPL - LGPL
- GPL - GPL
docs/writing/style.rst
+1 -1
View File
@@ -256,7 +256,7 @@ are a probable indication that such a refactoring is needed.
Idioms 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>`_. 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*. Idiomatic Python code is often referred to as being *Pythonic*.
docs/writing/tests.rst
+1 -1
View File
@@ -146,7 +146,7 @@ py.test is a no-boilerplate alternative to Python's standard unittest module.
$ pip install pytest $ 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 syntax. Creating a test suite is as easy as writing a module with a couple of
functions functions