diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /docs-xml | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/manpages-3/eventlogadm.8.xml | 30 | ||||
| -rw-r--r-- | docs-xml/manpages-3/mount.cifs.8.xml | 11 |
2 files changed, 35 insertions, 6 deletions
diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml index 04ba022032..fa514de026 100644 --- a/docs-xml/manpages-3/eventlogadm.8.xml +++ b/docs-xml/manpages-3/eventlogadm.8.xml @@ -40,6 +40,18 @@ </arg> </cmdsynopsis> + <cmdsynopsis> + <command>eventlogadm</command> + <arg><option>-d</option></arg> + <arg><option>-h</option></arg> + <arg choice="plain"><option>-o</option> + <literal>dump</literal> + <replaceable>EVENTLOG</replaceable> + <replaceable>RECORD_NUMBER</replaceable> + </arg> + + </cmdsynopsis> + </refsynopsisdiv> <refsect1> @@ -91,12 +103,26 @@ </term> <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> </varlistentry> <varlistentry> + <term> + <option>-o</option> + <literal>write</literal> + <replaceable>EVENTLOG</replaceable> + <replaceable>RECORD_NUMBER</replaceable> + </term> + <listitem><para> + The <command>-o dump</command> reads event log + records from a EVENTLOG tdb and dumps them to standard + output on screen. + </para> </listitem> + </varlistentry> + + <varlistentry> <term><option>-h</option></term> <listitem><para> Print usage information. @@ -180,7 +206,7 @@ </para></listitem> <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. </para></listitem> diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index 54fbc139b4..00711e0de0 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -43,10 +43,13 @@ by the popular Open Source server Samba. </para> <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> <para> |