[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  4b25860 docs: Avoid mentioning a possibly misleading option.
      from  a46a6be tevent: Fix Coverity ID 989236 Operands don't affect result

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 4b258609cd4c47d164f73b4f8dc93e466e5ee1c3
Author: Michael Wood <esiotrot at gmail.com>
Date:   Sat Jun 1 10:35:56 2013 +0200

    docs: Avoid mentioning a possibly misleading option.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 5528551ea39686194837a8083c85b71dedbe6f0e)
    
    Fix bug #9964 - For v4-0-test: docs: Avoid mentioning a possibly misleading
    option.
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Fri Jun 21 11:41:46 CEST 2013 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/domain/allowdnsupdates.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/domain/allowdnsupdates.xml b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
index fc7d3e8..1563d29 100644
--- a/docs-xml/smbdotconf/domain/allowdnsupdates.xml
+++ b/docs-xml/smbdotconf/domain/allowdnsupdates.xml
@@ -8,8 +8,8 @@
 
 	<para>DNS updates can either be disallowed completely by setting it to
 		<constant>disabled</constant>, enabled over secure connections only by
-		setting it to <constant>secure</constant> or allowed in all cases
-		by setting it to <constant>enabled</constant> or <constant>nonsecure</constant>.
+		setting it to <constant>secure only</constant> or allowed in all cases
+		by setting it to <constant>nonsecure</constant>.
 	</para>
 </description>
 


-- 
Samba Shared Repository