summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-17 11:27:21 +0200
committerChris McDonough <chrism@plope.com>2013-08-17 11:27:21 +0200
commit45d8ef43ec723cacf79c1d6232e652ccee4d2dc9 (patch)
treec7e014b5ee474c9bb5ded035875148491128405e /docs
parent18d39328082dce27c9ce48364e3d6baa4d76ec79 (diff)
parentf6ea2275f927e88d43fb2d105bce33d0ece0df16 (diff)
downloadpyramid-45d8ef43ec723cacf79c1d6232e652ccee4d2dc9.tar.gz
pyramid-45d8ef43ec723cacf79c1d6232e652ccee4d2dc9.tar.bz2
pyramid-45d8ef43ec723cacf79c1d6232e652ccee4d2dc9.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs')
m---------docs/_themes0
-rw-r--r--docs/conf.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/_themes b/docs/_themes
-Subproject 8673c4a14f192c15f1949dc9862821e60f31604
+Subproject a181b85d4ca08fa109ee2786d4f1b5b17e9b458
diff --git a/docs/conf.py b/docs/conf.py
index 4c6ed76ad..3a8076cdf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -403,7 +403,7 @@ latex_elements = {
'wrapperclass': 'book',
'date': '',
'releasename': 'Version',
- 'title': r'The Pyramid Web Application \newline Development Framework',
+ 'title': r'The Pyramid Web Framework',
# 'pointsize':'12pt', # uncomment for 12pt version
}