Version bump

pyscaffold · Feb 10, 2016 · 642da82 · 642da82
1 parent 6f82d08
commit 642da82
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,7 +2,7 @@
 Release Notes
 =============
 
-Version 2.5.4, 2016-??-??
+Version 2.5.4, 2016-02-10
 =========================
 
 - Fix problem with ``fibonacci`` terminal example

diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@
 PyScaffold helps you to easily setup a new Python project, it is as easy as::
 
     putup my_project
-    
+
 This will create a new folder ``my_project`` containing a perfect *project
 template* with everything you need for some serious coding.
 
@@ -81,7 +81,7 @@ Build the documentation with ``python setup.py docs`` and run doctests with
 extend the documentation. The documentation also works with `Read the Docs
 <https://readthedocs.org/>`_.
 
-The `Numpy or Google <http://sphinx-doc.org/latest/ext/napoleon.html>`_
+The `Numpy and Google <http://sphinx-doc.org/latest/ext/napoleon.html>`_
 documentation is activated by default but make sure Sphinx 1.3 or above is
 installed.
 

diff --git a/docs/features.rst b/docs/features.rst
@@ -80,7 +80,7 @@ Build the documentation with ``python setup.py docs`` and run doctests with
 extend the documentation. The documentation also works with `Read the Docs
 <https://readthedocs.org/>`_.
 
-The `Numpy or Google <http://sphinx-doc.org/latest/ext/napoleon.html>`_
+The `Numpy and Google <http://sphinx-doc.org/latest/ext/napoleon.html>`_
 documentation is activated by default but make sure Sphinx 1.3 or above is
 installed.