Chris McDonough
2013-07-22 22e45d4ad6c9febf8befb12d5b011d1327a6b657
Merge pull request #1048 from stevepiercy/master

Synch some differences between index.rst and latexindex.rst, with index.rst as master
12 files deleted
3 files modified
387 ■■■■■ changed files
docs/authorintro.rst 2 ●●● patch | view | raw | blame | history
docs/index.rst 4 ●●●● patch | view | raw | blame | history
docs/latexindex.rst 26 ●●●●● patch | view | raw | blame | history
docs/tutorials/pycharm/images/create_new_project.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/create_setup.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/create_virtual_environment.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/edit_run_debug_configurations.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/install_package.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/install_package_pyramid.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/install_package_setuptools.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/python_interpreters_1.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/python_interpreters_2.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/run_configuration.png patch | view | raw | blame | history
docs/tutorials/pycharm/images/start_up_screen.png patch | view | raw | blame | history
docs/tutorials/pycharm/index.rst 355 ●●●●● patch | view | raw | blame | history
docs/authorintro.rst
@@ -73,7 +73,7 @@
  concepts in terms of the sample.  You should read the tutorials if
  you want a guided tour of :app:`Pyramid`.
:ref:`api_reference`
:ref:`api_documentation`
  Comprehensive reference material for every public API exposed by
  :app:`Pyramid`.  The API documentation is organized
docs/index.rst
@@ -46,7 +46,7 @@
.. _html_narrative_documentation:
Narrative documentation
Narrative Documentation
=======================
Narrative documentation in chapter form explaining how to use
@@ -112,7 +112,7 @@
   tutorials/pycharm/index.rst
API Documentation
==================
=================
Comprehensive reference material for every public API exposed by :app:`Pyramid`:
docs/latexindex.rst
@@ -1,13 +1,13 @@
.. _latexindex:
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
The :app:`Pyramid` Web Application Framework
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
=================================================
The Pyramid Web Application Development Framework
=================================================
.. frontmatter::
Front Matter
@@@@@@@@@@@@
============
.. toctree::
   :maxdepth: 1
@@ -21,15 +21,15 @@
.. _narrative_documentation:
Narrative Documentation
@@@@@@@@@@@@@@@@@@@@@@@
=======================
.. toctree::
   :maxdepth: 1
   narr/introduction
   narr/install
   narr/configuration
   narr/firstapp
   narr/configuration
   narr/project
   narr/startup
   narr/router
@@ -50,6 +50,7 @@
   narr/vhosting
   narr/testing
   narr/resources
   narr/hellotraversal
   narr/muchadoabouttraversal
   narr/traversal
   narr/security
@@ -60,26 +61,29 @@
   narr/extending
   narr/advconfig
   narr/extconfig
   narr/scaffolding
   narr/upgrading
   narr/threadlocals
   narr/zca
.. _tutorials:
Tutorials
@@@@@@@@@
=========
.. toctree::
   :maxdepth: 1
   tutorials/wiki/index.rst
   tutorials/wiki2/index.rst
   tutorials/wiki/index.rst
   tutorials/bfg/index.rst
   tutorials/modwsgi/index.rst
   tutorials/pycharm/index.rst
.. _api_reference:
.. _api_documentation:
API Reference
@@@@@@@@@@@@@
API Documentation
=================
.. toctree::
   :maxdepth: 1
docs/tutorials/pycharm/images/create_new_project.png
Binary files differ
docs/tutorials/pycharm/images/create_setup.png
Binary files differ
docs/tutorials/pycharm/images/create_virtual_environment.png
Binary files differ
docs/tutorials/pycharm/images/edit_run_debug_configurations.png
Binary files differ
docs/tutorials/pycharm/images/install_package.png
Binary files differ
docs/tutorials/pycharm/images/install_package_pyramid.png
Binary files differ
docs/tutorials/pycharm/images/install_package_setuptools.png
Binary files differ
docs/tutorials/pycharm/images/python_interpreters_1.png
Binary files differ
docs/tutorials/pycharm/images/python_interpreters_2.png
Binary files differ
docs/tutorials/pycharm/images/run_configuration.png
Binary files differ
docs/tutorials/pycharm/images/start_up_screen.png
Binary files differ
docs/tutorials/pycharm/index.rst
File was deleted