Merge branch 'jn/doc-dashdash'

* jn/doc-dashdash:
Documentation/i18n: quote double-dash for AsciiDoc
Documentation: quote double-dash for AsciiDoc

diff --combined Documentation/config.txt
index c631d1cbf9096b8973322366e2a3fe199286b9da,98eb4d97153c84f529fe7e935719dd79b5efa50c..b56959b5dce4d9cec9e9eb5a9aa7894ab6421b52
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -676,7 -676,7 +676,7 @@@ branch.<name>.rebase:
  browser.<tool>.cmd::
        Specify the command to invoke the specified browser. The
        specified command is evaluated in shell with the URLs passed
-       as arguments. (See linkgit:git-web--browse[1].)
+       as arguments. (See linkgit:git-web{litdd}browse[1].)
  
  browser.<tool>.path::
        Override the path for the given tool that may be used to
@@@ -1196,14 -1196,6 +1196,14 @@@ http.proxy:
        environment variable (see linkgit:curl[1]).  This can be overridden
        on a per-remote basis; see remote.<name>.proxy
  
 +http.cookiefile::
 +      File containing previously stored cookie lines which should be used
 +      in the git http session, if they match the server. The file format
 +      of the file to read cookies from should be plain HTTP headers or
 +      the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
 +      NOTE that the file specified with http.cookiefile is only used as
 +      input. No cookies will be stored in the file.
 +
  http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
        over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment