Autogenerated HTML docs for v1.5.3.1-4-gad00

diff --git a/git-send-email.html b/git-send-email.html
index 262266e607c813cbf430cb78323beaf4a677bbd7..6fe4fe3420146f9e93296e62131511a6c905e291 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -380,6 +380,17 @@ enabled interface to provide the necessary information.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--identity\r
+</dt>\r
+<dd>\r
+<p>\r
+        A configuration identity. When given, causes values in the\r
+        <em>sendemail.&lt;identity&gt;</em> subsection to take precedence over\r
+        values in the <em>sendemail</em> section. The default identity is\r
+        the value of <em>sendemail.identity</em>.\r
+</p>\r
+</dd>\r
+<dt>\r
 --smtp-server\r
 </dt>\r
 <dd>\r
@@ -395,6 +406,27 @@ enabled interface to provide the necessary information.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--smtp-user, --smtp-pass\r
+</dt>\r
+<dd>\r
+<p>\r
+        Username and password for SMTP-AUTH. Defaults are the values of\r
+        the configuration values <em>sendemail.smtpuser</em> and\r
+        <em>sendemail.smtppass</em>, but see also <em>sendemail.identity</em>.\r
+        If not set, authentication is not attempted.\r
+</p>\r
+</dd>\r
+<dt>\r
+--smtp-ssl\r
+</dt>\r
+<dd>\r
+<p>\r
+        If set, connects to the SMTP server using SSL.\r
+        Default is the value of the <em>sendemail.smtpssl</em> configuration value;\r
+        if that is unspecified, does not use SSL.\r
+</p>\r
+</dd>\r
+<dt>\r
 --subject\r
 </dt>\r
 <dd>\r
@@ -463,6 +495,18 @@ enabled interface to provide the necessary information.</p>
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
+sendemail.identity\r
+</dt>\r
+<dd>\r
+<p>\r
+        The default configuration identity. When specified,\r
+        <em>sendemail.&lt;identity&gt;.&lt;item&gt;</em> will have higher precedence than\r
+        <em>sendemail.&lt;item&gt;</em>. This is useful to declare multiple SMTP\r
+        identities and to hoist sensitive authentication information\r
+        out of the repository and into the global configuation file.\r
+</p>\r
+</dd>\r
+<dt>\r
 sendemail.aliasesfile\r
 </dt>\r
 <dd>\r
@@ -510,7 +554,31 @@ sendemail.smtpserver
 </dt>\r
 <dd>\r
 <p>\r
-        Default smtp server to use.\r
+        Default SMTP server to use.\r
+</p>\r
+</dd>\r
+<dt>\r
+sendemail.smtpuser\r
+</dt>\r
+<dd>\r
+<p>\r
+        Default SMTP-AUTH username.\r
+</p>\r
+</dd>\r
+<dt>\r
+sendemail.smtppass\r
+</dt>\r
+<dd>\r
+<p>\r
+        Default SMTP-AUTH password.\r
+</p>\r
+</dd>\r
+<dt>\r
+sendemail.smtpssl\r
+</dt>\r
+<dd>\r
+<p>\r
+        Boolean value specifying the default to the <em>--smtp-ssl</em> parameter.\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -531,7 +599,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Sep-2007 06:24:43 UTC\r
+Last updated 06-Sep-2007 01:33:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 16bfd7be2271d21d8d380e9f4e20307569f3a538..1ec61affab506705499a80ec944b290896b993a0 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -75,6 +75,12 @@ The --cc option must be repeated for each user you want on the cc list.
        Make git-send-email less verbose.  One line per email should be
        all that is output.
 
+--identity::
+       A configuration identity. When given, causes values in the
+       'sendemail.<identity>' subsection to take precedence over
+       values in the 'sendemail' section. The default identity is
+       the value of 'sendemail.identity'.
+
 --smtp-server::
        If set, specifies the outgoing SMTP server to use (e.g.
        `smtp.example.com` or a raw IP address).  Alternatively it can
@@ -85,6 +91,17 @@ The --cc option must be repeated for each user you want on the cc list.
        `/usr/lib/sendmail` if such program is available, or
        `localhost` otherwise.
 
+--smtp-user, --smtp-pass::
+       Username and password for SMTP-AUTH. Defaults are the values of
+       the configuration values 'sendemail.smtpuser' and
+       'sendemail.smtppass', but see also 'sendemail.identity'.
+       If not set, authentication is not attempted.
+
+--smtp-ssl::
+       If set, connects to the SMTP server using SSL.
+       Default is the value of the 'sendemail.smtpssl' configuration value;
+       if that is unspecified, does not use SSL.
+
 --subject::
        Specify the initial subject of the email thread.
        Only necessary if --compose is also set.  If --compose
@@ -122,6 +139,13 @@ The --to option must be repeated for each user you want on the to list.
 
 CONFIGURATION
 -------------
+sendemail.identity::
+       The default configuration identity. When specified,
+       'sendemail.<identity>.<item>' will have higher precedence than
+       'sendemail.<item>'. This is useful to declare multiple SMTP
+       identities and to hoist sensitive authentication information
+       out of the repository and into the global configuation file.
+
 sendemail.aliasesfile::
        To avoid typing long email addresses, point this to one or more
        email aliases files.  You must also supply 'sendemail.aliasfiletype'.
@@ -141,7 +165,16 @@ sendemail.chainreplyto::
        parameter.
 
 sendemail.smtpserver::
-       Default smtp server to use.
+       Default SMTP server to use.
+
+sendemail.smtpuser::
+       Default SMTP-AUTH username.
+
+sendemail.smtppass::
+       Default SMTP-AUTH password.
+
+sendemail.smtpssl::
+       Boolean value specifying the default to the '--smtp-ssl' parameter.
 
 Author
 ------