summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2013-08-16 00:48:12 -0700
committerSteve Piercy <web@stevepiercy.com>2013-08-16 00:48:12 -0700
commit65c60a85f90f7bf8f97848e7314b6d0e9ecc5599 (patch)
treeca7d1f34b25f995a4b28a260b28ea8c69db277da
parentca25863d5100535e1b91117b3487b1b3a03e2522 (diff)
downloadpyramid-65c60a85f90f7bf8f97848e7314b6d0e9ecc5599.tar.gz
pyramid-65c60a85f90f7bf8f97848e7314b6d0e9ecc5599.tar.bz2
pyramid-65c60a85f90f7bf8f97848e7314b6d0e9ecc5599.zip
restore earlier fixes on latexindex
don't make up funny words and use explicit 32- or 64-bit phrase
-rw-r--r--docs/index.rst3
-rw-r--r--docs/latexindex.rst40
-rw-r--r--docs/narr/install.rst2
3 files changed, 14 insertions, 31 deletions
diff --git a/docs/index.rst b/docs/index.rst
index f899ddac3..d2a0008a8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -129,7 +129,7 @@ platforms.
tutorials/bfg/index.rst
tutorials/modwsgi/index.rst
-.. _api_documentation:
+.. _html_api_documentation:
API Documentation
=================
@@ -204,5 +204,4 @@ Index and Glossary
:hidden:
glossary
- latexindex
diff --git a/docs/latexindex.rst b/docs/latexindex.rst
index 13ba61648..eb14f5076 100644
--- a/docs/latexindex.rst
+++ b/docs/latexindex.rst
@@ -1,3 +1,5 @@
+:orphan:
+
.. _latexindex:
=========================
@@ -28,8 +30,8 @@ Narrative Documentation
narr/introduction
narr/install
- narr/configuration
narr/firstapp
+ narr/configuration
narr/project
narr/startup
narr/router
@@ -50,6 +52,7 @@ Narrative Documentation
narr/vhosting
narr/testing
narr/resources
+ narr/hellotraversal
narr/muchadoabouttraversal
narr/traversal
narr/security
@@ -60,6 +63,8 @@ Narrative Documentation
narr/extending
narr/advconfig
narr/extconfig
+ narr/scaffolding
+ narr/upgrading
narr/threadlocals
narr/zca
@@ -71,42 +76,21 @@ Tutorials
.. toctree::
:maxdepth: 1
- tutorials/wiki/index.rst
tutorials/wiki2/index.rst
+ tutorials/wiki/index.rst
tutorials/bfg/index.rst
tutorials/modwsgi/index.rst
-.. _api_reference:
+.. _api_documentation:
-API Reference
-@@@@@@@@@@@@@
+API Documentation
+@@@@@@@@@@@@@@@@@
.. toctree::
:maxdepth: 1
+ :glob:
- api/authorization
- api/authentication
- api/config
- api/events
- api/exceptions
- api/httpexceptions
- api/i18n
- api/interfaces
- api/location
- api/paster
- api/registry
- api/renderers
- api/request
- api/response
- api/scripting
- api/security
- api/settings
- api/testing
- api/threadlocal
- api/traversal
- api/url
- api/view
- api/wsgi
+ api/*
.. backmatter::
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 7f549e824..15e9e8699 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -309,7 +309,7 @@ You can use Pyramid on Windows under Python 2 or 3.
#. Download and install the `Python for Windows extensions
<http://sourceforge.net/projects/pywin32/files/pywin32/>`_. Carefully read
the README.txt file at the end of the list of builds, and follow its
- directions. Make sure you get the proper "bittedness" of build and Python
+ directions. Make sure you get the proper 32- or 64-bit build and Python
version.
#. Install latest :term:`setuptools` distribution into the Python from step 1