From e11fd45a5dbde00d4699522bf1b629850dc4ae55 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 25 Oct 2010 13:52:50 -0400
Subject: fix paster templates

---
 pyramid/fixers/fix_bfg_imports.py                  |  2 +-
 pyramid/includes/configure.zcml                    |  2 +-
 pyramid/includes/meta.zcml                         |  2 +-
 .../alchemy/+package+/configure.zcml               |  4 ++--
 .../paster_templates/alchemy/+package+/run.py_tmpl |  2 +-
 .../alchemy/+package+/templates/model.pt           | 26 +++++++++++-----------
 .../alchemy/+package+/templates/root.pt            | 26 +++++++++++-----------
 pyramid/paster_templates/alchemy/setup.py_tmpl     |  6 ++---
 .../routesalchemy/+package+/configure.zcml         |  4 ++--
 .../routesalchemy/+package+/run.py_tmpl            |  2 +-
 .../+package+/templates/mytemplate.pt              | 26 +++++++++++-----------
 .../routesalchemy/+package+/tests.py_tmpl          |  4 ++--
 .../paster_templates/routesalchemy/setup.py_tmpl   |  6 ++---
 .../starter/+package+/configure.zcml               |  4 ++--
 .../paster_templates/starter/+package+/run.py_tmpl |  2 +-
 .../starter/+package+/templates/mytemplate.pt      | 26 +++++++++++-----------
 .../starter/+package+/tests.py_tmpl                |  4 ++--
 pyramid/paster_templates/starter/setup.py_tmpl     |  6 ++---
 .../paster_templates/zodb/+package+/configure.zcml |  4 ++--
 .../paster_templates/zodb/+package+/run.py_tmpl    |  2 +-
 .../zodb/+package+/templates/mytemplate.pt         | 26 +++++++++++-----------
 .../paster_templates/zodb/+package+/tests.py_tmpl  |  4 ++--
 pyramid/paster_templates/zodb/setup.py_tmpl        |  6 ++---
 pyramid/tests/ccbugapp/configure.zcml              |  2 +-
 pyramid/tests/exceptionviewapp/configure.zcml      |  2 +-
 pyramid/tests/fixtureapp/another.zcml              |  2 +-
 pyramid/tests/fixtureapp/configure.zcml            |  2 +-
 .../tests/fixtureapp/subpackage/yetanother.zcml    |  2 +-
 pyramid/tests/grokkedapp/configure.zcml            |  2 +-
 pyramid/tests/hybridapp/configure.zcml             |  2 +-
 pyramid/tests/restbugapp/configure.zcml            |  2 +-
 pyramid/tests/routesapp/configure.zcml             |  2 +-
 pyramid/tests/viewdecoratorapp/configure.zcml      |  2 +-
 33 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/pyramid/fixers/fix_bfg_imports.py b/pyramid/fixers/fix_bfg_imports.py
index 6a30c7710..e53973469 100644
--- a/pyramid/fixers/fix_bfg_imports.py
+++ b/pyramid/fixers/fix_bfg_imports.py
@@ -182,7 +182,7 @@ def fix_zcml(path):
                 absfile = os.path.join(root, file)
                 text = open(absfile, 'rb').read()
                 newt =INCLUDES.sub('include package="pyramid.includes"', text)
-                newt = NS.sub('xmlns="http://pyramid.pylonshq.com"', newt)
+                newt = NS.sub('xmlns="http://pylonshq.com/pyramid"', newt)
                 if text != newt:
                     newf = open(absfile, 'wb')
                     newf.write(newt)
diff --git a/pyramid/includes/configure.zcml b/pyramid/includes/configure.zcml
index 6a373fa5d..8ddd56406 100644
--- a/pyramid/includes/configure.zcml
+++ b/pyramid/includes/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include file="meta.zcml" />
 
diff --git a/pyramid/includes/meta.zcml b/pyramid/includes/meta.zcml
index 26a475ee3..bd16c3ea6 100644
--- a/pyramid/includes/meta.zcml
+++ b/pyramid/includes/meta.zcml
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:meta="http://namespaces.zope.org/meta">
 
-  <meta:directives namespace="http://namespaces.repoze.org/bfg">
+  <meta:directives namespace="http://pylonshq.com/pyramid">
 
     <meta:directive
         name="view"
