summaryrefslogtreecommitdiff
path: root/docs/copyright.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-21 16:57:52 -0500
committerMichael Merickel <michael@merickel.org>2015-10-21 16:57:52 -0500
commitadb9377a963d7fdc7b7bf616740fb5dd2e40b2bf (patch)
tree1038d03a21148607c79f740f0b32b147929251bf /docs/copyright.rst
parent452fdbef94bb29560497ec8a9ccbc3b9c2ecd2dd (diff)
parentd4221720b8409eafb65b301562be327af0196c7e (diff)
downloadpyramid-adb9377a963d7fdc7b7bf616740fb5dd2e40b2bf.tar.gz
pyramid-adb9377a963d7fdc7b7bf616740fb5dd2e40b2bf.tar.bz2
pyramid-adb9377a963d7fdc7b7bf616740fb5dd2e40b2bf.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/copyright.rst')
-rw-r--r--docs/copyright.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/copyright.rst b/docs/copyright.rst
index 980335827..3beaee7f7 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -39,7 +39,7 @@ any trademark or service mark.
Every effort has been made to make this book as complete and as
accurate as possible, but no warranty or fitness is implied. The
-information provided is on as "as-is" basis. The author and the
+information provided is on an "as-is" basis. The author and the
publisher shall have neither liability nor responsibility to any
person or entity with respect to any loss or damages arising from the
information contained in this book. No patent liability is assumed
@@ -89,14 +89,14 @@ Contacting The Publisher
Please send documentation licensing inquiries, translation inquiries,
and other business communications to `Agendaless Consulting
<mailto:webmaster@agendaless.com>`_. Please send software and other
-technical queries to the `Pylons-devel maillist
+technical queries to the `Pylons-devel mailing list
<http://groups.google.com/group/pylons-devel>`_.
HTML Version and Source Code
----------------------------
An HTML version of this book is freely available via
-http://docs.pylonsproject.org
+http://docs.pylonsproject.org/projects/pyramid/en/latest/
The source code for the examples used in this book are available
within the :app:`Pyramid` software distribution, always available