[soc2009/multidb] Resolved a number of strange merge conflicts that had arisen throughout various merges.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11777 bcc190cf-cafb-0310-a4f2-bffc1f526a37

docs/ref/databases.txt

@@ -257,6 +257,7 @@ Here's a sample configuration which uses a MySQL option file::
         }
     }
 
+
     # my.cnf
     [client]
     database = NAME

docs/ref/django-admin.txt

@@ -498,11 +498,6 @@ prompts.
 The :djadminopt:`--database` option can be used to specify the alias
 of the database to reset.
 
-Executes the equivalent of ``sqlreset`` for the given app name(s).
-
-The :djadminopt:`--noinput` option may be provided to suppress all user
-prompts.
-
 runfcgi [options]
 -----------------
 

docs/ref/templates/builtins.txt

@@ -65,16 +65,6 @@ Forgeries <ref-contrib-csrf>`.
 
 .. templatetag:: cycle
 
-csrf_token
-~~~~~~~~~~
-
-.. versionadded:: 1.1.2
-
-In the Django 1.1.X series, this is a no-op tag that returns an empty string for
-future compatibility purposes.  In Django 1.2 and later, it is used for CSRF
-protection, as described in the documentation for :ref:`Cross Site Request
-Forgeries <ref-contrib-csrf>`.
-
 cycle
 ~~~~~
 

docs/releases/1.2.txt

@@ -189,4 +189,3 @@ Django 1.2 adds the ability to use :ref:`more than one database
 issued at a specific database with the `using()` method on
 querysets; individual objects can be saved to a specific database
 by providing a ``using`` argument when you save the instance.
-