Changeset 232 for branches/samba-3.2.x/docs-xml/manpages-3

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/docs-xml/manpages-3

Files:

• eventlogadm.8.xml (modified) (2 diffs)
• idmap_ad.8.xml (modified) (3 diffs)
• libsmbclient.7.xml (modified) (1 diff)
• mount.cifs.8.xml (modified) (4 diffs)
• smbclient.1.xml (modified) (7 diffs)
• vfs_recycle.8.xml (modified) (1 diff)

branches/samba-3.2.x/docs-xml/manpages-3/eventlogadm.8.xml

@@ -92 +92 @@
                 <listitem><para>
                 The <command>-o write</command> reads event log
-                records from standard input and writes them to theSamba
+                records from standard input and writes them to the Samba
                 event log store named by EVENTLOG.
                 </para> </listitem>
@@ -181 +181 @@
 
                 <listitem><para>
-                <command>SRN</command> - he name of the machine on
+                <command>SRN</command> - The name of the machine on
                 which the eventlog was generated. This is typically the
                 host name.

branches/samba-3.2.x/docs-xml/manpages-3/idmap_ad.8.xml

@@ -24 +24 @@
         API, and is READONLY. Mappings must be provided in advance
         by the administrator by adding the posixAccount/posixGroup
-        classess and relative attribute/value pairs to the users and
-        groups objects in AD</para>
+        classes and relative attribute/value pairs to the user and
+        group objects in the AD.</para>
 </refsynopsisdiv>
 
@@ -35 +35 @@
                 <term>range = low - high</term>
                 <listitem><para>
-                        Defines the available matching uid and gid range for which the
+                        Defines the available matching UID and GID range for which the
                         backend is authoritative. Note that the range acts as a filter.
                         If specified any UID or GID stored in AD that fall outside the
@@ -48 +48 @@
                         Defines the schema that idmap_ad should use when querying
                         Active Directory regarding user and group information.
-                        This can either the RFC2307 schema support included
+                        This can be either the RFC2307 schema support included
                         in Windows 2003 R2 or the Service for Unix (SFU) schema.
                 </para></listitem>

branches/samba-3.2.x/docs-xml/manpages-3/libsmbclient.7.xml

@@ -19 +19 @@
 <refsynopsisdiv>
         <cmdsynopsis>
-                <command>Browser URL:</command>
         <para>
-        smb://[[[domain:]user[:password@]]server[/share[/path[/file]]]] [?options]
-    </para>
+        Browser URL:
+        <command moreinfo="none">smb://[[[domain:]user[:password@]]server[/share[/path[/file]]]] [?options]
+        </command>
+        </para>
         </cmdsynopsis>
 </refsynopsisdiv>

branches/samba-3.2.x/docs-xml/manpages-3/mount.cifs.8.xml

@@ -44 +44 @@
 
         <para>
-        The mount.cifs utility attaches the UNC name (exported network resource) to
-        the local directory <emphasis>mount-point</emphasis>. It is possible to set the mode for mount.cifs to 
-setuid root to allow non-root users to mount shares to directories for which they
-have write permission.
+        The mount.cifs utility attaches the UNC name (exported network resource)
+        specified as <emphasis>service</emphasis> (using //server/share syntax,
+        where "server" is the server name or IP address and "share" is the name
+        of the share) to the local directory <emphasis>mount-point</emphasis>.
+        It is possible to set the mode for mount.cifs to setuid root to allow
+        non-root users to mount shares to directories for which they
+        have write permission.
         </para>
 
@@ -90 +93 @@
                 <listitem><para>specifies the CIFS password. If this
 option is not given then the environment variable
-<emphasis>PASSWD</emphasis> is used. If the password is not specified 
+<emphasis>PASSWD</emphasis> is used. If the password is not specified
 directly or indirectly via an argument to mount, <emphasis>mount.cifs</emphasis> will prompt
 for a password, unless the guest option is specified.
@@ -107 +110 @@
                 <listitem><para>
                                 specifies a file that contains a username
-                                and/or password. The format of the file is:
+                                and/or password and optionally the name of the
+                                workgroup. The format of the file is:
                         </para>
 
@@ -113 +117 @@
                 username=<replaceable>value</replaceable>
                 password=<replaceable>value</replaceable>
+                workgroup=<replaceable>value</replaceable>
 </programlisting>
-                
+
                 <para>
 This is preferred over having passwords in plaintext in a

branches/samba-3.2.x/docs-xml/manpages-3/smbclient.1.xml

@@ -14 +14 @@
 <refnamediv>
         <refname>smbclient</refname>
-        <refpurpose>ftp-like client to access SMB/CIFS resources 
+        <refpurpose>ftp-like client to access SMB/CIFS resources
         on servers</refpurpose>
 </refnamediv>
@@ -31 +31 @@
                 <arg choice="opt">-A authfile</arg>
                 <arg choice="opt">-N</arg>
+                <arg choice="opt">-g</arg>
                 <arg choice="opt">-i scope</arg>
                 <arg choice="opt">-O &lt;socket options&gt;</arg>
@@ -40 +41 @@
                 <arg choice="opt">-c &lt;command&gt;</arg>
         </cmdsynopsis>
-                
+
         <cmdsynopsis>
                 <command>smbclient</command>
@@ -55 +56 @@
                 <arg choice="opt">-A authfile</arg>
                 <arg choice="opt">-N</arg>
+                <arg choice="opt">-g</arg>
                 <arg choice="opt">-l log-basename</arg>
                 <arg choice="opt">-I destinationIP</arg>
@@ -234 +236 @@
                 messages. </para></listitem>
                 </varlistentry>
-                
+
                 <varlistentry>
                 <term>-p port</term>
@@ -242 +244 @@
                 default. </para></listitem>
                 </varlistentry>
-                
+
+                <varlistentry>
+                <term>-g</term>
+                <listitem><para>This parameter provides combined with
+                <parameter>-L</parameter> easy parseable output that allows processing
+                with utilities such as grep and cut.
+                </para></listitem>
+                </varlistentry>
+
                 <varlistentry>
                 <term>-P</term>
@@ -249 +259 @@
                 </para></listitem>
                 </varlistentry>
-                
+
                 &stdarg.help;
-                
+
                 <varlistentry>
                 <term>-I IP-address</term>
-                <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. 
+                <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
                 It should be specified in standard "a.b.c.d" notation. </para>
 

branches/samba-3.2.x/docs-xml/manpages-3/vfs_recycle.8.xml

@@ -186 +186 @@
         <title>EXAMPLES</title>
 
-        <para>Log operations on all shares using the LOCAL1 facility
-        and NOTICE priority:</para>
+        <para>Move files "deleted" on <parameter>share</parameter> to
+        <parameter>/data/share/.recycle</parameter> instead of deleting them:
+        </para>
 
 <programlisting>
-        <smbconfsection name="[global]"/>
+        <smbconfsection name="[share]"/>
+        <smbconfoption name="path">/data/share</smbconfoption>
         <smbconfoption name="vfs objects">recycle</smbconfoption>
-        <smbconfoption name="recycle:facility">LOCAL1</smbconfoption>
-        <smbconfoption name="recycle:priority">NOTICE</smbconfoption>
+        <smbconfoption name="recycle:repository">.recycle</smbconfoption>
+        <smbconfoption name="recycle:keeptree">yes</smbconfoption>
+        <smbconfoption name="recycle:versions">yes</smbconfoption>
 </programlisting>