diff options
Diffstat (limited to 'docs/manpages-3')
-rw-r--r-- | docs/manpages-3/editreg.1.xml | 84 | ||||
-rw-r--r-- | docs/manpages-3/findsmb.1.xml | 4 | ||||
-rw-r--r-- | docs/manpages-3/lmhosts.5.xml | 8 | ||||
-rw-r--r-- | docs/manpages-3/log2pcap.1.xml | 8 | ||||
-rw-r--r-- | docs/manpages-3/net.8.xml | 8 | ||||
-rw-r--r-- | docs/manpages-3/pdbedit.8.xml | 12 | ||||
-rw-r--r-- | docs/manpages-3/smb.conf.5.xml | 14 |
7 files changed, 27 insertions, 111 deletions
diff --git a/docs/manpages-3/editreg.1.xml b/docs/manpages-3/editreg.1.xml deleted file mode 100644 index 2b08555a4f..0000000000 --- a/docs/manpages-3/editreg.1.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc"> -<refentry id="editreg.1"> - -<refmeta> - <refentrytitle>editreg</refentrytitle> - <manvolnum>1</manvolnum> -</refmeta> - - -<refnamediv> - <refname>editreg</refname> - <refpurpose>A utility for printing and editing NT4 registry files - </refpurpose> -</refnamediv> - -<refsynopsisdiv> - <cmdsynopsis> - <command>editreg</command> - <arg choice="opt">-v</arg> - <arg choice="opt">-c file</arg> - <arg choice="req">file</arg> - </cmdsynopsis> -</refsynopsisdiv> - -<refsect1> - <title>DESCRIPTION</title> - - <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle> - <manvolnum>7</manvolnum></citerefentry> suite.</para> - - <para><command>editreg</command> is a utility that - can visualize windows registry files (currently only NT4) and apply - so-called commandfiles to them. - </para> -</refsect1> - - -<refsect1> - <title>OPTIONS</title> - - <variablelist> - <varlistentry> - <term>registry_file</term> - <listitem><para>Registry file to view or edit. </para></listitem> - </varlistentry> - - - <varlistentry> - <term>-v,--verbose</term> - <listitem><para>Increases verbosity of messages. - </para></listitem> - </varlistentry> - - <varlistentry> - <term>-c commandfile</term> - <listitem><para>Read commands to execute on <filename>registry_file</filename> from <filename>commandfile</filename>. Currently not yet supported! - </para></listitem> - </varlistentry> - - &stdarg.help; - - </variablelist> -</refsect1> - -<refsect1> - <title>VERSION</title> - - <para>This man page is correct for version 3.0 of the Samba - suite.</para> -</refsect1> - -<refsect1> - <title>AUTHOR</title> - - <para>The original Samba software and related utilities - were created by Andrew Tridgell. Samba is now developed - by the Samba Team as an Open Source project similar - to the way the Linux kernel is developed.</para> - - <para>The editreg man page was written by Jelmer Vernooij. </para> -</refsect1> - -</refentry> diff --git a/docs/manpages-3/findsmb.1.xml b/docs/manpages-3/findsmb.1.xml index ac8c8c010f..0fb4c51dee 100644 --- a/docs/manpages-3/findsmb.1.xml +++ b/docs/manpages-3/findsmb.1.xml @@ -94,7 +94,7 @@ without <constant>-r</constant> option set would yield output similar to the following</para> -<screen> +<programlisting> IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION --------------------------------------------------------------------- 192.168.35.10 MINESET-TEST1 [DMVENGR] @@ -107,7 +107,7 @@ IP ADDR NETBIOS NAME WORKGROUP/OS/VERSION 192.168.35.88 SCNT2 +[MVENGR] [Windows NT 4.0] [NT LAN Manager 4.0] 192.168.35.93 FROGSTAR-PC [MVENGR] [Windows 5.0] [Windows 2000 LAN Manager] 192.168.35.97 HERBNT1 *[HERB-NT] [Windows NT 4.0] [NT LAN Manager 4.0] -</screen> +</programlisting> </refsect1> diff --git a/docs/manpages-3/lmhosts.5.xml b/docs/manpages-3/lmhosts.5.xml index f797569102..e736a1035a 100644 --- a/docs/manpages-3/lmhosts.5.xml +++ b/docs/manpages-3/lmhosts.5.xml @@ -53,16 +53,16 @@ </listitem> </itemizedlist> - <para>An example follows:</para> - - <programlisting> + <para>An example follows: +<programlisting> # # Sample Samba lmhosts file. # 192.9.200.1 TESTPC 192.9.200.20 NTSERVER#20 192.9.200.21 SAMBASERVER - </programlisting> +</programlisting> + </para> <para>Contains three IP to NetBIOS name mappings. The first and third will be returned for any queries for the names "TESTPC" diff --git a/docs/manpages-3/log2pcap.1.xml b/docs/manpages-3/log2pcap.1.xml index 16155c4312..895c7be624 100644 --- a/docs/manpages-3/log2pcap.1.xml +++ b/docs/manpages-3/log2pcap.1.xml @@ -86,15 +86,15 @@ <para>Extract all network traffic from all samba log files:</para> - <para><screen> + <para><programlisting> <prompt>$</prompt> log2pcap < /var/log/* > trace.pcap - </screen></para> + </programlisting></para> <para>Convert to pcap using text2pcap:</para> - <para><screen> + <para><programlisting> <prompt>$</prompt> log2pcap -h samba.log | text2pcap -T 139,139 - trace.pcap - </screen></para> + </programlisting></para> </refsect1> <refsect1> diff --git a/docs/manpages-3/net.8.xml b/docs/manpages-3/net.8.xml index bcd6eb2ecc..234ca1d5c5 100644 --- a/docs/manpages-3/net.8.xml +++ b/docs/manpages-3/net.8.xml @@ -620,10 +620,10 @@ Parameters take the for "parameter=value". Common options include:</para> <para> Add a new group mapping entry: -<screen> +<programlisting> net groupmap add {rid=int|sid=string} unixgroup=string \ [type={domain|local}] [ntgroup=string] [comment=string] -</screen> +</programlisting> </para> </refsect3> @@ -643,10 +643,10 @@ net groupmap add {rid=int|sid=string} unixgroup=string \ <para>Update en existing group entry</para> <para> -<screen> +<programlisting> net groupmap modify {ntgroup=string|sid=SID} [unixgroup=string] \ [comment=string] [type={domain|local}] -</screen> +</programlisting> </para> </refsect3> diff --git a/docs/manpages-3/pdbedit.8.xml b/docs/manpages-3/pdbedit.8.xml index bb88fa891c..e26bf2777d 100644 --- a/docs/manpages-3/pdbedit.8.xml +++ b/docs/manpages-3/pdbedit.8.xml @@ -70,10 +70,10 @@ This option prints a list of user/uid pairs separated by the ':' character.</para> <para>Example: <command>pdbedit -L</command></para> - <para><screen> + <para><programlisting> sorce:500:Simo Sorce samba:45:Test User -</screen></para> +</programlisting></para> </listitem> </varlistentry> @@ -86,7 +86,7 @@ samba:45:Test User out the account fields in a descriptive format.</para> <para>Example: <command>pdbedit -L -v</command></para> - <para><screen> + <para><programlisting> --------------- username: sorce user ID/Group: 500/500 @@ -105,7 +105,7 @@ Home Directory: \\BERSERKER\samba HomeDir Drive: Logon Script: Profile Path: \\BERSERKER\profile -</screen></para> +</programlisting></para> </listitem> </varlistentry> @@ -121,14 +121,14 @@ Profile Path: \\BERSERKER\profile <manvolnum>5</manvolnum></citerefentry> for details)</para> <para>Example: <command>pdbedit -L -w</command></para> - <screen> + <programlisting> sorce:500:508818B733CE64BEAAD3B435B51404EE: D2A2418EFC466A8A0F6B1DBB5C3DB80C: [UX ]:LCT-00000000: samba:45:0F2B255F7B67A7A9AAD3B435B51404EE: BC281CE3F53B6A5146629CD4751D3490: [UX ]:LCT-3BFA1E8D: -</screen> +</programlisting> </listitem> </varlistentry> diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml index f67c1f2c09..bf8e5c7e18 100644 --- a/docs/manpages-3/smb.conf.5.xml +++ b/docs/manpages-3/smb.conf.5.xml @@ -30,9 +30,9 @@ <para> The file consists of sections and parameters. A section begins with the name of the section in square brackets and continues until the next section begins. Sections contain parameters of the form: -<screen> +<programlisting> <replaceable>name</replaceable> = <replaceable>value </replaceable> -</screen> +</programlisting> </para> <para> @@ -179,9 +179,9 @@ <para> If you decide to use a <emphasis>path =</emphasis> line in your [homes] section, it may be useful to use the %S macro. For example: -<screen> +<programlisting> <userinput moreinfo="none">path = /data/pchome/%S</userinput> -</screen> +</programlisting> is useful if you have different home directories for your PCs than for UNIX access. </para> @@ -273,10 +273,10 @@ All aliases given for a printer in the printcap file are legitimate printer names as far as the server is concerned. If your printing subsystem doesn't work like that, you will have to set up a pseudo-printcap. This is a file consisting of one or more lines like this: -<screen> +<programlisting> alias|alias|alias|alias... -</screen> -</para> +</programlisting> + </para> <para> Each alias should be an acceptable printer name for your printing subsystem. In the [global] section, |