Author: Alex Date: 2009-11-23 10:43:35 -0600 (Mon, 23 Nov 2009) New Revision: 11768
Modified: django/branches/soc2009/multidb/docs/ref/models/options.txt django/branches/soc2009/multidb/docs/ref/models/querysets.txt django/branches/soc2009/multidb/docs/topics/db/multi-db.txt Log: [soc2009/multidb] Fixed some documentation markup problems. Patch from Russell Keith-Magee. Modified: django/branches/soc2009/multidb/docs/ref/models/options.txt =================================================================== --- django/branches/soc2009/multidb/docs/ref/models/options.txt 2009-11-23 16:43:25 UTC (rev 11767) +++ django/branches/soc2009/multidb/docs/ref/models/options.txt 2009-11-23 16:43:35 UTC (rev 11768) @@ -229,7 +229,7 @@ provided the default is ``'default'``. If it is porvided it can be overidden at the ``QuerySet`` level with the ``using()`` method. -.. versionadded:: TODO +.. versionadded:: 1.2 ``verbose_name`` ---------------- Modified: django/branches/soc2009/multidb/docs/ref/models/querysets.txt =================================================================== --- django/branches/soc2009/multidb/docs/ref/models/querysets.txt 2009-11-23 16:43:25 UTC (rev 11767) +++ django/branches/soc2009/multidb/docs/ref/models/querysets.txt 2009-11-23 16:43:35 UTC (rev 11768) @@ -877,12 +877,12 @@ ``using(alias)`` ~~~~~~~~~~~~~~~~~~ -.. versionadded:: TODO +.. versionadded:: 1.2 This method is for controlling which database the ``QuerySet`` will be evaluated against if you are using more than one database. The only argument this method takes is the alias of a database, as defined in -:settings:`DATABASES`. +:setting:`DATABASES`. For example:: Modified: django/branches/soc2009/multidb/docs/topics/db/multi-db.txt =================================================================== --- django/branches/soc2009/multidb/docs/topics/db/multi-db.txt 2009-11-23 16:43:25 UTC (rev 11767) +++ django/branches/soc2009/multidb/docs/topics/db/multi-db.txt 2009-11-23 16:43:35 UTC (rev 11768) @@ -4,7 +4,7 @@ Multiple Databases ================== -.. versionadded:: TODO +.. versionadded:: 1.2 This topic guide describes Django's support for interacting with multiple databases. Most of the rest of Django's documentation assumes you are @@ -17,14 +17,14 @@ The first step to using more than one database with Django is to tell Django about the database servers you'll be using. This is done using the -:settings:`DATABASES` setting. This setting maps database aliases, which are +:setting:`DATABASES` setting. This setting maps database aliases, which are a way to refer to a specific database throughout Django, to a dictionary of settings for that specific connection. The settings in the inner dictionaries -are described fully in the :settings:`DATABASES` documentation. The important +are described fully in the :setting:`DATABASES` documentation. The important thing to note is that your primary database should have the alias ``'default'``, and any additional databases you have can have whatever alias you choose. If at any time you attempt to access a database that isn't defined -in your :settings:`DATABASES` setting then Django will raise a +in your :setting:`DATABASES` setting then Django will raise a ``django.db.utils.ConnectionDoesNotExist`` exception. Selecting a Database for a ``Model`` @@ -56,7 +56,7 @@ To save the user. Select a Database to Delete a Model From -======================================= +======================================== To select which database to delete a model from you also use a ``using`` keyword argument to the ``Model.delete()`` method, analogous to the ``using`` -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/django-updates?hl=.
