Merge remote-tracking branch 'upstream/master'

60da0196 · Todd Koym · c198fb74 · 081e1ef8 · 60da0196 · 60da0196
Commit 60da0196 authored Jul 21, 2016 by Todd Koym
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CONTRIBUTORS.txt CONTRIBUTORS.txt +1 -0

README.rst README.rst +2 -2

No files found.
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -99,4 +99,5 @@ Contributors
 - Chris McDonough, 2011/08/18
 - Georges Dubus, 2012/05/27
 - Tres Seaver, 2012/05/27
+- Steve Piercy, 2016/07/21
 - Todd Koym, 2016/07/21
--- a/README.rst
+++ b/README.rst
@@ -4,6 +4,6 @@
 A library which parses URIs and converts them to ZODB storage objects and
 database arguments.
-See the documentation at http://docs.pylonsproject.org/projects/zodburi/dev/
+See the documentation at
-for more information.
+http://docs.pylonsproject.org/projects/zodburi/en/latest/ for more information.