summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-05-31 18:31:07 +0000
committerChris McDonough <chrism@agendaless.com>2009-05-31 18:31:07 +0000
commit244c4e8f5a7cce2d2e63b6c29107b7482711b346 (patch)
treee8d1dac398e00ccb685731f14f127aa7ddc3fb89 /docs
parent0e00b075aaf63420e0944d9373d856d8be5eae24 (diff)
downloadpyramid-244c4e8f5a7cce2d2e63b6c29107b7482711b346.tar.gz
pyramid-244c4e8f5a7cce2d2e63b6c29107b7482711b346.tar.bz2
pyramid-244c4e8f5a7cce2d2e63b6c29107b7482711b346.zip
Note bfgwiki change.
Diffstat (limited to 'docs')
-rw-r--r--docs/index.rst17
-rw-r--r--docs/tutorials/bfgwiki/index.rst6
2 files changed, 12 insertions, 11 deletions
diff --git a/docs/index.rst b/docs/index.rst
index edf40ae09..d9913e20e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -106,12 +106,11 @@ Change History
Sample Applications
===================
-`repoze.wiki <http://svn.repoze.org/repoze.wiki/trunk/>`_ is a port of
-the `TurboGears 20-Minute Wiki
-<http://turbogears.org/2.0/docs/main/Wiki20/wiki20.html>`_. It
-demonstrates integration with `SQLAlchemy
-<http://www.sqlalchemy.org/>`_, customized traversal, and form
-processing. Check this application out of Subversion via::
+`repoze.wiki <http://svn.repoze.org/repoze.wiki/trunk/>`_ is a variant
+of the application created during :ref:`bfg_wiki_tutorial` which uses
+`SQLAlchemy <http://www.sqlalchemy.org/>`_ instead of :term:`ZODB` and
+:term:`url dispatch` instead of :term:`traversal`. Check this
+application out of Subversion via::
svn co http://svn.repoze.org/repoze.wiki/trunk repoze.wiki
@@ -136,9 +135,9 @@ Subversion via::
`repoze.shootout <http://svn.repoze.org/repoze.shootout/trunk/>`_ is
an example "idea competition" application by Carlos de la Guardia. It
-demonstrates :term:`URL dispatch` and integration with `SQLAlchemy
-<http://www.sqlalchemy.org/>`_ and :term:`repoze.who`. Check this
-application out of Subversion via::
+demonstrates a hybrid of :term:`URL dispatch` and :term:`traversal`
+and integration with `SQLAlchemy <http://www.sqlalchemy.org/>`_ and
+:term:`repoze.who`. Check this application out of Subversion via::
svn co http://svn.repoze.org/repoze.shootout/trunk repoze.shootout
diff --git a/docs/tutorials/bfgwiki/index.rst b/docs/tutorials/bfgwiki/index.rst
index cabfa3d22..5860dc181 100644
--- a/docs/tutorials/bfgwiki/index.rst
+++ b/docs/tutorials/bfgwiki/index.rst
@@ -1,5 +1,7 @@
-BFG Tutorial: BFG Wiki
-======================
+.. _bfg_wiki_tutorial:
+
+BFG Wiki Tutorial
+=================
This tutorial introduces a :term:`traversal` -based BFG application to
a developer with at least passing familiarity to Python. When we're