Merge branch 'master' into Python3_update

# Conflicts:
#	.gitignore
#	.travis.yml
#	docs/CHANGES.rst
#	setup.py

docs/CHANGES.rst

@@ -16,66 +16,66 @@ Changes
 3.6.0 (2010-07-09)
 ------------------
 
-- Added name check for names assigned during imports using the
-  "from x import y" format.
+- Add name check for names assigned during imports using the
+  ``from x import y`` format.
 
-- Added test for name check when assigning an alias using multiple-context with
-  statements in Python 2.7.
+- Add test for name check when assigning an alias using multiple-context
+  ``with`` statements in Python 2.7.
 
-- Added tests for protection of the iterators for dict and set comprehensions
+- Add tests for protection of the iterators for dict and set comprehensions
   in Python 2.7.
 
 3.6.0a1 (2010-06-05)
 --------------------
 
-- Removed support for DocumentTemplate.sequence - this is handled in the
+- Remove support for ``DocumentTemplate.sequence`` - this is handled in the
   DocumentTemplate package itself.
 
 3.5.2 (2010-04-30)
 ------------------
 
-- Removed a testing dependency on zope.testing.
+- Remove a testing dependency on ``zope.testing``.
 
 3.5.1 (2009-03-17)
 ------------------
 
-- Added tests for ``Utilities`` module.
+- Add tests for ``Utilities`` module.
 
-- Filtered DeprecationWarnings when importing Python's ``sets`` module.
+- Filter DeprecationWarnings when importing Python's ``sets`` module.
 
 3.5.0 (2009-02-09)
 ------------------
 
-- Dropped legacy support for Python 2.1 / 2.2 (``__future__`` imports
+- Drop legacy support for Python 2.1 / 2.2 (``__future__`` imports
   of ``nested_scopes`` / ``generators``.).
 
 3.4.3 (2008-10-26)
 ------------------
 
-- Fixed deprecation warning: ``with`` is now a reserved keyword on
+- Fix deprecation warning: ``with`` is now a reserved keyword on
   Python 2.6. That means RestrictedPython should run on Python 2.6
   now. Thanks to Ranjith Kannikara, GSoC Student for the patch.
 
-- Added tests for ternary if expression and for 'with' keyword and
+- Add tests for ternary if expression and for ``with`` keyword and
   context managers.
 
 3.4.2 (2007-07-28)
 ------------------
 
-- Changed homepage URL to the CheeseShop site
+- Changed homepage URL to the PyPI site
 
-- Greatly improved README.txt
+- Improve ``README.txt``.
 
 3.4.1 (2007-06-23)
 ------------------
 
-- Fixed http://www.zope.org/Collectors/Zope/2295: Bare conditional in
+- Fix http://www.zope.org/Collectors/Zope/2295: Bare conditional in
   a Zope 2 PythonScript followed by a comment causes SyntaxError.
 
 3.4.0 (2007-06-04)
 ------------------
 
-- RestrictedPython now has its own release cycle as a separate egg.
+- RestrictedPython now has its own release cycle as a separate project.
 
 - Synchronized with RestrictedPython from Zope 2 tree.
 
@@ -93,10 +93,10 @@ Changes
 - Corresponds to the verison of the RestrictedPython package shipped
   as part of the Zope 3.1.0 release.
 
-- Removed unused fossil module, ``SafeMapping``.
+- Remove unused fossil module, ``SafeMapping``.
 
-- Replaced use of deprecated 'whrandom' module with 'random' (aliased
-  to 'whrandom' for backward compatibility).
+- Replaced use of deprecated ``whrandom`` module with ``random`` (aliased
+  to ``whrandom`` for backward compatibility).
 
 3.0.0 (2004-11-07)
 ------------------