diff --git a/pyramid/paster_templates/alchemy/+package+/configure.zcml b/pyramid/paster_templates/alchemy/+package+/configure.zcml
index 521f06ba4..9450b9049 100644
--- a/pyramid/paster_templates/alchemy/+package+/configure.zcml
+++ b/pyramid/paster_templates/alchemy/+package+/configure.zcml
@@ -1,7 +1,7 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <!-- this must be included for the view declarations to work -->
-  <include package="repoze.bfg.includes" />
+  <include package="pyramid.includes" />
 
   <view
      context=".models.MyApp"
diff --git a/pyramid/paster_templates/alchemy/+package+/run.py_tmpl b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
index 026505f3a..610b9ed2d 100644
--- a/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/alchemy/+package+/run.py_tmpl
@@ -1,4 +1,4 @@
-from repoze.bfg.configuration import Configurator
+from pyramid.configuration import Configurator
 from paste.deploy.converters import asbool
 
 from {{package}}.models import appmaker
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/model.pt b/pyramid/paster_templates/alchemy/+package+/templates/model.pt
index e29b92836..1bf921393 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/model.pt
+++ b/pyramid/paster_templates/alchemy/+package+/templates/model.pt
@@ -5,13 +5,13 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>${project} Application</title>
 <meta name="keywords" content="python web application" />
-<meta name="description" content="repoze.bfg web application" />
+<meta name="description" content="pyramid web application" />
 <link href="${request.application_url}/static/default.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <!-- start header -->
 <div id="logo">
-  <h2><code>${project}</code>, a <code>repoze.bfg</code> application</h2>
+  <h2><code>${project}</code>, a <code>Pyramid</code> application</h2>
 </div>
 <div id="header">
   <div id="menu">
@@ -26,7 +26,7 @@
       <div class="post">
 	<h1 class="title">Welcome to <code>${project}</code>, an
 	application generated by the <a
-	href="http://bfg.repoze.org">repoze.bfg</a> web
+	href="http://pylonshq.com/pyramid">Pyramid</a> web
 	application framework.</h1>
         <p>
          <b>Id:</b> ${item.id}<br />
@@ -39,9 +39,9 @@
     <div id="sidebar">
       <ul>
 	<li id="search">
-	  <h2>Search<br/> <code>repoze.bfg</code> Documentation</h2>
+	  <h2>Search<br/> <code>Pyramid</code> Documentation</h2>
 	  <form method="get" 
-                action="http://bfg.repoze.org/searchresults">
+                action="http://pylonshq.com/docs/pyramid/current/searchresults">
 	    <fieldset>
 	      <input type="text" id="q" name="text" value="" />
 	      <input type="submit" id="x" value="Search" />
@@ -49,39 +49,39 @@
 	  </form>
 	</li>
 	<li>
-	  <h2><code>repoze.bfg</code> links</h2>
+	  <h2><code>Pyramid</code> links</h2>
 	  <ul>
 	    <li><a
-	    href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative
+	    href="http://pylonshq.com/docs/pyramid/current/#narrative-documentation">Narrative
 	    Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#api-documentation">API
+              href="http://pylonshq.com/docs/pyramid/current/#api-documentation">API
               Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a>
+              href="http://pylonshq.com/docs/pyramid/current/#tutorials">Tutorials</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#change-history">Change
+              href="http://pylonshq.com/docs/pyramid/current/#change-history">Change
               History</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#sample-applications">Sample
+              href="http://pylonshq.com/docs/pyramid/current/#sample-applications">Sample
               Applications</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#support-and-development">Support
+              href="http://pylonshq.com/docs/pyramid/current/#support-and-development">Support
               and Development</a>
             </li>
 	    <li>
               <a
-              href="irc://irc.freenode.net#repoze">IRC Channel</a>
+              href="irc://irc.freenode.net#pylons">IRC Channel</a>
             </li>
 	  </ul>
 	</li>
diff --git a/pyramid/paster_templates/alchemy/+package+/templates/root.pt b/pyramid/paster_templates/alchemy/+package+/templates/root.pt
index 2cac6fe6e..45ea3d71f 100644
--- a/pyramid/paster_templates/alchemy/+package+/templates/root.pt
+++ b/pyramid/paster_templates/alchemy/+package+/templates/root.pt
@@ -5,13 +5,13 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>${project} Application</title>
 <meta name="keywords" content="python web application" />
