summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-01-14 02:55:04 -0800
committerSteve Piercy <web@stevepiercy.com>2016-01-14 02:55:04 -0800
commit34515f33b3e391dd1c0c727bf5ef4af586b57889 (patch)
tree44d5016a6699993d92d3f0e19780152194a58870 /docs
parent5dfb7824ba6d0f20a2dfd527f9bafa1db9263a08 (diff)
downloadpyramid-34515f33b3e391dd1c0c727bf5ef4af586b57889.tar.gz
pyramid-34515f33b3e391dd1c0c727bf5ef4af586b57889.tar.bz2
pyramid-34515f33b3e391dd1c0c727bf5ef4af586b57889.zip
Rename Cookbook to Pyramid Community Cookbook
- use .rst intersphinx labels for pages instead of broken URLs
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
-rw-r--r--docs/index.rst2
-rw-r--r--docs/narr/advconfig.rst7
-rw-r--r--docs/narr/i18n.rst6
-rw-r--r--docs/narr/introduction.rst3
-rw-r--r--docs/whatsnew-1.3.rst9
6 files changed, 14 insertions, 15 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 82423a59d..60f03f000 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -960,7 +960,7 @@ Glossary
users transition from Pylons and those preferring a more Pylons-like API.
The scaffold has been retired but the demo plays a similar role.
- Pyramid Cookbook
+ Pyramid Community Cookbook
Additional, community-based documentation for Pyramid which presents
topical, practical uses of Pyramid:
:ref:`Pyramid Community Cookbook <cookbook:pyramid-cookbook>`
diff --git a/docs/index.rst b/docs/index.rst
index 9a34f088b..ba6ca1e49 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -40,7 +40,7 @@ speed right away.
* Like learning by example? Visit the official :ref:`html_tutorials` as well as
the community-contributed :ref:`Pyramid Tutorials
- <tutorials:pyramid-tutorials>` and :ref:`Pyramid Cookbook
+ <tutorials:pyramid-tutorials>` and :ref:`Pyramid Community Cookbook
<cookbook:pyramid-cookbook>`.
* For help getting Pyramid set up, try :ref:`installing_chapter`.
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index ba9bd1352..bdcdf45a4 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -417,7 +417,6 @@ added in configuration execution order.
More Information
----------------
-For more information, see the article `"A Whirlwind Tour of Advanced
-Configuration Tactics"
-<http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/configuration/whirlwind_tour.html>`_
-in the Pyramid Cookbook.
+For more information, see the article :ref:`A Whirlwind Tour of Advanced
+Configuration Tactics <cookbook:whirlwind-adv-conf>` in the Pyramid Community
+Cookbook.
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index bb0bbe511..ecc48aa2b 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -666,9 +666,9 @@ can always use the more manual translation facility described in
Mako Pyramid i18n Support
-------------------------
-There exists a recipe within the :term:`Pyramid Cookbook` named ":ref:`Mako
-Internationalization <cookbook:mako_i18n>`" which explains how to add idiomatic
-i18n support to :term:`Mako` templates.
+There exists a recipe within the :term:`Pyramid Community Cookbook` named
+:ref:`Mako Internationalization <cookbook:mako_i18n>` which explains how to add
+idiomatic i18n support to :term:`Mako` templates.
.. index::
single: localization deployment settings
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 40f465b0a..422db557e 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -892,8 +892,7 @@ also maintain a "cookbook" of recipes, which are usually demonstrations of
common integration scenarios too specific to add to the official narrative
docs. In any case, the Pyramid documentation is comprehensive.
-Example: The Pyramid Cookbook at
-http://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/.
+Example: The :ref:`Pyramid Community Cookbook <cookbook:pyramid-cookbook>`.
.. index::
single: Pylons Project
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index 1a299e126..dd3e1b8dd 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -523,10 +523,11 @@ Documentation Enhancements
:ref:`making_a_console_script`.
- Removed the "Running Pyramid on Google App Engine" tutorial from the main
- docs. It survives on in the Cookbook
- (http://docs.pylonsproject.org/projects/pyramid_cookbook/en/latest/deployment/gae.html).
- Rationale: it provides the correct info for the Python 2.5 version of GAE
- only, and this version of Pyramid does not support Python 2.5.
+ docs. It survives on in the Pyramid Community Cookbook as
+ :ref:`Pyramid on Google's App Engine (using appengine-monkey)
+ <cookbook:appengine_tutorial>`. Rationale: it provides the correct info for
+ the Python 2.5 version of GAE only, and this version of Pyramid does not
+ support Python 2.5.
- Updated the :ref:`changing_the_forbidden_view` section, replacing
explanations of registering a view using ``add_view`` or ``view_config``