This commit was generated by cvs2svn to compensate for changes in r147078,

which included commits to RCS files with non-trunk default branches.

3 files changed, 12 insertions, 16 deletions

diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README
index 52985bb33de5..646163b047d6 100644
--- a/contrib/sendmail/cf/README
+++ b/contrib/sendmail/cf/README
@@ -1593,7 +1593,7 @@ The four mailers are:
 
     uucp-old (obsolete name: "uucp")
 	This is the oldest, the worst (but the closest to UUCP) way of
-	sending messages accros UUCP connections.  It does bangify
+	sending messages across UUCP connections.  It does bangify
 	everything and prepends $U (your UUCP name) to the sender's
 	address (which can already be a bang path itself).  It can
 	only send to one address at a time, so it spends a lot of
@@ -2662,7 +2662,7 @@ blacklists, use the access_db feature and add:
 
 to the access map, where 10.1 is your local network.  You may
 want to use "RELAY" instead of "OK" to allow also relaying
-instead of just disabling the DNS lookups in the backlists.
+instead of just disabling the DNS lookups in the blacklists.
 
 
 The features described above make use of the check_relay, check_mail,
@@ -2870,12 +2870,12 @@ the previous paragraph.  Example:
 | STARTTLS |
 +----------+
 
-In this text, cert will be used as an abreviation for X.509 certificate,
+In this text, cert will be used as an abbreviation for X.509 certificate,
 DN (CN) is the distinguished (common) name of a cert, and CA is a
 certification authority, which signs (issues) certs.
 
 For STARTTLS to be offered by sendmail you need to set at least
-this variables (the file names and paths are just examples):
+these variables (the file names and paths are just examples):
 
 	define(`confCACERT_PATH', `/etc/mail/certs/')
 	define(`confCACERT', `/etc/mail/certs/CA.cert.pem')
@@ -4127,12 +4127,8 @@ confAUTH_OPTIONS	AuthOptions	[undefined] If this option is 'A'
 					then the AUTH= parameter for the
 					MAIL FROM command is only issued
 					when authentication succeeded.
-					Other values (which should be listed
-					one after the other without any
-					intervening characters except for
-					space or comma) are a, c, d, f, p,
-					and y.  See doc/op/op.me for
-					details.
+					See doc/op/op.me for more options
+					and details.
 confAUTH_MAX_BITS	AuthMaxBits	[INT_MAX] Limit the maximum encryption
 					strength for the security layer in
 					SMTP AUTH (SASL).  Default is
@@ -4587,4 +4583,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.691 $, Last updated $Date: 2004/07/19 17:47:34 $
+$Revision: 8.694 $, Last updated $Date: 2005/03/23 21:41:09 $
diff --git a/contrib/sendmail/cf/cf/submit.cf b/contrib/sendmail/cf/cf/submit.cf
index d5a8272e08d4..ca292e56ead0 100644
--- a/contrib/sendmail/cf/cf/submit.cf
+++ b/contrib/sendmail/cf/cf/submit.cf
@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca@wiz.smi.sendmail.com on Tue Jan 11 20:36:44 PST 2005
-##### in /extra/home/ca/sm-8.13.3/OpenSource/sendmail-8.13.3/cf/cf
+##### built by ca@wiz.smi.sendmail.com on Sun Mar 27 16:38:48 PST 2005
+##### in /extra/home/ca/sm-8.13.4/OpenSource/sendmail-8.13.4/cf/cf
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.13.3/Submit
+DZ8.13.4/Submit
 
 
 ###############
diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4
index b374e878764f..0abf7b510cc3 100644
--- a/contrib/sendmail/cf/m4/version.m4
+++ b/contrib/sendmail/cf/m4/version.m4
@@ -11,8 +11,8 @@ divert(-1)
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.127 2005/01/12 04:32:32 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.132 2005/03/25 18:44:45 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.13.3`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.13.4`'ifdef(`confCF_VERSION', `/confCF_VERSION')