summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-06-18 01:46:27 -0500
committerMichael Merickel <michael@merickel.org>2017-06-18 01:46:27 -0500
commit75c30dfe18b26ca04efae2acbe35052fa0d93ed6 (patch)
treeebb57879035b60a801cd4deb113c4091956b67be /README.rst
parent4983421128e2e0fc92c771510f7b3af57de6d855 (diff)
parent5c437abba0926f6093efbd481e49763de2436665 (diff)
downloadpyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.gz
pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.tar.bz2
pyramid-75c30dfe18b26ca04efae2acbe35052fa0d93ed6.zip
Merge branch 'master' into pr/3034
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst10
1 files changed, 3 insertions, 7 deletions
diff --git a/README.rst b/README.rst
index 5f42115df..2b2535bfb 100644
--- a/README.rst
+++ b/README.rst
@@ -3,15 +3,11 @@ Pyramid
.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.9-branch
:target: https://travis-ci.org/Pylons/pyramid
- :alt: master Travis CI Status
+ :alt: 1.9-branch Travis CI Status
.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
:target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
- :alt: Master Documentation Status
-
-.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
- :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
- :alt: Latest Documentation Status
+ :alt: 1.9-branch Documentation Status
.. image:: https://img.shields.io/badge/irc-freenode-blue.svg
:target: https://webchat.freenode.net/?channels=pyramid
@@ -38,7 +34,7 @@ and deployment more fun, more predictable, and more productive.
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()
-Pyramid is a project of the `Pylons Project <http://pylonsproject.org/>`_.
+Pyramid is a project of the `Pylons Project <https://pylonsproject.org>`_.
Support and Documentation
-------------------------