merge tutorialfix branch

7 files changed, 45 insertions, 22 deletions

diff --git a/docs/tutorials/bfgwiki2/src/views/CHANGES.txt b/docs/tutorials/bfgwiki2/src/views/CHANGES.txt
index e14f633ab..35a34f332 100644
--- a/docs/tutorials/bfgwiki2/src/views/CHANGES.txt
+++ b/docs/tutorials/bfgwiki2/src/views/CHANGES.txt
@@ -1,5 +1,4 @@
 0.0
 ---
 
-- Initial version
-
+-  Initial version
diff --git a/docs/tutorials/bfgwiki2/src/views/setup.cfg b/docs/tutorials/bfgwiki2/src/views/setup.cfg
index 56fe3be14..23b2ad983 100644
--- a/docs/tutorials/bfgwiki2/src/views/setup.cfg
+++ b/docs/tutorials/bfgwiki2/src/views/setup.cfg
@@ -1,8 +1,27 @@
-[easy_install]
-index_url = http://dist.repoze.org/bfgsite/simple
-
 [nosetests]
+match=^test
 nocapture=1
 cover-package=tutorial
 with-coverage=1
 cover-erase=1
+
+[compile_catalog]
+directory = tutorial/locale
+domain = tutorial
+statistics = true
+
+[extract_messages]
+add_comments = TRANSLATORS:
+output_file = tutorial/locale/tutorial.pot
+width = 80
+
+[init_catalog]
+domain = tutorial
+input_file = tutorial/locale/tutorial.pot
+output_dir = tutorial/locale
+
+[update_catalog]
+domain = tutorial
+input_file = tutorial/locale/tutorial.pot
+output_dir = tutorial/locale
+previous = true
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial.ini b/docs/tutorials/bfgwiki2/src/views/tutorial.ini
index d89616316..85f131c2e 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial.ini
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial.ini
@@ -1,18 +1,21 @@
 [DEFAULT]
 debug = true
 
-[app:sql]
+[app:sqlalchemy]
 use = egg:tutorial#app
 reload_templates = true
 debug_authorization = false
 debug_notfound = false
+debug_templates = true
+default_locale_name = en
 db_string = sqlite:///%(here)s/tutorial.db
+db_echo = false
 
 [pipeline:main]
 pipeline =
     egg:Paste#evalerror
     egg:repoze.tm2#tm
-    sql
+    sqlalchemy
 
 [server:main]
 use = egg:Paste#http
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
index f86468186..7b3f73b4e 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
@@ -4,7 +4,7 @@
   <include package="repoze.bfg.includes" />
 
   <static
-    pattern="templates/static"
+    path="templates/static"
     name="static"
     />
 
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/models.py b/docs/tutorials/bfgwiki2/src/views/tutorial/models.py
index 3e63c3734..ec9d2b25c 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/models.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/models.py
@@ -6,12 +6,11 @@ from sqlalchemy import Integer
 from sqlalchemy import Text
 
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.ext.declarative import declarative_base
 
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import sessionmaker
 
-from sqlalchemy.ext.declarative import declarative_base
-
 from zope.sqlalchemy import ZopeTransactionExtension
 
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
@@ -28,8 +27,8 @@ class Page(Base):
        self.name = name
        self.data = data
 
-def initialize_sql(db, echo=False):
-    engine = create_engine(db, echo=echo)
+def initialize_sql(db_string, echo=False):
+    engine = create_engine(db_string, echo=echo)
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
     Base.metadata.create_all(engine)
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
index 8e1249eab..47eb79e87 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/run.py
@@ -1,4 +1,5 @@
 from repoze.bfg.configuration import Configurator
+from paste.deploy.converters import asbool
 
 from tutorial.models import initialize_sql
 
@@ -8,13 +9,15 @@ def app(global_config, **settings):
     It is usually called by the PasteDeploy framework during 
     ``paster serve``.
     """
+    zcml_file = settings.get('configure_zcml', 'configure.zcml')
     db_string = settings.get('db_string')
     if db_string is None:
-        raise ValueError("No 'db_string' value in application "
-                         "configuration.")
-    initialize_sql(db_string)
+        raise ValueError("No 'db_string' value in application configuration.")
+    db_echo = settings.get('db_echo', 'false')
+    initialize_sql(db_string, asbool(db_echo))
     config = Configurator(settings=settings)
     config.begin()
-    config.load_zcml('configure.zcml')
+    config.load_zcml(zcml_file)
     config.end()
     return config.make_wsgi_app()
+
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/templates/mytemplate.pt b/docs/tutorials/bfgwiki2/src/views/tutorial/templates/mytemplate.pt
index 767252554..2aedcad9f 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/templates/mytemplate.pt
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/templates/mytemplate.pt
@@ -48,31 +48,31 @@
 	  <h2><code>repoze.bfg</code> links</h2>
 	  <ul>
 	    <li><a
-	    href="http://docs.repoze.org/bfg/#narrative-documentation">Narrative
+	    href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative
 	    Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/#api-documentation">API
+              href="http://docs.repoze.org/bfg/current/#api-documentation">API
               Documentation</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/#tutorials">Tutorials</a>
+              href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/#change-history">Change
+              href="http://docs.repoze.org/bfg/current/#change-history">Change
               History</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/#sample-applications">Sample
+              href="http://docs.repoze.org/bfg/current/#sample-applications">Sample
               Applications</a>
             </li>
 	    <li>
               <a
-              href="http://docs.repoze.org/bfg/#support-and-development">Support
+              href="http://docs.repoze.org/bfg/current/#support-and-development">Support
               and Development</a>
             </li>
 	    <li>