Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  Documentation: fix git-config.xml generation

diff --combined Documentation/config.txt
index c1306a69e54d61104f249eacf5c158e31c73e143,65ed64a45744aa1a05615730910f8e5de2bbe933..fdb71de9f6c4f508996ccdf7970522ba53bb0dfe
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -288,7 -288,7 +288,7 @@@ apply.whitespace:
        as the '--whitespace' option. See gitlink:git-apply[1].
  
  branch.autosetupmerge::
-       Tells `git-branch' and `git-checkout' to setup new branches
+       Tells `git-branch` and `git-checkout` to setup new branches
        so that gitlink:git-pull[1] will appropriately merge from that
        remote branch.  Note that even if this option is not set,
        this behavior can be chosen per-branch using the `--track`
@@@ -312,10 -312,6 +312,10 @@@ branch.<name>.merge:
        branch.<name>.merge to the desired branch, and use the special setting
        `.` (a period) for branch.<name>.remote.
  
 +clean.requireForce::
 +      A boolean to make git-clean do nothing unless given -f or -n.  Defaults
 +      to false.
 +
  color.branch::
        A boolean to enable/disable color in the output of
        gitlink:git-branch[1]. May be set to `true` (or `always`),
@@@ -439,34 -435,8 +439,34 @@@ gitcvs.allbinary:
        causes the client to treat all files as binary files which suppresses
        any newline munging it otherwise might do. A work-around for the
        fact that there is no way yet to set single files to mode '-kb'.
 +
 +gitcvs.dbname::
 +      Database used by git-cvsserver to cache revision information
 +      derived from the git repository. The exact meaning depends on the
 +      used database driver, for SQLite (which is the default driver) this
 +      is a filename. Supports variable substitution (see
 +      gitlink:git-cvsserver[1] for details). May not contain semicolons (`;`).
 +      Default: '%Ggitcvs.%m.sqlite'
 +
 +gitcvs.dbdriver::
 +      Used Perl DBI driver. You can specify any available driver
 +        for this here, but it might not work. git-cvsserver is tested
 +      with 'DBD::SQLite', reported to work with 'DBD::Pg', and
 +      reported *not* to work with 'DBD::mysql'. Experimental feature.
 +      May not contain double colons (`:`). Default: 'SQLite'.
        See gitlink:git-cvsserver[1].
  
 +gitcvs.dbuser, gitcvs.dbpass::
 +      Database user and password. Only useful if setting 'gitcvs.dbdriver',
 +      since SQLite has no concept of database users and/or passwords.
 +      'gitcvs.dbuser' supports variable substitution (see
 +      gitlink:git-cvsserver[1] for details).
 +
 +All gitcvs variables except for 'gitcvs.allbinary' can also specifed
 +as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one
 +of "ext" and "pserver") to make them apply only for the given access
 +method.
 +
  http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
        over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
@@@ -541,27 -511,10 +541,27 @@@ merge.verbosity:
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
  
 +merge.<driver>.name::
 +      Defines a human readable name for a custom low-level
 +      merge driver.  See gitlink:gitattributes[5] for details.
 +
 +merge.<driver>.driver::
 +      Defines the command that implements a custom low-level
 +      merge driver.  See gitlink:gitattributes[5] for details.
 +
 +merge.<driver>.recursive::
 +      Names a low-level merge driver to be used when
 +      performing an internal merge between common ancestors.
 +      See gitlink:gitattributes[5] for details.
 +
  pack.window::
        The size of the window used by gitlink:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.
  
 +pack.depth::
 +      The maximum delta depth used by gitlink:git-pack-objects[1] when no
 +      maximum depth is given on the command line. Defaults to 50.
 +
  pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.
@@@ -626,8 -579,8 +626,8 @@@ tar.umask:
  
  user.email::
        Your email address to be recorded in any newly created commits.
 -      Can be overridden by the 'GIT_AUTHOR_EMAIL' and 'GIT_COMMITTER_EMAIL'
 -      environment variables.  See gitlink:git-commit-tree[1].
 +      Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
 +      'EMAIL' environment variables.  See gitlink:git-commit-tree[1].
  
  user.name::
        Your full name to be recorded in any newly created commits.