From 8d6f737438a3cb9f8109c350745ab4b7808ed550 Mon Sep 17 00:00:00 2001 From: Arthur Loder Date: Fri, 21 Jun 2013 22:35:10 -0400 Subject: [PATCH] minor formatting changes. --- docs/conf.py | 2 +- docs/writing/license.rst | 12 ++++++------ docs/writing/style.rst | 2 +- docs/writing/tests.rst | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index fc31228..f5effd9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -46,7 +46,7 @@ master_doc = 'index' # General information about the project. project = u'pythonguide' -copyright = u'2013. A Kenneth Reitz Project. Creative Commons Share-Alike 3.0.' +copyright = u'2013. A Kenneth Reitz Project. Creative Commons Share-Alike 3.0' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/writing/license.rst b/docs/writing/license.rst index 9e759ba..6f0df77 100644 --- a/docs/writing/license.rst +++ b/docs/writing/license.rst @@ -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 `_, **use it**. -**More-Permissive** +**More Permissive** - PSFL (Python Software Foundation License) -- for contributing to python itself - MIT / BSD / ISC @@ -40,7 +40,7 @@ To help you choose one for your project, there's a `license chooser `_ and at `Stack Overflow `_. Idiomatic Python code is often referred to as being *Pythonic*. diff --git a/docs/writing/tests.rst b/docs/writing/tests.rst index 70c08f5..492e47a 100644 --- a/docs/writing/tests.rst +++ b/docs/writing/tests.rst @@ -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