RedHatTraining/pyramid.git

			@@ -5,7 +5,7 @@
			=========================

			:app:`Pyramid` is a small, fast, down-to-earth Python web framework. It is
			developed as part of the `Pylons Project <http://www.pylonsproject.org/>`_.
			developed as part of the `Pylons Project <https://pylonsproject.org>`_.
			It is licensed under a `BSD-like license <http://repoze.org/license.html>`_.

			Here is one of the simplest :app:`Pyramid` applications you can make:
			@@ -13,8 +13,8 @@
			.. literalinclude:: narr/helloworld.py

			After you install :app:`Pyramid` and run this application, when you visit
			`<http://localhost:8080/hello/world>`_ in a browser, you will see the text
			``Hello, world!`` See :ref:`firstapp_chapter` for a full explanation of how
			`<http://localhost:6543/>`_ in a browser, you will see the text
			``Hello World!`` See :ref:`firstapp_chapter` for a full explanation of how
			this application works.


			@@ -35,9 +35,6 @@
			* :doc:`quick_tour` gives an overview of the major features in Pyramid,
			covering a little about a lot.

			* :doc:`quick_tutorial/index` is similar to the Quick Tour, but in a tutorial
			format, with somewhat deeper treatment of each topic and with working code.

			* Like learning by example? Visit the official :ref:`html_tutorials` as well as
			the community-contributed :ref:`Pyramid Tutorials
			<tutorials:pyramid-tutorials>` and :ref:`Pyramid Community Cookbook
			@@ -53,13 +50,12 @@
			Tutorials
			=========

			Official tutorials explaining how to use :app:`Pyramid` to build various types
			of applications, and how to deploy :app:`Pyramid` applications to various
			platforms.
			Official tutorials provide a quick overview of :app:`Pyramid`'s features in more depth than the Quick Tour and with working code, explain how to use :app:`Pyramid` to build various types of applications, and how to deploy :app:`Pyramid` applications to various platforms.

			.. toctree::
			:maxdepth: 1

			quick_tutorial/index
			tutorials/wiki2/index
			tutorials/wiki/index
			tutorials/modwsgi/index
			@@ -70,8 +66,9 @@
			Support and Development
			=======================

			The `Pylons Project web site <http://www.pylonsproject.org/>`_ is the main
			online source of :app:`Pyramid` support and development information.
			The `Pyramid website <https://trypyramid.com/documentation.html>`_ is the main
			entry point to :app:`Pyramid` web framework resources for support and
			development information.

			To report bugs, use the `issue tracker
			<https://github.com/Pylons/pyramid/issues>`_.
			@@ -88,15 +85,13 @@

			.. code-block:: text

			# If you have SSH keys configured on GitHub:
			git clone git@github.com:Pylons/pyramid.git

			# Otherwise, HTTPS will work, using your GitHub login:
			git clone https://github.com/Pylons/pyramid.git
			# If you have SSH keys configured on GitHub:
			git clone git@github.com:Pylons/pyramid.git

			To find out how to become a contributor to :app:`Pyramid`, please see the
			`contributor's section of the documentation
			<http://docs.pylonsproject.org/en/latest/#contributing>`_.
			# Otherwise, HTTPS will work, using your GitHub login:
			git clone https://github.com/Pylons/pyramid.git

			To find out how to become a contributor to :app:`Pyramid`, please see `How to Contribute Source Code and Documentation <https://pylonsproject.org/community-how-to-contribute.html>`_.


			.. _html_narrative_documentation:
			@@ -144,6 +139,7 @@
			narr/extending
			narr/advconfig
			narr/extconfig
			narr/cookiecutters
			narr/scaffolding
			narr/upgrading
			narr/threadlocals
			@@ -183,6 +179,9 @@
			.. toctree::
			:maxdepth: 1

			whatsnew-1.10
			whatsnew-1.9
			whatsnew-1.8
			whatsnew-1.7
			whatsnew-1.6
			whatsnew-1.5
			@@ -212,13 +211,13 @@
			copyright


			Typographical Conventions
			=========================
			Typographical Conventions and Style Guide
			=========================================

			.. toctree::
			:maxdepth: 1

			conventions
			typographical-conventions


			Index and Glossary