From 39e88a1f2903f840feeff77e572c7bf3efebb875 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 21 Jul 2011 23:08:31 -0400
Subject: - Change all scaffolding templates that point to
 docs.pylonsproject.org to   use ``/projects/pyramid/current`` rather than
 ``/projects/pyramid/dev``.

---
 docs/narr/MyProject/myproject/templates/mytemplate.pt      | 14 +++++++-------
 docs/narr/templates.rst                                    |  4 ++--
 .../src/authorization/tutorial/templates/mytemplate.pt     | 14 +++++++-------
 .../wiki/src/basiclayout/tutorial/templates/mytemplate.pt  | 14 +++++++-------
 .../wiki/src/models/tutorial/templates/mytemplate.pt       | 14 +++++++-------
 .../wiki/src/tests/tutorial/templates/mytemplate.pt        | 14 +++++++-------
 .../wiki/src/views/tutorial/templates/mytemplate.pt        | 14 +++++++-------
 .../src/authorization/tutorial/templates/mytemplate.pt     | 14 +++++++-------
 .../wiki2/src/basiclayout/tutorial/templates/mytemplate.pt | 14 +++++++-------
 .../wiki2/src/models/tutorial/templates/mytemplate.pt      | 14 +++++++-------
 .../wiki2/src/tests/tutorial/templates/mytemplate.pt       | 14 +++++++-------
 .../wiki2/src/views/tutorial/templates/mytemplate.pt       | 14 +++++++-------
 docs/whatsnew-1.0.rst                                      |  4 ++--
 13 files changed, 81 insertions(+), 81 deletions(-)

(limited to 'docs')

diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt
index 632c34876..97f1e1aa3 100644
--- a/docs/narr/MyProject/myproject/templates/mytemplate.pt
+++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt
@@ -46,7 +46,7 @@
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
           <form method="get"
-                action="http://docs.pylonsproject.org/pyramid/dev/search.html">
+                action="http://docs.pylonsproject.org/pyramid/current/search.html">
             <input type="text" id="q" name="q" value="" />
             <input type="submit" id="x" value="Go" />
           </form>
@@ -60,32 +60,32 @@
               </a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">
                 Narrative Documentation
               </a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">
                 API Documentation
               </a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">
                 Tutorials
               </a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">
                 Change History
               </a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">
                 Sample Applications
               </a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">
                 Support and Development
               </a>
             </li>
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 7c575b9bf..af7257466 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -454,7 +454,7 @@ Here's what a simple :term:`Chameleon` ZPT template used under
       <body>
          <h1 class="title">Welcome to <code>${project}</code>, an
 	  application generated by the <a
-	  href="http://docs.pylonsproject.org/projects/pyramid/dev/"
+	  href="http://docs.pylonsproject.org/projects/pyramid/current/"
          >pyramid</a> web
 	  application framework.</h1>
       </body>
@@ -752,7 +752,7 @@ look like:
       <body>
          <h1 class="title">Welcome to <code>${project}</code>, an
 	  application generated by the <a
-	  href="http://docs.pylonsproject.org/projects/pyramid/dev/"
+	  href="http://docs.pylonsproject.org/projects/pyramid/current/"
          >pyramid</a> web application framework.</h1>
       </body>
     </html>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/authorization/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
index c24daa711..c2bc1fd65 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org/">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/models/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/tests/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki/src/views/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/models/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/tests/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
index d98420680..efe581b59 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/wiki2/src/views/tutorial/templates/mytemplate.pt
@@ -31,7 +31,7 @@
       <div class="bottom">
         <div id="left" class="align-right">
           <h2>Search documentation</h2>
-          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/dev/search.html">
+          <form method="get" action="http://docs.pylonsproject.org/projects/pyramid/current/search.html">
                 <input type="text" id="q" name="q" value="" />
                 <input type="submit" id="x" value="Go" />
             </form>
@@ -43,22 +43,22 @@
               <a href="http://pylonsproject.org">Pylons Website</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#narrative-documentation">Narrative Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#narrative-documentation">Narrative Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#api-documentation">API Documentation</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#api-documentation">API Documentation</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#tutorials">Tutorials</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#tutorials">Tutorials</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#change-history">Change History</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#change-history">Change History</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#sample-applications">Sample Applications</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#sample-applications">Sample Applications</a>
             </li>
             <li>
-              <a href="http://docs.pylonsproject.org/projects/pyramid/dev/#support-and-development">Support and Development</a>
+              <a href="http://docs.pylonsproject.org/projects/pyramid/current/#support-and-development">Support and Development</a>
             </li>
             <li>
               <a href="irc://irc.freenode.net#pyramid">IRC Channel</a>
diff --git a/docs/whatsnew-1.0.rst b/docs/whatsnew-1.0.rst
index 8602c5105..5cd822b0d 100644
--- a/docs/whatsnew-1.0.rst
+++ b/docs/whatsnew-1.0.rst
@@ -62,8 +62,8 @@ fail if you do nothing to your existing :mod:`repoze.bfg` application.
 However, you won't have to do much to use your existing BFG applications on
 Pyramid. There's automation which will change most of your import statements
 and ZCML declarations. See
-http://docs.pylonshq.com/pyramid/dev/tutorials/bfg/index.html for upgrade
-instructions.
+http://docs.pylonsproject.org/projects/pyramid/current/tutorials/bfg/index.html
+for upgrade instructions.
 
 Pylons 1 users will need to do more work to use Pyramid, as Pyramid shares no
 "DNA" with Pylons.  It is hoped that over time documentation and upgrade code
-- 
cgit v1.2.3