summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/docbook/global.ent16
-rw-r--r--docs/docbook/manpages/pdbedit.8.sgml7
-rw-r--r--docs/docbook/manpages/rpcclient.1.sgml23
-rw-r--r--docs/docbook/manpages/vfstest.1.sgml21
-rw-r--r--docs/docbook/projdoc/upgrading-to-3.0.sgml19
5 files changed, 50 insertions, 36 deletions
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index d88c489a4a..604dec7e18 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -31,3 +31,19 @@
<!-- Misc -->
<!ENTITY samba.pub.cvshost 'pserver.samba.org'>
+<!ENTITY stdarg.debuglevel '
+<varlistentry>
+<term>-d|--debug=debuglevel</term>
+<listitem><para>set the debuglevel. Debug level 0 is the lowest
+and 100 being the highest. This should be set to 100 if you are
+planning on submitting a bug report to the Samba team (see
+<filename>BUGS.txt</filename>).
+</para></listitem>
+</varlistentry>'>
+
+<!ENTITY stdarg.help '
+<varlistentry>
+<term>-h|--help</term>
+<listitem><para>Print a summary of command line options.
+</para></listitem>
+</varlistentry>'>
diff --git a/docs/docbook/manpages/pdbedit.8.sgml b/docs/docbook/manpages/pdbedit.8.sgml
index fd8ce375e5..e918870ac1 100644
--- a/docs/docbook/manpages/pdbedit.8.sgml
+++ b/docs/docbook/manpages/pdbedit.8.sgml
@@ -21,8 +21,8 @@
<arg choice="opt">-u username</arg>
<arg choice="opt">-f fullname</arg>
<arg choice="opt">-h homedir</arg>
- <arg choice="opt">-d drive</arg>
- <arg choice="opt">-s script</arg>
+ <arg choice="opt">-D drive</arg>
+ <arg choice="opt">-S script</arg>
<arg choice="opt">-p profile</arg>
<arg choice="opt">-a</arg>
<arg choice="opt">-m</arg>
@@ -30,7 +30,8 @@
<arg choice="opt">-i passdb-backend</arg>
<arg choice="opt">-e passdb-backend</arg>
<arg choice="opt">-b passdb-backend</arg>
- <arg choice="opt">-D debuglevel</arg>
+ <arg choice="opt">-d debuglevel</arg>
+ <arg choice="opt">-s configfile</arg>
<arg choice="opt">-P account-policy</arg>
<arg choice="opt">-V value</arg>
</cmdsynopsis>
diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml
index 7a7a19c837..10e0ff438d 100644
--- a/docs/docbook/manpages/rpcclient.1.sgml
+++ b/docs/docbook/manpages/rpcclient.1.sgml
@@ -1,4 +1,6 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+]>
<refentry id="rpcclient">
<refmeta>
@@ -87,23 +89,8 @@
- <varlistentry>
- <term>-d|--debug=debuglevel</term>
- <listitem><para>set the debuglevel. Debug level 0 is the lowest
- and 100 being the highest. This should be set to 100 if you are
- planning on submitting a bug report to the Samba team (see <filename>BUGS.txt</filename>).
- </para></listitem>
- </varlistentry>
-
-
-
-
- <varlistentry>
- <term>-h|--help</term>
- <listitem><para>Print a summary of command line options.
- </para></listitem>
- </varlistentry>
-
+ &stdarg.debuglevel;
+ &stdarg.help;
<varlistentry>
<term>-I IP-address</term>
diff --git a/docs/docbook/manpages/vfstest.1.sgml b/docs/docbook/manpages/vfstest.1.sgml
index 9a7eff1939..f8fa7298b8 100644
--- a/docs/docbook/manpages/vfstest.1.sgml
+++ b/docs/docbook/manpages/vfstest.1.sgml
@@ -1,4 +1,7 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY % globalentities SYSTEM '../global.ent'> %globalentities;
+]>
+
<refentry id="vfstest">
<refmeta>
@@ -48,20 +51,8 @@
</para> </listitem>
</varlistentry>
- <varlistentry>
- <term>-d|--debug=debuglevel</term>
- <listitem><para>set the debuglevel. Debug level 0 is the lowest
- and 100 being the highest. This should be set to 100 if you are
- planning on submitting a bug report to the Samba team (see
- <filename>BUGS.txt</filename>).
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-h|--help</term>
- <listitem><para>Print a summary of command line options.
- </para></listitem>
- </varlistentry>
+ &stdarg.debuglevel;
+ &stdarg.help;
<varlistentry>
<term>-l|--logfile=logbasename</term>
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.sgml
new file mode 100644
index 0000000000..5b6b8dd635
--- /dev/null
+++ b/docs/docbook/projdoc/upgrading-to-3.0.sgml
@@ -0,0 +1,19 @@
+<chapter id="upgrading-to-3.0">
+<chapterinfo>
+ <author>
+ <firstname>Jelmer</firstname><surname>Vernooij</surname>
+ <affiliation>Samba Team</affiliation>
+ </author>
+ <pubdate>25 October 2002</pubdate>
+</chapterinfo>
+
+<title>Issues when upgrading from 2.2 to 3.0</title>
+
+<sect1>
+<title>Charsets</title>
+
+FIXME
+
+</sect1>
+
+</chapter>