From a5ffd62175a09402fbe37ec8c2077873e0a35903 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 18 Dec 2010 15:12:46 -0500 Subject: model->resource; make docs render without warnings --- docs/tutorials/wiki/basiclayout.rst | 14 +++++++++----- docs/tutorials/wiki/definingmodels.rst | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 15 deletions(-) (limited to 'docs/tutorials/wiki') diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst index 3dbf10bd8..c7c722f70 100644 --- a/docs/tutorials/wiki/basiclayout.rst +++ b/docs/tutorials/wiki/basiclayout.rst @@ -98,11 +98,15 @@ following: Content Models with ``models.py`` --------------------------------- -:app:`Pyramid` often uses the word :term:`model` when talking about -content resources arranged in the hierarchical *object graph* -consulted by :term:`traversal`. The ``models.py`` file is where the -``pyramid_zodb`` Paster template put the classes that implement our -model objects. +:app:`Pyramid` uses the word :term:`resource` to describe objects arranged +hierarchically in a :term:`resource tree`. This tree is consulted by +:term:`traversal` to map URLs to code. In this application, the resource +tree represents the site structure, but it *also* represents the +:term:`domain model` of the application, because eeach resource is a node +stored persistently in a :term:`ZODB` database. The ``models.py`` file is +where the ``pyramid_zodb`` Paster template put the classes that implement our +resource objects, each of which happens also to be a domain model +object. Here is the source for ``models.py``: diff --git a/docs/tutorials/wiki/definingmodels.rst b/docs/tutorials/wiki/definingmodels.rst index 097485047..f317d31dd 100644 --- a/docs/tutorials/wiki/definingmodels.rst +++ b/docs/tutorials/wiki/definingmodels.rst @@ -1,15 +1,17 @@ -=============== -Defining Models -=============== +========================= +Defining the Domain Model +========================= The first change we'll make to our bone-stock ``paster`` -generated -application will be to define a number of :term:`model` constructors. -For this application, which will be a Wiki, we will need two kinds of -model constructors: a "Wiki" model constructor, and a "Page" model -constructor. Both our Page and Wiki constructors will be class -objects. A single instance of the "Wiki" class will serve as a -container for "Page" objects, which will be instances of the "Page" -class. +application will be to define a number of :term:`resource` constructors. +Remember that, because we're using :term:`ZODB` to represent our +:term:`resource tree`, each of these resource constructors represents a +:term:`domain model` object, so we'll call these constructors "model +constructors". For this application, which will be a Wiki, we will need two +kinds of model constructors: a "Wiki" model constructor, and a "Page" model +constructor. Both our Page and Wiki constructors will be class objects. A +single instance of the "Wiki" class will serve as a container for "Page" +objects, which will be instances of the "Page" class. The source code for this tutorial stage can be browsed via `http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki/src/models/ -- cgit v1.2.3