diff options
| author | Chris McDonough <chrism@plope.com> | 2013-07-28 14:08:38 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-07-28 14:08:38 -0400 |
| commit | e3a2eff1cd4f43731be02a93e321c580a74a0557 (patch) | |
| tree | f0c41c1c851c5b07a6ac9acfe8d3d4ac9e0fa166 | |
| parent | 0ed2c8f00d31caa224875a51b6a7723098b570ef (diff) | |
| parent | 76a8affa6dde2d3b666023f727cb22909a386d50 (diff) | |
| download | pyramid-e3a2eff1cd4f43731be02a93e321c580a74a0557.tar.gz pyramid-e3a2eff1cd4f43731be02a93e321c580a74a0557.tar.bz2 pyramid-e3a2eff1cd4f43731be02a93e321c580a74a0557.zip | |
Merge branch 'master' into dslatten-patch-1
| -rw-r--r-- | docs/Makefile | 9 | ||||
| -rw-r--r-- | docs/latexindex.rst | 25 |
2 files changed, 9 insertions, 25 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/latexindex.rst b/docs/latexindex.rst index c0cfb7696..e2ba108ee 100644 --- a/docs/latexindex.rst +++ b/docs/latexindex.rst @@ -88,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:: |