Merge branch 'master' of github.com:Pylons/pyramid

6 files changed, 22 insertions, 37 deletions

diff --git a/docs/Makefile b/docs/Makefile
index c98fdc65e..12dc88bf8 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -63,8 +63,13 @@ latex:
 	cp _static/latex-note.png _build/latex
 	@echo
 	@echo "Build finished; the LaTeX files are in _build/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
+	@echo "Run \`make latexpdf' to build a PDF file from them."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C _build/latex all-pdf
+	@echo "pdflatex finished; the PDF file is in _build/latex."
 
 changes:
 	mkdir -p _build/changes _build/doctrees
diff --git a/docs/foreword.rst b/docs/foreword.rst
index aa8d7c77b..cc8271bdf 100644
--- a/docs/foreword.rst
+++ b/docs/foreword.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 Foreword
 ========
 
diff --git a/docs/index.rst b/docs/index.rst
index 22b27039c..5dfbbce1e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -216,13 +216,8 @@ Index and Glossary
 * :ref:`genindex`
 * :ref:`search`
 
-
-.. add glossary, foreword, and latexindex in a hidden toc to avoid warnings
-
 .. toctree::
    :hidden:
 
    glossary
-   foreword.rst
-   latexindex.rst
 
diff --git a/docs/latexindex.rst b/docs/latexindex.rst
index 83641d8b3..e2ba108ee 100644
--- a/docs/latexindex.rst
+++ b/docs/latexindex.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 .. _latexindex:
 
 =================================================
@@ -86,30 +88,9 @@ 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/introduction.rst b/docs/narr/introduction.rst
index 48164d323..fa2646134 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -217,6 +217,8 @@ that the Pyramid core doesn't.  Add-on packages already exist which let you
 easily send email, let you use the Jinja2 templating system, let you use
 XML-RPC or JSON-RPC, let you integrate with jQuery Mobile, etc.
 
+Examples: http://docs.pylonsproject.org/en/latest/docs/pyramid.html#pyramid-add-on-documentation
+
 
 Class-based and function-based views
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index b78b9b497..fd3229339 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -290,9 +290,9 @@ configured view.
   of the ``REQUEST_METHOD`` of the :term:`WSGI` environment.
 
 ``request_param``
-  This value can be any string or a sequence of strings.  A view declaration 
-  with this argument ensures that the view will only be called when the 
-  :term:`request` has a key in the ``request.params`` dictionary (an HTTP 
+  This value can be any string or a sequence of strings.  A view declaration
+  with this argument ensures that the view will only be called when the
+  :term:`request` has a key in the ``request.params`` dictionary (an HTTP
   ``GET`` or ``POST`` variable) that has a name which matches the
   supplied value.
 
@@ -306,8 +306,6 @@ configured view.
   consideration of keys and values in the ``request.params`` dictionary.
 
 ``match_param``
-  .. versionadded:: 1.2
-
   This param may be either a single string of the format "key=value" or a
   dict of key/value pairs.
 
@@ -324,6 +322,8 @@ configured view.
   If ``match_param`` is not supplied, the view will be invoked without
   consideration of the keys and values in ``request.matchdict``.
 
+  .. versionadded:: 1.2
+
 ``containment``
   This value should be a reference to a Python class or :term:`interface`
   that a parent object in the context resource's :term:`lineage` must provide
@@ -505,7 +505,7 @@ configuration stanza:
 .. code-block:: python
    :linenos:
 
-   config.add_view('mypackage.views.my_view', route_name='ok', 
+   config.add_view('mypackage.views.my_view', route_name='ok',
                    request_method='POST', permission='read')
 
 All arguments to ``view_config`` may be omitted.  For example:
@@ -570,7 +570,7 @@ You can invert the meaning of any predicate value by wrapping it in a call to
 
    config.add_view(
        'mypackage.views.my_view',
-       route_name='ok', 
+       route_name='ok',
        request_method=not_('POST')
        )