-<meta name="description" content="repoze.bfg web application" />
+<meta name="description" content="pyramid web application" />
 <link href="${request.application_url}/static/default.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <!-- start header -->
 <div id="logo">
-  <h2><code>${project}</code>, a <code>repoze.bfg</code> application</h2>
+  <h2><code>${project}</code>, a <code>Pyramid</code> application</h2>
 </div>
 <div id="header">
   <div id="menu">
@@ -26,7 +26,7 @@
       <div class="post">
 	<h1 class="title">Welcome to <code>${project}</code>, an
 	application generated by the <a
-	href="http://bfg.repoze.org">repoze.bfg</a> web
+	href="http://pylonshq.com/pyramid">Pyramid</a> web
 	application framework.</h1>
         <p tal:repeat="item items">
          <a href="${item.id}">${item.name}</a></p>
@@ -37,9 +37,9 @@
     <div id="sidebar">
       <ul>
 	<li id="search">
-	  <h2>Search<br/> <code>repoze.bfg</code> Documentation</h2>
+	  <h2>Search<br/> <code>Pyramid</code> Documentation</h2>
 	  <form method="get" 
-                action="http://bfg.repoze.org/searchresults">
+                action="http://pylonshq.com/docs/pyramid/current/searchresults">
 	    <fieldset>
 	      <input type="text" id="q" name="text" value="" />
 	      <input type="submit" id="x" value="Search" />
@@ -47,39 +47,39 @@
 	  </form>
 	</li>
 	<li>
-	  <h2><code>repoze.bfg</code> links</h2>
+	  <h2><code>Pyramid</code> links</h2>
 	  <ul>
 	    <li><a
-	    href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative
+	    href="http://pylonshq.com/docs/pyramid/current/#narrative-documentation">Narrative
 	    Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#api-documentation">API
+              href="http://pylonshq.com/docs/pyramid/current/#api-documentation">API
               Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a>
+              href="http://pylonshq.com/docs/pyramid/current/#tutorials">Tutorials</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#change-history">Change
+              href="http://pylonshq.com/docs/pyramid/current/#change-history">Change
               History</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#sample-applications">Sample
+              href="http://pylonshq.com/docs/pyramid/current/#sample-applications">Sample
               Applications</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#support-and-development">Support
+              href="http://pylonshq.com/docs/pyramid/current/#support-and-development">Support
               and Development</a>
             </li>
 	    <li>
               <a
-              href="irc://irc.freenode.net#repoze">IRC Channel</a>
+              href="irc://irc.freenode.net#pylons">IRC Channel</a>
             </li>
 	  </ul>
 	</li>
