Changeset 480 for trunk/server/docs-xml

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• docs-xml/manpages-3/idmap_ad.8.xml (modified) (1 diff)
• docs-xml/manpages-3/net.8.xml (modified) (1 diff)
• docs-xml/manpages-3/ntlm_auth.1.xml (modified) (1 diff)
• docs-xml/manpages-3/winbindd.8.xml (modified) (2 diffs)
• docs-xml/smbdotconf/winbind/winbindnssinfo.xml (modified) (3 diffs)

trunk/server/docs-xml/manpages-3/idmap_ad.8.xml

@@ -59 +59 @@
         <para>
         The following example shows how to retrieve idmappings from our principal and
-        and trusted AD domains. If trusted domains are present id conflicts must be
+        trusted AD domains. If trusted domains are present id conflicts must be
         resolved beforehand, there is no
         guarantee on the order conflicting mappings would be resolved at this point.

trunk/server/docs-xml/manpages-3/net.8.xml

@@ -1791 +1791 @@
 
 <refsect2>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <title>HELP [COMMAND]</title>
 

trunk/server/docs-xml/manpages-3/ntlm_auth.1.xml

@@ -172 +172 @@
 
                   <varlistentry>
-                  <term>Username</term>
+                  <term></term>
                 <listitem><para>The user's domain, expected to be in
                 Samba's <smbconfoption name="unix charset"/>.
                 </para>
 
-                      <para><example>Domain: WORKGROUP</example></para>
-                      <para><example>Domain:: V09SS0dST1VQ</example></para>
+                      <para><example>Domain: WORKGROUP</example></para>
+                      <para><example>Domain:: V09SS0dST1VQ</example></para>
                     </listitem></varlistentry>
 

trunk/server/docs-xml/manpages-3/winbindd.8.xml

@@ -81 +81 @@
         <variablelist>
                 <varlistentry>
-                <term>-D</term>
-                <listitem><para>If specified, this parameter causes
-                the server to operate as a daemon. That is, it detaches
-                itself and runs in the background on the appropriate port. 
-                This switch is assumed if <command>winbindd</command> is 
-                executed on the command line of a shell.
-                </para></listitem>
-                </varlistentry>
-
-                <varlistentry>
                 <term>hosts</term>
                 <listitem><para>This feature is only available on IRIX.
@@ -147 +137 @@
 
         <variablelist>
+
+
+
+
+
+
+
+
+
+
                 <varlistentry>
                 <term>-F</term>

trunk/server/docs-xml/smbdotconf/winbind/winbindnssinfo.xml

@@ -7 +7 @@
 
         <para>This parameter is designed to control how Winbind retrieves Name
-        Service Information to construct a user's home directory and login shell. 
-        Currently the following settings are available: 
+        Service Information to construct a user's home directory and login shell.
+        Currently the following settings are available:
 
         <itemizedlist>
                 <listitem>
-                        <para><parameter moreinfo="none">template</parameter> 
-                        - The default, using the parameters of <parameter moreinfo="none">template 
+                        <para><parameter moreinfo="none">template</parameter>
+                        - The default, using the parameters of <parameter moreinfo="none">template
                         shell</parameter> and <parameter moreinfo="none">template homedir</parameter>)
                         </para>
                 </listitem>
-                        
+
                 <listitem>
                         <para><parameter moreinfo="none">&lt;sfu | rfc2307 &gt;</parameter>
@@ -24 +24 @@
                         LDAP schema, winbind can retrieve the login shell and the home
                         directory attributes directly from your Directory Server. Note that
-                        retrieving UID and GID from your ADS-Server requires to 
-                        use <parameter moreinfo="non">idmap backend</parameter> = ad 
-                        or <parameter moreinfo="non">idmap config DOMAIN:backend</parameter> = ad 
+                        retrieving UID and GID from your ADS-Server requires to
+                        use <parameter moreinfo="none">idmap config DOMAIN:backend</parameter> = ad
                         as well.
                         </para>
                 </listitem>
-                        
         </itemizedlist>
 
@@ -37 +35 @@
 
 <value type="default">template</value>
-<value type="example">template sfu</value>
+<value type="example">sfu</value>
 </samba:parameter>