diff options
| -rw-r--r-- | docs/glossary.rst | 3 | ||||
| -rw-r--r-- | docs/index.rst | 22 | ||||
| -rw-r--r-- | docs/tutorials/bfgwiki/index.rst | 4 | ||||
| -rw-r--r-- | docs/tutorials/bfgwiki2/index.rst | 5 |
4 files changed, 22 insertions, 12 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 500338714..c8e978bd8 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -364,3 +364,6 @@ Glossary factory may be passed to ``make_app`` as ``None``, in which case the application performs no graph traversal and uses :term:`URL dispatch` for all URL-to-view code mappings. + SQLAlchemy + `SQLAlchemy' <http://www.sqlalchemy.org/>`_ is an object + relational mapper used in tutorials within this documentation. diff --git a/docs/index.rst b/docs/index.rst index d9913e20e..0c2c3740b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -73,14 +73,26 @@ Tutorials Step-by-step tutorials which demonstrate how you might use and deploy :mod:`repoze.bfg`. -"BFG Wiki" tutorial, demonstrating how to build a :term:`traversal` -based application using :term:`ZODB` and :term:`authentication`. +ZODB + traversal BFG Wiki tutorial, demonstrating how to build a +:term:`traversal` based application using :term:`ZODB` and +:term:`authentication`. Good for people with prior Zope experience +(or no experience at all). .. toctree:: :maxdepth: 3 tutorials/bfgwiki/index.rst +SQLAlchemy + url dispatch BFG Wiki tutorial, demonstrating how to +build a :term:`url dispatch` based application using +:term:`SQLAlchemy` and :term:`authentication`. Good for people with +prior Pylons experience (or no experience at all). + +.. toctree:: + :maxdepth: 3 + + tutorials/bfgwiki2/index.rst + :mod:`repoze.bfg` for Zope CMF Developers .. toctree:: @@ -108,9 +120,9 @@ Sample Applications `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:: +:term:`SQLAlchemy` instead of :term:`ZODB` and uses :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 diff --git a/docs/tutorials/bfgwiki/index.rst b/docs/tutorials/bfgwiki/index.rst index 5860dc181..842f233c4 100644 --- a/docs/tutorials/bfgwiki/index.rst +++ b/docs/tutorials/bfgwiki/index.rst @@ -1,7 +1,7 @@ .. _bfg_wiki_tutorial: -BFG Wiki Tutorial -================= +BFG ZODB + Traversal Wiki Tutorial +================================== This tutorial introduces a :term:`traversal` -based BFG application to a developer with at least passing familiarity to Python. When we're diff --git a/docs/tutorials/bfgwiki2/index.rst b/docs/tutorials/bfgwiki2/index.rst index 48126b178..405229b36 100644 --- a/docs/tutorials/bfgwiki2/index.rst +++ b/docs/tutorials/bfgwiki2/index.rst @@ -17,9 +17,4 @@ Contents: background installation basiclayout - definingmodels - definingviews - viewdecorators - authorization - distributing |