rename bfgwiki to wiki

25 files changed, 0 insertions, 1357 deletions

diff --git a/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt b/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt
deleted file mode 100644
index e14f633ab..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/CHANGES.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-0.0
----
-
-- Initial version
-
diff --git a/docs/tutorials/bfgwiki/src/authorization/README.txt b/docs/tutorials/bfgwiki/src/authorization/README.txt
deleted file mode 100644
index d41f7f90f..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-tutorial README
-
-
-
diff --git a/docs/tutorials/bfgwiki/src/authorization/setup.cfg b/docs/tutorials/bfgwiki/src/authorization/setup.cfg
deleted file mode 100644
index 3d7ea6e23..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/setup.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-[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/bfgwiki/src/authorization/setup.py b/docs/tutorials/bfgwiki/src/authorization/setup.py
deleted file mode 100644
index bb2482cce..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/setup.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import os
-
-from setuptools import setup, find_packages
-
-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 = [
-    'pyramid',
-    'docutils',
-    'ZODB3',
-    'repoze.zodbconn',
-    'repoze.tm',
-    ]
-
-setup(name='tutorial',
-      version='0.0',
-      description='tutorial',
-      long_description=README + '\n\n' +  CHANGES,
-      classifiers=[
-        "Intended Audience :: Developers",
-        "Framework :: Pylons",
-        "Programming Language :: Python",
-        "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-        ],
-      author='',
-      author_email='',
-      url='',
-      keywords='web wsgi pylons pyramid bfg',
-      packages=find_packages(),
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=requires,
-      tests_require=requires,
-      test_suite="tutorial",
-      entry_points = """\
-      [paste.app_factory]
-      app = tutorial.run:app
-      """
-      )
-
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial.ini b/docs/tutorials/bfgwiki/src/authorization/tutorial.ini
deleted file mode 100644
index 181682585..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[DEFAULT]
-debug = true
-
-[app:zodb]
-use = egg:tutorial#app
-reload_templates = true
-debug_authorization = false
-debug_notfound = false
-zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
-
-[pipeline:main]
-pipeline =
-    egg:repoze.zodbconn#closer
-    egg:Paste#evalerror
-    egg:repoze.tm#tm
-    zodb
-
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 6543
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/__init__.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/__init__.py
deleted file mode 100644
index cbdfd3ac6..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# A package
-
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml
deleted file mode 100644
index e8603d7c4..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml
+++ /dev/null
@@ -1,25 +0,0 @@
-<configure xmlns="http://pylonshq.com/pyramid">
-
-  <!-- this must be included for the view declarations to work -->
-  <include package="pyramid.includes" />
-
-  <scan package="."/>
-
-  <view
-    view=".login.login"
-    renderer="templates/login.pt"
-    context="pyramid.exceptions.Forbidden"/>
-
-  <authtktauthenticationpolicy
-    secret="sosecret"
-    callback=".security.groupfinder"
-    />
-
-  <aclauthorizationpolicy/>
-
-  <static
-    name="static"
-    path="templates/static"
-    />
-
-</configure>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py
deleted file mode 100644
index c029f25ce..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from webob.exc import HTTPFound
-
-from pyramid.view import bfg_view
-from pyramid.url import model_url
-
-from pyramid.security import remember
-from pyramid.security import forget
-
-from tutorial.models import Wiki
-from tutorial.security import USERS
-
-@bfg_view(context=Wiki, name='login', renderer='templates/login.pt')
-def login(request):
-    login_url = model_url(request.context, request, 'login')
-    referrer = request.url
-    if referrer == login_url:
-        referrer = '/' # never use the login form itself as came_from
-    came_from = request.params.get('came_from', referrer)
-    message = ''
-    login = ''
-    password = ''
-    if 'form.submitted' in request.params:
-        login = request.params['login']
-        password = request.params['password']
-        if USERS.get(login) == password:
-            headers = remember(request, login)
-            return HTTPFound(location = came_from,
-                             headers = headers)
-        message = 'Failed login'
-
-    return dict(
-        message = message,
-        url = request.application_url + '/login',
-        came_from = came_from,
-        login = login,
-        password = password,
-        )
-    
-@bfg_view(context=Wiki, name='logout')
-def logout(request):
-    headers = forget(request)
-    return HTTPFound(location = model_url(request.context, request),
-                     headers = headers)
-    
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py
deleted file mode 100644
index 0a31c38be..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/models.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from persistent import Persistent
-from persistent.mapping import PersistentMapping
-
-from pyramid.security import Allow
-from pyramid.security import Everyone
-
-class Wiki(PersistentMapping):
-    __name__ = None
-    __parent__ = None
-    __acl__ = [ (Allow, Everyone, 'view'),
-                (Allow, 'group:editors', 'edit') ]
-
-class Page(Persistent):
-    def __init__(self, data):
-        self.data = data
-
-def appmaker(zodb_root):
-    if not 'app_root' in zodb_root:
-        app_root = Wiki()
-        frontpage = Page('This is the front page')
-        app_root['FrontPage'] = frontpage
-        frontpage.__name__ = 'FrontPage'
-        frontpage.__parent__ = app_root
-        zodb_root['app_root'] = app_root
-        import transaction
-        transaction.commit()
-    return zodb_root['app_root']
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
deleted file mode 100644
index 875e77590..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pyramid.configuration import Configurator
-from repoze.zodbconn.finder import PersistentApplicationFinder
-
-from tutorial.models import appmaker
-
-def app(global_config, **settings):
-    """ This function returns a WSGI application.
-    
-    It is usually called by the PasteDeploy framework during 
-    ``paster serve``.
-    """
-    zodb_uri = settings.get('zodb_uri')
-    if zodb_uri is None:
-        raise ValueError("No 'zodb_uri' in application configuration.")
-    finder = PersistentApplicationFinder(zodb_uri, appmaker)
-    def get_root(request):
-        return finder(request.environ)
-    config = Configurator(root_factory=get_root, settings=settings)
-    config.begin()
-    config.load_zcml('configure.zcml')
-    config.end()
-    return config.make_wsgi_app()
-
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/security.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/security.py
deleted file mode 100644
index cfd13071e..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/security.py
+++ /dev/null
@@ -1,8 +0,0 @@
-USERS = {'editor':'editor',
-          'viewer':'viewer'}
-GROUPS = {'editor':['group:editors']}
-
-def groupfinder(userid, request):
-    if userid in USERS:
-        return GROUPS.get(userid, [])
-
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt
deleted file mode 100644
index 5f8b22207..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/edit.pt
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-
-<head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki) 
-           Editing: ${page.__name__}</title>
-        <link rel="stylesheet" type="text/css"
-          href="${request.application_url}/static/style.css" />
-</head>
-
-<body>
-
-<div class="main_content">
-  <div style="float:right; width: 10em;"> Viewing
-    <span tal:replace="page.__name__">Page Name Goes Here</span> <br/>
-    You can return to the <a href="${request.application_url}"
-          >FrontPage</a>.
-   <span tal:condition="logged_in"><a 
-         href="${request.application_url}/logout">Logout</a></span>
-  </div>
-
-  <div>
-    <form action="${save_url}" method="post">
-      <textarea name="body" tal:content="page.data" rows="10" cols="60"/>
-      <input type="submit" name="form.submitted" value="Save"/>
-    </form>
-  </div>
-</div>  
-</body>
-</html>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/login.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/login.pt
deleted file mode 100644
index c56983d64..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/login.pt
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:tal="http://xml.zope.org/namespaces/tal">
-
-<head>
-  <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-  <title>Pyramid tutorial wiki (based on TurboGears 20-Minute Wiki)</title>
-  <link rel="stylesheet" type="text/css"
-        href="${request.application_url}/static/style.css" />
-</head>
-
-<body>
-
-<h1>Log In</h1>
-
-<div tal:replace="message"/>
-
-<div class="main_content">
-  <form action="${url}" method="post">
-    <input type="hidden" name="came_from" value="${came_from}"/>
-    <input type="text" name="login" value="${login}"/>
-    <br/>
-    <input type="password" name="password" value="${password}"/>
-    <br/>
-    <input type="submit" name="form.submitted" value="Log In"/>
-  </form>
-</div>  
-
-</body>
-</html>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/mytemplate.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/mytemplate.pt
deleted file mode 100644
index 9178b5866..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/mytemplate.pt
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-<head>
-<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="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>Pyramid</code> application</h2>
-</div>
-<div id="header">
-  <div id="menu">
-  </div>
-</div>
-<!-- end header -->
-<div id="wrapper">
-  <!-- start page -->
-  <div id="page">
-    <!-- start content -->
-    <div id="content">
-      <div class="post">
-	<h1 class="title">Welcome to <code>${project}</code>, an
-	application generated by the <a
-	href="http://pylonshq.com/pyramid">Pyramid</a> web
-	application framework.</h1>
-      </div>
-    </div>
-    <!-- end content -->
-    <!-- start sidebar -->
-    <div id="sidebar">
-      <ul>
-	<li id="search">
-	  <h2>Search<br/> <code>Pyramid</code> Documentation</h2>
-	  <form method="get" 
-                action="http://pylonshq.com/docs/pyramid/current/searchresults">
-	    <fieldset>
-	      <input type="text" id="q" name="text" value="" />
-	      <input type="submit" id="x" value="Search" />
-	    </fieldset>
-	  </form>
-	</li>
-	<li>
-	  <h2><code>Pyramid</code> links</h2>
-	  <ul>
-	    <li><a
-	    href="http://pylonshq.com/docs/pyramid/current/#narrative-documentation">Narrative
-	    Documentation</a>
-            </li>
-	    <li>
-              <a
-              href="http://pylonshq.com/docs/pyramid/current/#api-documentation">API
-              Documentation</a>
-            </li>
-	    <li>
-              <a
-              href="http://pylonshq.com/docs/pyramid/current/#tutorials">Tutorials</a>
-            </li>
-	    <li>
-              <a
-              href="http://pylonshq.com/docs/pyramid/current/#change-history">Change
-              History</a>
-            </li>
-	    <li>
-              <a
-              href="http://pylonshq.com/docs/pyramid/current/#sample-applications">Sample
-              Applications</a>
-            </li>
-	    <li>
-              <a
-              href="http://pylonshq.com/docs/pyramid/current/#support-and-development">Support
-              and Development</a>
-            </li>
-	    <li>
-              <a
-              href="irc://irc.freenode.net#pylons">IRC Channel</a>
-            </li>
-	  </ul>
-	</li>
-      </ul>
-    </div>
-    <!-- end sidebar -->
-    <div style="clear: both;">&nbsp;</div>
-  </div>
-</div>
-<!-- end page -->
-<!-- start footer -->
-<div id="footer">
-  <p id="legal">( c ) 2008. All Rights Reserved. Template design
-  by <a href="http://www.freecsstemplates.org/">Free CSS
-  Templates</a>.</p>
-</div>
-<!-- end footer -->
-</body>
-</html>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/default.css b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/default.css
deleted file mode 100644
index 41b3debde..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/default.css
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
-Design by Free CSS Templates
-http://www.freecsstemplates.org
-Released for free under a Creative Commons Attribution 2.5 License
-*/
-
-body {
-	margin: 0;
-	padding: 0;
-	background: url(images/img01.gif) repeat-x left top;
-	font-size: 13px;
-	font-family: "Trebuchet MS", Georgia, "Times New Roman", Times, serif;
-	text-align: justify;
-	color: #FFFFFF;
-}
-
-h1, h2, h3 {
-	margin: 0;
-	text-transform: lowercase;
-	font-weight: normal;
-	color: #FFFFFF;
-}
-
-h1 {
-	letter-spacing: -1px;
-	font-size: 32px;
-}
-
-h2 {
-	font-size: 23px;
-}
-
-p, ul, ol {
-	margin: 0 0 2em 0;
-	text-align: justify;
-	line-height: 26px;
-}
-
-a:link {
-	color: #8BD80E;
-}
-
-a:hover, a:active {
-	text-decoration: none;
-	color: #8BD80E;
-}
-
-a:visited {
-	color: #8BD80E;
-}
-
-img {
-	border: none;
-}
-
-img.left {
-	float: left;
-	margin-right: 15px;
-}
-
-img.right {
-	float: right;
-	margin-left: 15px;
-}
-
-/* Form */
-
-form {
-	margin: 0;
-	padding: 0;
-}
-
-fieldset {
-	margin: 0;
-	padding: 0;
-	border: none;
-}
-
-legend {
-	display: none;
-}
-
-input, textarea, select {
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	color: #333333;
-}
-
-#wrapper {
-	margin: 0;
-	padding: 0;
-	background: #000000;
-}
-
-/* Header */
-
-#header {
-	width: 713px;
-	margin: 0 auto;
-	height: 42px;
-}
-
-/* Menu */
-
-#menu {
-	float: left;
-	width: 713px;
-	height: 50px;
-	background: url(images/img02.gif) no-repeat left top;
-}
-
-#menu ul {
-	margin: 0;
-	padding: 0px 0 0 10px;
-	list-style: none;
-	line-height: normal;
-}
-
-#menu li {
-	display: block;
-	float: left;
-}
-
-#menu a {
-	display: block;
-	float: left;
-	background: url(images/img04.gif) no-repeat right 55%;
-	margin-top: 5px;
-	margin-right: 3px;
-	padding: 8px 17px;
-	text-decoration: none;
-	font-size: 13px;
-	color: #000000;
-}
-
-#menu a:hover { 
-	color: #000000;
-}
-
-#menu .current_page_item a {
-	color: #000000;
-}
-
-/** LOGO */
-
-#logo {
-	width: 713px;
-	height: 80px;
-	margin: 0 auto;
-}
-
-#logo h1, #logo h2 {
-	float: left;
-	margin: 0;
-	padding: 30px 0 0 0px;
-	line-height: normal;
-}
-
-#logo h1 { 
-	font-family: Georgia, "Times New Roman", Times, serif;
-	font-size:40px;
-}
-
-#logo h1 a {
-	text-decoration: none;
-	color: #4C4C4C; 
-}
-
-#logo h1 a:hover { text-decoration: underline; }
-
-#logo h2 {
-	float: left;
-	padding: 45px 0 0 18px;
-	font: 18px Georgia, "Times New Roman", Times, serif;
-	color: #8BD80E; 
-}
-
-#logo p a {
-	text-decoration: none;
-	color: #8BD80E;
-}
-
-#logo p a:hover { text-decoration: underline; }
-
-
-
-/* Page */
-
-#page {
-	width: 663px;
-	margin: 0 auto;
-	background: #4C4C4C url(images/img03.gif) no-repeat left bottom;
-	padding: 0 25px;
-}
-
-/* Content */
-
-#content {
-	float: left;
-	width: 410px;
-	
-}
-
-/* Post */
-
-.post {
-	padding: 15px 0px;
-	margin-bottom: 20px;
-}
-
-.post .title {
-	margin-bottom: 20px;
-	padding-bottom: 5px;
-}
-
-.post h1 {
-	padding: 0px 0 0 0px;
-	background: url(images/img08.jpg) no-repeat left top;
-	font-size: 24px;
-	color: #FFFFFF;
-}
-
-.post h2 {
-	padding: 0px 0 0 0px;
-	font-size: 22px;
-	color: #FFFFFF;
-}
-
-.post .entry {
-}
-
-.post .meta {
-	padding: 15px 15px 30px 0px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-}
-
-.post .meta p {
-	margin: 0;
-	padding-top: 15px;
-	line-height: normal;
-	color: #FFFFFF;
-}
-
-.post .meta .byline {
-	float: left;
-}
-
-.post .meta .links {
-	float: right;
-}
-
-.post .meta .more {
-	padding: 0 10px 0 18px;
-}
-
-.post .meta .comments {
-}
-
-.post .meta b {
-	display: none;
-}
-
-
-/* Sidebar */
-
-#sidebar {
-	width: 210px;
-	float: right;
-	margin: 0;
-	padding: 0;
-}
-
-#sidebar ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-#sidebar li {
-	margin-bottom: 40px;
-}
-
-#sidebar li ul {
-}
-
-#sidebar li li {
-	margin: 0;
-}
-
-#sidebar h2 {
-	width: 250px;
-	padding: 8px 0 0 0px;
-	margin-bottom: 10px;
-	background: url(images/img07.jpg) no-repeat left top;
-	font-size: 20px;
-	color: #FFFFFF;
-}
-
-/* Search */
-
-#search {
-
-}
-
-#search h2 {
-	margin-bottom: 20px;
-}
-
-#s {
-	width: 140px;
-	margin-right: 5px;
-	padding: 3px;
-	border: 1px solid #BED99C;
-}
-
-#x {
-	padding: 3px;
-	border: none;
-	background: #8BD80E;
-	text-transform: lowercase;
-	font-size: 11px;
-	color: #FFFFFF;
-}
-
-/* Boxes */
-
-.box1 {
-	padding: 20px;
-}
-
-.box2 {
-	color: #BABABA;
-}
-
-.box2 h2 {
-	margin-bottom: 15px;
-	font-size: 16px;
-	color: #FFFFFF;
-}
-
-.box2 ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.box2 a:link, .box2 a:hover, .box2 a:active, .box2 a:visited  {
-	color: #EDEDED;
-}
-
-/* Footer */
-#footer-wrap {
-}
-
-#footer {
-	margin: 0 auto;
-	padding: 20px 0 10px 0;
-	background: #000000;
-}
-
-html>body #footer {
-	height: auto;
-}
-
-#footer p {
-	font-size: 11px;
-}
-
-#legal {
-	clear: both;
-	padding-top: 17px;
-	text-align: center;
-	color: #FFFFFF;
-}
-
-#legal a {
-	font-weight: normal;
-	color: #FFFFFF;
-}
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img01.gif b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img01.gif
deleted file mode 100644
index 5f082bd99..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img01.gif
+++ /dev/null
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img02.gif b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img02.gif
deleted file mode 100644
index 45a3ae976..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img02.gif
+++ /dev/null
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img03.gif b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img03.gif
deleted file mode 100644
index d92ea38f9..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img03.gif
+++ /dev/null
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img04.gif b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img04.gif
deleted file mode 100644
index 950c4af9d..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/img04.gif
+++ /dev/null
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/spacer.gif b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/images/spacer.gif
+++ /dev/null
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/style.css b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/style.css
deleted file mode 100644
index cad87e0d4..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/style.css
+++ /dev/null
@@ -1,109 +0,0 @@
-html, body {
-  color: black;
-  background-color: #ddd;
-  font: x-small "Lucida Grande", "Lucida Sans Unicode", geneva, sans-serif;
-  margin: 0;
-  padding: 0;
-}
-
-td, th {padding:3px;border:none;}
-tr th {text-align:left;background-color:#f0f0f0;color:#333;}
-tr.odd td {background-color:#edf3fe;}
-tr.even td {background-color:#fff;}
-
-#header {
-  height: 80px;
-  width: 777px;
-  background: blue URL('../images/header_inner.png') no-repeat;
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  margin: 0 auto 0 auto;
-}
-
-a.link, a, a.active {
-  color: #369;
-}
-
-
-#main_content {
-  color: black;
-  font-size: 127%;
-  background-color: white;
-  width: 757px;
-  margin: 0 auto 0 auto;
-  border-left: 1px solid #aaa;
-  border-right: 1px solid #aaa;
-  padding: 10px;
-}
-
-#sidebar {
-  border: 1px solid #aaa;
-  background-color: #eee;
-  margin: 0.5em;
-  padding: 1em;
-  float: right;
-  width: 200px;
-  font-size: 88%;
-}
-
-#sidebar h2 {
-  margin-top: 0;
-}
-
-#sidebar ul {
-  margin-left: 1.5em;
-  padding-left: 0;
-}
-
-h1,h2,h3,h4,h5,h6,#getting_started_steps {
-  font-family: "Century Schoolbook L", Georgia, serif;
-  font-weight: bold;
-}
-
-h2 {
-  font-size: 150%;
-}
-
-#footer {
-  border: 1px solid #aaa;
-  border-top: 0px none;
-  color: #999;
-  background-color: white;
-  padding: 10px;
-  font-size: 80%;
-  text-align: center;
-  width: 757px;
-  margin: 0 auto 1em auto;
-}
-
-.code {
-  font-family: monospace;
-}
-
-span.code {
-  font-weight: bold;
-  background: #eee;
-}
-
-#status_block {
-  margin: 0 auto 0.5em auto;
-  padding: 15px 10px 15px 55px;
-  background: #cec URL('../images/ok.png') left center no-repeat;
-  border: 1px solid #9c9;
-  width: 450px;
-  font-size: 120%;
-  font-weight: bolder;
-}
-
-.notice {
-  margin: 0.5em auto 0.5em auto;
-  padding: 15px 10px 15px 55px;
-  width: 450px;
-  background: #eef URL('../images/info.png') left center no-repeat;
-  border: 1px solid #cce;
-}
-
-.fielderror {
-    color: red;
-    font-weight: bold;
-}
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/templatelicense.txt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/templatelicense.txt
deleted file mode 100644
index ccb6b06ab..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/static/templatelicense.txt
+++ /dev/null
@@ -1,243 +0,0 @@
-Creative Commons </>
-
-Creative Commons Legal Code
-
-*Attribution 2.5*
-
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
-INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-ITS USE.
-
-/License/
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
-RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
-AND CONDITIONS.
-
-*1. Definitions*
-
-   1. *"Collective Work"* means a work, such as a periodical issue,
-      anthology or encyclopedia, in which the Work in its entirety in
-      unmodified form, along with a number of other contributions,
-      constituting separate and independent works in themselves, are
-      assembled into a collective whole. A work that constitutes a
-      Collective Work will not be considered a Derivative Work (as
-      defined below) for the purposes of this License.
-   2. *"Derivative Work"* means a work based upon the Work or upon the
-      Work and other pre-existing works, such as a translation, musical
-      arrangement, dramatization, fictionalization, motion picture
-      version, sound recording, art reproduction, abridgment,
-      condensation, or any other form in which the Work may be recast,
-      transformed, or adapted, except that a work that constitutes a
-      Collective Work will not be considered a Derivative Work for the
-      purpose of this License. For the avoidance of doubt, where the
-      Work is a musical composition or sound recording, the
-      synchronization of the Work in timed-relation with a moving image
-      ("synching") will be considered a Derivative Work for the purpose
-      of this License.
-   3. *"Licensor"* means the individual or entity that offers the Work
-      under the terms of this License.
-   4. *"Original Author"* means the individual or entity who created the
-      Work.
-   5. *"Work"* means the copyrightable work of authorship offered under
-      the terms of this License.
-   6. *"You"* means an individual or entity exercising rights under this
-      License who has not previously violated the terms of this License
-      with respect to the Work, or who has received express permission
-      from the Licensor to exercise rights under this License despite a
-      previous violation.
-
-*2. Fair Use Rights.* Nothing in this license is intended to reduce,
-limit, or restrict any rights arising from fair use, first sale or other
-limitations on the exclusive rights of the copyright owner under
-copyright law or other applicable laws.
-
-*3. License Grant.* Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
-   1. to reproduce the Work, to incorporate the Work into one or more
-      Collective Works, and to reproduce the Work as incorporated in the
-      Collective Works;
-   2. to create and reproduce Derivative Works;
-   3. to distribute copies or phonorecords of, display publicly, perform
-      publicly, and perform publicly by means of a digital audio
-      transmission the Work including as incorporated in Collective Works;
-   4. to distribute copies or phonorecords of, display publicly, perform
-      publicly, and perform publicly by means of a digital audio
-      transmission Derivative Works.
-   5.
-
-      For the avoidance of doubt, where the work is a musical composition:
-
-         1. *Performance Royalties Under Blanket Licenses*. Licensor
-            waives the exclusive right to collect, whether individually
-            or via a performance rights society (e.g. ASCAP, BMI,
-            SESAC), royalties for the public performance or public
-            digital performance (e.g. webcast) of the Work.
-         2. *Mechanical Rights and Statutory Royalties*. Licensor waives
-            the exclusive right to collect, whether individually or via
-            a music rights agency or designated agent (e.g. Harry Fox
-            Agency), royalties for any phonorecord You create from the
-            Work ("cover version") and distribute, subject to the
-            compulsory license created by 17 USC Section 115 of the US
-            Copyright Act (or the equivalent in other jurisdictions).
-   6. *Webcasting Rights and Statutory Royalties*. For the avoidance of
-      doubt, where the Work is a sound recording, Licensor waives the
-      exclusive right to collect, whether individually or via a
-      performance-rights society (e.g. SoundExchange), royalties for the
-      public digital performance (e.g. webcast) of the Work, subject to
-      the compulsory license created by 17 USC Section 114 of the US
-      Copyright Act (or the equivalent in other jurisdictions).
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights
-in other media and formats. All rights not expressly granted by Licensor
-are hereby reserved.
-
-*4. Restrictions.*The license granted in Section 3 above is expressly
-made subject to and limited by the following restrictions:
-
-   1. You may distribute, publicly display, publicly perform, or
-      publicly digitally perform the Work only under the terms of this
-      License, and You must include a copy of, or the Uniform Resource
-      Identifier for, this License with every copy or phonorecord of the
-      Work You distribute, publicly display, publicly perform, or
-      publicly digitally perform. You may not offer or impose any terms
-      on the Work that alter or restrict the terms of this License or
-      the recipients' exercise of the rights granted hereunder. You may
-      not sublicense the Work. You must keep intact all notices that
-      refer to this License and to the disclaimer of warranties. You may
-      not distribute, publicly display, publicly perform, or publicly
-      digitally perform the Work with any technological measures that
-      control access or use of the Work in a manner inconsistent with
-      the terms of this License Agreement. The above applies to the Work
-      as incorporated in a Collective Work, but this does not require
-      the Collective Work apart from the Work itself to be made subject
-      to the terms of this License. If You create a Collective Work,
-      upon notice from any Licensor You must, to the extent practicable,
-      remove from the Collective Work any credit as required by clause
-      4(b), as requested. If You create a Derivative Work, upon notice
-      from any Licensor You must, to the extent practicable, remove from
-      the Derivative Work any credit as required by clause 4(b), as
-      requested.
-   2. If you distribute, publicly display, publicly perform, or publicly
-      digitally perform the Work or any Derivative Works or Collective
-      Works, You must keep intact all copyright notices for the Work and
-      provide, reasonable to the medium or means You are utilizing: (i)
-      the name of the Original Author (or pseudonym, if applicable) if
-      supplied, and/or (ii) if the Original Author and/or Licensor
-      designate another party or parties (e.g. a sponsor institute,
-      publishing entity, journal) for attribution in Licensor's
-      copyright notice, terms of service or by other reasonable means,
-      the name of such party or parties; the title of the Work if
-      supplied; to the extent reasonably practicable, the Uniform
-      Resource Identifier, if any, that Licensor specifies to be
-      associated with the Work, unless such URI does not refer to the
-      copyright notice or licensing information for the Work; and in the
-      case of a Derivative Work, a credit identifying the use of the
-      Work in the Derivative Work (e.g., "French translation of the Work
-      by Original Author," or "Screenplay based on original Work by
-      Original Author"). Such credit may be implemented in any
-      reasonable manner; provided, however, that in the case of a
-      Derivative Work or Collective Work, at a minimum such credit will
-      appear where any other comparable authorship credit appears and in
-      a manner at least as prominent as such other comparable authorship
-      credit.
-
-*5. Representations, Warranties and Disclaimer*
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-*6. Limitation on Liability.* EXCEPT TO THE EXTENT REQUIRED BY
-APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL
-THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
-DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
-LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-*7. Termination*
-
-   1. This License and the rights granted hereunder will terminate
-      automatically upon any breach by You of the terms of this License.
-      Individuals or entities who have received Derivative Works or
-      Collective Works from You under this License, however, will not
-      have their licenses terminated provided such individuals or
-      entities remain in full compliance with those licenses. Sections
-      1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted
-      here is perpetual (for the duration of the applicable copyright in
-      the Work). Notwithstanding the above, Licensor reserves the right
-      to release the Work under different license terms or to stop
-      distributing the Work at any time; provided, however that any such
-      election will not serve to withdraw this License (or any other
-      license that has been, or is required to be, granted under the
-      terms of this License), and this License will continue in full
-      force and effect unless terminated as stated above.
-
-*8. Miscellaneous*
-
-   1. Each time You distribute or publicly digitally perform the Work or
-      a Collective Work, the Licensor offers to the recipient a license
-      to the Work on the same terms and conditions as the license
-      granted to You under this License.
-   2. Each time You distribute or publicly digitally perform a
-      Derivative Work, Licensor offers to the recipient a license to the
-      original Work on the same terms and conditions as the license
-      granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under
-      applicable law, it shall not affect the validity or enforceability
-      of the remainder of the terms of this License, and without further
-      action by the parties to this agreement, such provision shall be
-      reformed to the minimum extent necessary to make such provision
-      valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no
-      breach consented to unless such waiver or consent shall be in
-      writing and signed by the party to be charged with such waiver or
-      consent.
-   5. This License constitutes the entire agreement between the parties
-      with respect to the Work licensed here. There are no
-      understandings, agreements or representations with respect to the
-      Work not specified here. Licensor shall not be bound by any
-      additional provisions that may appear in any communication from
-      You. This License may not be modified without the mutual written
-      agreement of the Licensor and You.
-
-Creative Commons is not a party to this License, and makes no warranty
-whatsoever in connection with the Work. Creative Commons will not be
-liable to You or any party on any legal theory for any damages
-whatsoever, including without limitation any general, special,
-incidental or consequential damages arising in connection to this
-license. Notwithstanding the foregoing two (2) sentences, if Creative
-Commons has expressly identified itself as the Licensor hereunder, it
-shall have all rights and obligations of Licensor.
-
-Except for the limited purpose of indicating to the public that the Work
-is licensed under the CCPL, neither party will use the trademark
-"Creative Commons" or any related trademark or logo of Creative Commons
-without the prior written consent of Creative Commons. Any permitted use
-will be in compliance with Creative Commons' then-current trademark
-usage guidelines, as may be published on its website or otherwise made
-available upon request from time to time.
-
-Creative Commons may be contacted at http://creativecommons.org/
-<http://creativecommons.org>.
-
-« Back to Commons Deed <./>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/view.pt b/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/view.pt
deleted file mode 100644
index f957176f1..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/templates/view.pt
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-    xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:tal="http://xml.zope.org/namespaces/tal">
-
-<head>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <title>${page.__name__} - Pyramid tutorial wiki 
-           (based on TurboGears 20-Minute Wiki)
-    </title>
-        <link rel="stylesheet" type="text/css"
-          href="${request.application_url}/static/style.css" />
-</head>
-
-<body>
-
-<div class="main_content">
-<div style="float:right; width: 10em;"> Viewing
-<span tal:replace="page.__name__">Page Name Goes Here</span> <br/>
-You can return to the <a href="${request.application_url}">FrontPage</a>.
-<span tal:condition="logged_in">
-  <a href="${request.application_url}/logout">Logout</a>
-</span>
-</div>
-
-<div tal:replace="structure content">Page text goes here.</div>
-<p><a tal:attributes="href edit_url" href="">Edit this page</a></p>
-</div>
-
-</body></html>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py
deleted file mode 100644
index d082fb84d..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/tests.py
+++ /dev/null
@@ -1,123 +0,0 @@
-import unittest
-
-from pyramid import testing
-
-class PageModelTests(unittest.TestCase):
-
-    def _getTargetClass(self):
-        from tutorial.models import Page
-        return Page
-
-    def _makeOne(self, data=u'some data'):
-        return self._getTargetClass()(data=data)
-
-    def test_constructor(self):
-        instance = self._makeOne()
-        self.assertEqual(instance.data, u'some data')
-        
-class WikiModelTests(unittest.TestCase):
-
-    def _getTargetClass(self):
-        from tutorial.models import Wiki
-        return Wiki
-
-    def _makeOne(self):
-        return self._getTargetClass()()
-
-    def test_it(self):
-        wiki = self._makeOne()
-        self.assertEqual(wiki.__parent__, None)
-        self.assertEqual(wiki.__name__, None)
-
-class AppmakerTests(unittest.TestCase):
-    def _callFUT(self, zodb_root):
-        from tutorial.models import appmaker
-        return appmaker(zodb_root)
-
-    def test_it(self):
-        root = {}
-        self._callFUT(root)
-        self.assertEqual(root['app_root']['FrontPage'].data,
-                         'This is the front page')
-
-class ViewWikiTests(unittest.TestCase):
-    def test_it(self):
-        from tutorial.views import view_wiki
-        context = testing.DummyModel()
-        request = testing.DummyRequest()
-        response = view_wiki(context, request)
-        self.assertEqual(response.location, 'http://example.com/FrontPage')
-
-class ViewPageTests(unittest.TestCase):
-    def _callFUT(self, context, request):
-        from tutorial.views import view_page
-        return view_page(context, request)
-
-    def test_it(self):
-        wiki = testing.DummyModel()
-        wiki['IDoExist'] = testing.DummyModel()
-        context = testing.DummyModel(data='Hello CruelWorld IDoExist')
-        context.__parent__ = wiki
-        context.__name__ = 'thepage'
-        request = testing.DummyRequest()
-        info = self._callFUT(context, request)
-        self.assertEqual(info['page'], context)
-        self.assertEqual(
-            info['content'], 
-            '<div class="document">\n'
-            '<p>Hello <a href="http://example.com/add_page/CruelWorld">'
-            'CruelWorld</a> '
-            '<a href="http://example.com/IDoExist/">'
-            'IDoExist</a>'
-            '</p>\n</div>\n')
-        self.assertEqual(info['edit_url'],
-                         'http://example.com/thepage/edit_page')
-        
-    
-class AddPageTests(unittest.TestCase):
-    def _callFUT(self, context, request):
-        from tutorial.views import add_page
-        return add_page(context, request)
-
-    def test_it_notsubmitted(self):
-        from pyramid.url import model_url
-        context = testing.DummyModel()
-        request = testing.DummyRequest()
-        request.subpath = ['AnotherPage']
-        info = self._callFUT(context, request)
-        self.assertEqual(info['page'].data,'')
-        self.assertEqual(info['save_url'],
-                         model_url(context, request, 'add_page', 'AnotherPage'))
-        
-    def test_it_submitted(self):
-        context = testing.DummyModel()
-        request = testing.DummyRequest({'form.submitted':True,
-                                        'body':'Hello yo!'})
-        request.subpath = ['AnotherPage']
-        self._callFUT(context, request)
-        page = context['AnotherPage']
-        self.assertEqual(page.data, 'Hello yo!')
-        self.assertEqual(page.__name__, 'AnotherPage')
-        self.assertEqual(page.__parent__, context)
-
-class EditPageTests(unittest.TestCase):
-    def _callFUT(self, context, request):
-        from tutorial.views import edit_page
-        return edit_page(context, request)
-
-    def test_it_notsubmitted(self):
-        from pyramid.url import model_url
-        context = testing.DummyModel()
-        request = testing.DummyRequest()
-        info = self._callFUT(context, request)
-        self.assertEqual(info['page'], context)
-        self.assertEqual(info['save_url'],
-                         model_url(context, request, 'edit_page'))
-        
-    def test_it_submitted(self):
-        context = testing.DummyModel()
-        request = testing.DummyRequest({'form.submitted':True,
-                                        'body':'Hello yo!'})
-        response = self._callFUT(context, request)
-        self.assertEqual(response.location, 'http://example.com/')
-        self.assertEqual(context.data, 'Hello yo!')
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
deleted file mode 100644
index f0fef5d81..000000000
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from docutils.core import publish_parts
-import re
-
-from webob.exc import HTTPFound
-from pyramid.url import model_url
-
-from pyramid.security import authenticated_userid
-
-from pyramid.view import bfg_view
-
-from tutorial.models import Page
-from tutorial.models import Wiki
-
-# regular expression used to find WikiWords
-wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
-
-@bfg_view(context=Wiki, permission='view')
-def view_wiki(context, request):
-    return HTTPFound(location = model_url(context, request, 'FrontPage'))
-
-@bfg_view(context=Page, renderer='templates/view.pt', permission='view')
-def view_page(context, request):
-    wiki = context.__parent__
-
-    def check(match):
-        word = match.group(1)
-        if word in wiki:
-            page = wiki[word]
-            view_url = model_url(page, request)
-            return '<a href="%s">%s</a>' % (view_url, word)
-        else:
-            add_url = request.application_url + '/add_page/' + word 
-            return '<a href="%s">%s</a>' % (add_url, word)
-
-    content = publish_parts(context.data, writer_name='html')['html_body']
-    content = wikiwords.sub(check, content)
-    edit_url = model_url(context, request, 'edit_page')
-
-    logged_in = authenticated_userid(request)
-
-    return dict(page = context, content = content, edit_url = edit_url,
-                logged_in = logged_in)
-
-@bfg_view(context=Wiki, name='add_page', renderer='templates/edit.pt',
-          permission='edit')
-def add_page(context, request):
-    name = request.subpath[0]
-    if 'form.submitted' in request.params:
-        body = request.params['body']
-        page = Page(body)
-        page.__name__ = name
-        page.__parent__ = context
-        context[name] = page
-        return HTTPFound(location = model_url(page, request))
-    save_url = model_url(context, request, 'add_page', name)
-    page = Page('')
-    page.__name__ = name
-    page.__parent__ = context
-
-    logged_in = authenticated_userid(request)
-
-    return dict(page = page, save_url = save_url, logged_in = logged_in)
-
-@bfg_view(context=Page, name='edit_page', renderer='templates/edit.pt',
-          permission='edit')
-def edit_page(context, request):
-    if 'form.submitted' in request.params:
-        context.data = request.params['body']
-        return HTTPFound(location = model_url(context, request))
-
-    logged_in = authenticated_userid(request)
-
-    return dict(page = context,
-                save_url = model_url(context, request, 'edit_page'),
-                logged_in = logged_in)
-