Index: glossary.txt
===================================================================
--- glossary.txt (revision 11321)
+++ glossary.txt (revision 17812)
@@ -9,26 +9,29 @@
field
An attribute on a :term:`model`; a given field usually maps directly to
a single database column.
-
- See :ref:`topics-db-models`.
+ See :doc:`/topics/db/models`.
+
generic view
A higher-order :term:`view` function that provides an abstract/generic
implementation of a common idiom or pattern found in view development.
-
- See :ref:`ref-generic-views`.
+ See :doc:`/ref/generic-views`.
+
model
Models store your application's data.
-
- See :ref:`topics-db-models`.
+ See :doc:`/topics/db/models`.
+
MTV
- See :ref:`mtv`.
+ "Model-template-view"; a software pattern, similar in style to MVC, but
+ a better description of the way Django does things.
+ See :ref:`the FAQ entry <faq-mtv>`.
+
MVC
`Model-view-controller`__; a software pattern. Django :ref:`follows MVC
- to some extent <mtv>`.
+ to some extent <faq-mtv>`.
__ http://en.wikipedia.org/wiki/Model-view-controller
@@ -40,42 +43,33 @@
property
Also known as "managed attributes", and a feature of Python since
- version 2.2. From `the property documentation`__:
-
- Properties are a neat way to implement attributes whose usage
- resembles attribute access, but whose implementation uses method
- calls. [...] You
- could only do this by overriding ``__getattr__`` and
- ``__setattr__``; but overriding ``__setattr__`` slows down all
- attribute assignments considerably, and overriding ``__getattr__``
- is always a bit tricky to get right. Properties let you do this
- painlessly, without having to override ``__getattr__`` or
- ``__setattr__``.
+ version 2.2. This is a neat way to implement attributes whose usage
+ resembles attribute access, but whose implementation uses method calls.
- __ http://www.python.org/download/releases/2.2/descrintro/#property
+ See :func:`property`.
queryset
An object representing some set of rows to be fetched from the database.
-
- See :ref:`topics-db-queries`.
+ See :doc:`/topics/db/queries`.
+
slug
A short label for something, containing only letters, numbers,
underscores or hyphens. They're generally used in URLs. For
example, in a typical blog entry URL:
-
+
.. parsed-literal::
-
- http://www.djangoproject.com/weblog/2008/apr/12/**spring**/
-
+
+ https://www.djangoproject.com/weblog/2008/apr/12/**spring**/
+
the last bit (``spring``) is the slug.
template
A chunk of text that acts as formatting for representing data. A
template helps to abstract the presentation of data from the data
itself.
-
- See :ref:`topics-templates`.
-
+
+ See :doc:`/topics/templates`.
+
view
- A function responsible for rending a page.
\ No newline at end of file
+ A function responsible for rending a page.