diff --git a/pyramid/paster_templates/alchemy/setup.py_tmpl b/pyramid/paster_templates/alchemy/setup.py_tmpl
index 9446964e5..fe75017a5 100644
--- a/pyramid/paster_templates/alchemy/setup.py_tmpl
+++ b/pyramid/paster_templates/alchemy/setup.py_tmpl
@@ -8,7 +8,7 @@ README = open(os.path.join(here, 'README.txt')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 requires = [
-    'repoze.bfg',
+    'pyramid',
     'repoze.tm2',
     'sqlalchemy',
     'zope.sqlalchemy',
@@ -23,14 +23,14 @@ setup(name='{{project}}',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: BFG",
+        "Framework :: Pylons",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg',
+      keywords='web wsgi bfg pylons pyramid',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/pyramid/paster_templates/routesalchemy/+package+/configure.zcml b/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
index 6d16bd089..47adfbefb 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
+++ b/pyramid/paster_templates/routesalchemy/+package+/configure.zcml
@@ -1,7 +1,7 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <!-- this must be included for the view declarations to work -->
-  <include package="repoze.bfg.includes" />
+  <include package="pyramid.includes" />
 
   <route 
     pattern=""
diff --git a/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl b/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
index b85f57556..695cd12fe 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/run.py_tmpl
@@ -1,4 +1,4 @@
-from repoze.bfg.configuration import Configurator
+from pyramid.configuration import Configurator
 from paste.deploy.converters import asbool
 
 from {{package}}.models import initialize_sql
diff --git a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt
index 2aedcad9f..9178b5866 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt
+++ b/pyramid/paster_templates/routesalchemy/+package+/templates/mytemplate.pt
@@ -5,13 +5,13 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>${project} Application</title>
 <meta name="keywords" content="python web application" />
-<meta name="description" content="repoze.bfg web application" />
+<meta name="description" content="pyramid web application" />
 <link href="${request.application_url}/static/default.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <!-- start header -->
 <div id="logo">
-  <h2><code>${project}</code>, a <code>repoze.bfg</code> application</h2>
+  <h2><code>${project}</code>, a <code>Pyramid</code> application</h2>
 </div>
 <div id="header">
   <div id="menu">
@@ -26,7 +26,7 @@
       <div class="post">
 	<h1 class="title">Welcome to <code>${project}</code>, an
 	application generated by the <a
-	href="http://bfg.repoze.org">repoze.bfg</a> web
+	href="http://pylonshq.com/pyramid">Pyramid</a> web
 	application framework.</h1>
       </div>
     </div>
@@ -35,9 +35,9 @@
     <div id="sidebar">
       <ul>
 	<li id="search">
-	  <h2>Search<br/> <code>repoze.bfg</code> Documentation</h2>
+	  <h2>Search<br/> <code>Pyramid</code> Documentation</h2>
 	  <form method="get" 
-                action="http://bfg.repoze.org/searchresults">
+                action="http://pylonshq.com/docs/pyramid/current/searchresults">
 	    <fieldset>
 	      <input type="text" id="q" name="text" value="" />
 	      <input type="submit" id="x" value="Search" />
@@ -45,39 +45,39 @@
 	  </form>
 	</li>
 	<li>
-	  <h2><code>repoze.bfg</code> links</h2>
+	  <h2><code>Pyramid</code> links</h2>
 	  <ul>
 	    <li><a
-	    href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative
+	    href="http://pylonshq.com/docs/pyramid/current/#narrative-documentation">Narrative
 	    Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#api-documentation">API
+              href="http://pylonshq.com/docs/pyramid/current/#api-documentation">API
               Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a>
+              href="http://pylonshq.com/docs/pyramid/current/#tutorials">Tutorials</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#change-history">Change
+              href="http://pylonshq.com/docs/pyramid/current/#change-history">Change
               History</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#sample-applications">Sample
+              href="http://pylonshq.com/docs/pyramid/current/#sample-applications">Sample
               Applications</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#support-and-development">Support
+              href="http://pylonshq.com/docs/pyramid/current/#support-and-development">Support
               and Development</a>
             </li>
 	    <li>
               <a
-              href="irc://irc.freenode.net#repoze">IRC Channel</a>
+              href="irc://irc.freenode.net#pylons">IRC Channel</a>
             </li>
 	  </ul>
 	</li>
diff --git a/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl b/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl
index ed7f1280b..de75e5df0 100644
--- a/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/+package+/tests.py_tmpl
@@ -1,6 +1,6 @@
 import unittest
-from repoze.bfg.configuration import Configurator
-from repoze.bfg import testing
+from pyramid.configuration import Configurator
+from pyramid import testing
 
 def _initTestingDB():
     from {{package}}.models import initialize_sql
diff --git a/pyramid/paster_templates/routesalchemy/setup.py_tmpl b/pyramid/paster_templates/routesalchemy/setup.py_tmpl
index 0ce1b8bad..96cd73304 100644
--- a/pyramid/paster_templates/routesalchemy/setup.py_tmpl
+++ b/pyramid/paster_templates/routesalchemy/setup.py_tmpl
@@ -8,7 +8,7 @@ README = open(os.path.join(here, 'README.txt')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 requires = [
-    'repoze.bfg',
+    'pyramid',
     'SQLAlchemy',
     'transaction',
     'repoze.tm2',
@@ -24,14 +24,14 @@ setup(name='{{project}}',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: BFG",
+        "Framework :: Pylons",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg',
+      keywords='web wsgi bfg pylons pyramid',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/pyramid/paster_templates/starter/+package+/configure.zcml b/pyramid/paster_templates/starter/+package+/configure.zcml
index e83dd3933..29d577d3e 100644
--- a/pyramid/paster_templates/starter/+package+/configure.zcml
+++ b/pyramid/paster_templates/starter/+package+/configure.zcml
@@ -1,7 +1,7 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <!-- this must be included for the view declarations to work -->
-  <include package="repoze.bfg.includes" />
+  <include package="pyramid.includes" />
 
   <view
      context=".models.MyModel"
diff --git a/pyramid/paster_templates/starter/+package+/run.py_tmpl b/pyramid/paster_templates/starter/+package+/run.py_tmpl
index 74876f3f4..0ba646e43 100644
--- a/pyramid/paster_templates/starter/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/starter/+package+/run.py_tmpl
@@ -1,4 +1,4 @@
-from repoze.bfg.configuration import Configurator
+from pyramid.configuration import Configurator
 from {{package}}.models import get_root
 
 def app(global_config, **settings):
diff --git a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt
index 2aedcad9f..9178b5866 100644
--- a/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt
+++ b/pyramid/paster_templates/starter/+package+/templates/mytemplate.pt
@@ -5,13 +5,13 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>${project} Application</title>
 <meta name="keywords" content="python web application" />
-<meta name="description" content="repoze.bfg web application" />
+<meta name="description" content="pyramid web application" />
 <link href="${request.application_url}/static/default.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <!-- start header -->
 <div id="logo">
-  <h2><code>${project}</code>, a <code>repoze.bfg</code> application</h2>
+  <h2><code>${project}</code>, a <code>Pyramid</code> application</h2>
 </div>
 <div id="header">
   <div id="menu">
@@ -26,7 +26,7 @@
       <div class="post">
 	<h1 class="title">Welcome to <code>${project}</code>, an
 	application generated by the <a
-	href="http://bfg.repoze.org">repoze.bfg</a> web
+	href="http://pylonshq.com/pyramid">Pyramid</a> web
 	application framework.</h1>
       </div>
     </div>
@@ -35,9 +35,9 @@
     <div id="sidebar">
       <ul>
 	<li id="search">
-	  <h2>Search<br/> <code>repoze.bfg</code> Documentation</h2>
+	  <h2>Search<br/> <code>Pyramid</code> Documentation</h2>
 	  <form method="get" 
-                action="http://bfg.repoze.org/searchresults">
+                action="http://pylonshq.com/docs/pyramid/current/searchresults">
 	    <fieldset>
 	      <input type="text" id="q" name="text" value="" />
 	      <input type="submit" id="x" value="Search" />
@@ -45,39 +45,39 @@
 	  </form>
 	</li>
 	<li>
-	  <h2><code>repoze.bfg</code> links</h2>
+	  <h2><code>Pyramid</code> links</h2>
 	  <ul>
 	    <li><a
-	    href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative
+	    href="http://pylonshq.com/docs/pyramid/current/#narrative-documentation">Narrative
 	    Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#api-documentation">API
+              href="http://pylonshq.com/docs/pyramid/current/#api-documentation">API
               Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a>
+              href="http://pylonshq.com/docs/pyramid/current/#tutorials">Tutorials</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#change-history">Change
+              href="http://pylonshq.com/docs/pyramid/current/#change-history">Change
               History</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#sample-applications">Sample
+              href="http://pylonshq.com/docs/pyramid/current/#sample-applications">Sample
               Applications</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#support-and-development">Support
+              href="http://pylonshq.com/docs/pyramid/current/#support-and-development">Support
               and Development</a>
             </li>
 	    <li>
               <a
-              href="irc://irc.freenode.net#repoze">IRC Channel</a>
+              href="irc://irc.freenode.net#pylons">IRC Channel</a>
             </li>
 	  </ul>
 	</li>
diff --git a/pyramid/paster_templates/starter/+package+/tests.py_tmpl b/pyramid/paster_templates/starter/+package+/tests.py_tmpl
index 578a58d35..2b84bee58 100644
--- a/pyramid/paster_templates/starter/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/starter/+package+/tests.py_tmpl
@@ -1,7 +1,7 @@
 import unittest
 
-from repoze.bfg.configuration import Configurator
-from repoze.bfg import testing
+from pyramid.configuration import Configurator
+from pyramid import testing
 
 class ViewTests(unittest.TestCase):
     def setUp(self):
diff --git a/pyramid/paster_templates/starter/setup.py_tmpl b/pyramid/paster_templates/starter/setup.py_tmpl
index df1206c1e..8714ac293 100644
--- a/pyramid/paster_templates/starter/setup.py_tmpl
+++ b/pyramid/paster_templates/starter/setup.py_tmpl
@@ -6,7 +6,7 @@ here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.txt')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
-requires = ['repoze.bfg']
+requires = ['pyramid']
 
 setup(name='{{project}}',
       version='0.0',
@@ -14,14 +14,14 @@ setup(name='{{project}}',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: BFG",
+        "Framework :: Pylons",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg',
+      keywords='web wsgi bfg pyramid pylons',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/pyramid/paster_templates/zodb/+package+/configure.zcml b/pyramid/paster_templates/zodb/+package+/configure.zcml
index e83dd3933..29d577d3e 100644
--- a/pyramid/paster_templates/zodb/+package+/configure.zcml
+++ b/pyramid/paster_templates/zodb/+package+/configure.zcml
@@ -1,7 +1,7 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <!-- this must be included for the view declarations to work -->
-  <include package="repoze.bfg.includes" />
+  <include package="pyramid.includes" />
 
   <view
      context=".models.MyModel"
diff --git a/pyramid/paster_templates/zodb/+package+/run.py_tmpl b/pyramid/paster_templates/zodb/+package+/run.py_tmpl
index c0a245089..7b6188001 100644
--- a/pyramid/paster_templates/zodb/+package+/run.py_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/run.py_tmpl
@@ -1,4 +1,4 @@
-from repoze.bfg.configuration import Configurator
+from pyramid.configuration import Configurator
 from repoze.zodbconn.finder import PersistentApplicationFinder
 from {{package}}.models import appmaker
 
diff --git a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt
index 2aedcad9f..9178b5866 100644
--- a/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt
+++ b/pyramid/paster_templates/zodb/+package+/templates/mytemplate.pt
@@ -5,13 +5,13 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title>${project} Application</title>
 <meta name="keywords" content="python web application" />
-<meta name="description" content="repoze.bfg web application" />
+<meta name="description" content="pyramid web application" />
 <link href="${request.application_url}/static/default.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
 <!-- start header -->
 <div id="logo">
-  <h2><code>${project}</code>, a <code>repoze.bfg</code> application</h2>
+  <h2><code>${project}</code>, a <code>Pyramid</code> application</h2>
 </div>
 <div id="header">
   <div id="menu">
@@ -26,7 +26,7 @@
       <div class="post">
 	<h1 class="title">Welcome to <code>${project}</code>, an
 	application generated by the <a
-	href="http://bfg.repoze.org">repoze.bfg</a> web
+	href="http://pylonshq.com/pyramid">Pyramid</a> web
 	application framework.</h1>
       </div>
     </div>
@@ -35,9 +35,9 @@
     <div id="sidebar">
       <ul>
 	<li id="search">
-	  <h2>Search<br/> <code>repoze.bfg</code> Documentation</h2>
+	  <h2>Search<br/> <code>Pyramid</code> Documentation</h2>
 	  <form method="get" 
-                action="http://bfg.repoze.org/searchresults">
+                action="http://pylonshq.com/docs/pyramid/current/searchresults">
 	    <fieldset>
 	      <input type="text" id="q" name="text" value="" />
 	      <input type="submit" id="x" value="Search" />
@@ -45,39 +45,39 @@
 	  </form>
 	</li>
 	<li>
-	  <h2><code>repoze.bfg</code> links</h2>
+	  <h2><code>Pyramid</code> links</h2>
 	  <ul>
 	    <li><a
-	    href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative
+	    href="http://pylonshq.com/docs/pyramid/current/#narrative-documentation">Narrative
 	    Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#api-documentation">API
+              href="http://pylonshq.com/docs/pyramid/current/#api-documentation">API
               Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a>
+              href="http://pylonshq.com/docs/pyramid/current/#tutorials">Tutorials</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#change-history">Change
+              href="http://pylonshq.com/docs/pyramid/current/#change-history">Change
               History</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#sample-applications">Sample
+              href="http://pylonshq.com/docs/pyramid/current/#sample-applications">Sample
               Applications</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/current/#support-and-development">Support
+              href="http://pylonshq.com/docs/pyramid/current/#support-and-development">Support
               and Development</a>
             </li>
 	    <li>
               <a
-              href="irc://irc.freenode.net#repoze">IRC Channel</a>
+              href="irc://irc.freenode.net#pylons">IRC Channel</a>
             </li>
 	  </ul>
 	</li>
diff --git a/pyramid/paster_templates/zodb/+package+/tests.py_tmpl b/pyramid/paster_templates/zodb/+package+/tests.py_tmpl
index 30da5c9b3..18041c64c 100644
--- a/pyramid/paster_templates/zodb/+package+/tests.py_tmpl
+++ b/pyramid/paster_templates/zodb/+package+/tests.py_tmpl
@@ -1,7 +1,7 @@
 import unittest
 
-from repoze.bfg.configuration import Configurator
-from repoze.bfg import testing
+from pyramid.configuration import Configurator
+from pyramid import testing
 
 class ViewTests(unittest.TestCase):
     def setUp(self):
diff --git a/pyramid/paster_templates/zodb/setup.py_tmpl b/pyramid/paster_templates/zodb/setup.py_tmpl
index dba0e4ac7..e2027babd 100644
--- a/pyramid/paster_templates/zodb/setup.py_tmpl
+++ b/pyramid/paster_templates/zodb/setup.py_tmpl
@@ -7,7 +7,7 @@ README = open(os.path.join(here, 'README.txt')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
 
 requires = [
-    'repoze.bfg',
+    'pyramid',
     'repoze.zodbconn',
     'repoze.tm',
     'ZODB3',
@@ -19,14 +19,14 @@ setup(name='{{project}}',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[
         "Programming Language :: Python",
-        "Framework :: BFG",
+        "Framework :: Pylons",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
         ],
       author='',
       author_email='',
       url='',
-      keywords='web wsgi bfg',
+      keywords='web wsgi bfg pylons pyramid',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
diff --git a/pyramid/tests/ccbugapp/configure.zcml b/pyramid/tests/ccbugapp/configure.zcml
index e95749d88..f595f6b64 100644
--- a/pyramid/tests/ccbugapp/configure.zcml
+++ b/pyramid/tests/ccbugapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/exceptionviewapp/configure.zcml b/pyramid/tests/exceptionviewapp/configure.zcml
index e3cb1568d..ec2b23eda 100644
--- a/pyramid/tests/exceptionviewapp/configure.zcml
+++ b/pyramid/tests/exceptionviewapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/fixtureapp/another.zcml b/pyramid/tests/fixtureapp/another.zcml
index d3d5edecd..07dda64d3 100644
--- a/pyramid/tests/fixtureapp/another.zcml
+++ b/pyramid/tests/fixtureapp/another.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/fixtureapp/configure.zcml b/pyramid/tests/fixtureapp/configure.zcml
index a19b577a1..859940663 100644
--- a/pyramid/tests/fixtureapp/configure.zcml
+++ b/pyramid/tests/fixtureapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/fixtureapp/subpackage/yetanother.zcml b/pyramid/tests/fixtureapp/subpackage/yetanother.zcml
index dd50ea465..092e5e285 100644
--- a/pyramid/tests/fixtureapp/subpackage/yetanother.zcml
+++ b/pyramid/tests/fixtureapp/subpackage/yetanother.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/grokkedapp/configure.zcml b/pyramid/tests/grokkedapp/configure.zcml
index 34b81285d..169c42128 100644
--- a/pyramid/tests/grokkedapp/configure.zcml
+++ b/pyramid/tests/grokkedapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
   <scan package="."/>
diff --git a/pyramid/tests/hybridapp/configure.zcml b/pyramid/tests/hybridapp/configure.zcml
index 5073a2446..5d85ec9d5 100644
--- a/pyramid/tests/hybridapp/configure.zcml
+++ b/pyramid/tests/hybridapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/restbugapp/configure.zcml b/pyramid/tests/restbugapp/configure.zcml
index 19e9232ca..ce0159d43 100644
--- a/pyramid/tests/restbugapp/configure.zcml
+++ b/pyramid/tests/restbugapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes"/>
  
diff --git a/pyramid/tests/routesapp/configure.zcml b/pyramid/tests/routesapp/configure.zcml
index 666d4024d..99c05f4ec 100644
--- a/pyramid/tests/routesapp/configure.zcml
+++ b/pyramid/tests/routesapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
 
diff --git a/pyramid/tests/viewdecoratorapp/configure.zcml b/pyramid/tests/viewdecoratorapp/configure.zcml
index 34b81285d..169c42128 100644
--- a/pyramid/tests/viewdecoratorapp/configure.zcml
+++ b/pyramid/tests/viewdecoratorapp/configure.zcml
@@ -1,4 +1,4 @@
-<configure xmlns="http://namespaces.repoze.org/bfg">
+<configure xmlns="http://pylonshq.com/pyramid">
 
   <include package="pyramid.includes" />
   <scan package="."/>
-- 
cgit v1.2.3