summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Makefile5
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-AccessControls.xml6
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml2
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml114
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-Compiling.xml2
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml12
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-DomainMember.xml3
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-FastStart.xml7
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml18
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml6
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml2
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml6
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-PAM.xml31
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-PDC.xml6
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-Passdb.xml18
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-Problems.xml4
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-SWAT.xml2
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-Winbind.xml17
-rw-r--r--docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml50
-rw-r--r--docs/Samba3-HOWTO/manpages.xml2
-rw-r--r--docs/xslt/expand-sambadoc.xsl146
-rw-r--r--docs/xslt/extract-smbfiles.xsl41
-rw-r--r--docs/xslt/sambadoc2pearson.xsl4
23 files changed, 190 insertions, 314 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 65d05a203d..b320920d5a 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -38,7 +38,6 @@ help:
@echo " htmlman3,htmlman4 - Build HTML version of manpages"
@echo " undocumented - Output list of undocumented smb.conf options"
@echo " samples - Extract examples"
- @echo " files - Extract other files"
$(DOCBOOKDIR)/Samba3-ByExample.xml: $(filter-out Samba3-ByExample/index.xml,$(wildcard Samba3-ByExample/*.xml))
$(DOCBOOKDIR)/Samba3-HOWTO.xml: $(filter-out Samba3-HOWTO/index.xml,$(wildcard Samba3-HOWTO/*.xml)) Samba3-HOWTO-attributions.xml
@@ -278,10 +277,6 @@ undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl sc
@$(PERL) scripts/find_missing_doc.pl $(SRCDIR)
@$(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
-# Examples and the like
-files: Samba3-HOWTO/index.xml xslt/extract-smbfiles.xsl
- $(XSLTPROC) xslt/extract-smbfiles.xsl $< > /dev/null
-
samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
mkdir -p $(EXAMPLESDIR)
$(XSLTPROC) --xinclude xslt/extract-examples.xsl $< > /dev/null 2> examples/README
diff --git a/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml
index f074d2c140..973f390238 100644
--- a/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-AccessControls.xml
@@ -352,8 +352,10 @@ drwsrwsrwx 2 maryo gnomes 48 2003-05-12 22:29 muchado08
An overview of the permissions field can be found in <link linkend="access1">Overview of UNIX permissions field</link>.
</para>
- <image id="access1"><imagedescription>Overview of UNIX permissions field.</imagedescription>
- <imagefile scale="40">access1</imagefile></image>
+ <figure id="access1">
+ <title>Overview of UNIX permissions field.</title>
+ <imagefile scale="40">access1</imagefile>
+ </figure>
<para>
Any bit flag may be unset. An unset bit flag is the equivalent of <quote>cannot</quote> and is represented
diff --git a/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml b/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
index 66b4c27406..b07e13ab73 100644
--- a/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-AdvancedNetworkAdmin.xml
@@ -244,7 +244,6 @@ The following listings are from the genlogon directory.
<indexterm><primary>genlogon.pl</primary></indexterm>
This is the <filename>genlogon.pl</filename> file:
-<smbfile name="genlogon.pl">
<programlisting>
#!/usr/bin/perl
#
@@ -319,7 +318,6 @@ This is the <filename>genlogon.pl</filename> file:
# All done! Close the output file.
close LOGON;
</programlisting>
-</smbfile>
</para>
<para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
index aac9bc4999..cd96ba60ab 100644
--- a/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-CUPS-printing.xml
@@ -639,10 +639,10 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
<para>
- <image>
- <imagedescription>Windows printing to a local printer.</imagedescription>
+ <figure>
+ <title>Windows printing to a local printer.</title>
<imagefile>1small</imagefile>
- </image>
+ </figure>
</para>
</sect2>
@@ -735,10 +735,10 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
</note>
<para>
- <image>
- <imagedescription>Printing to a PostScript printer.</imagedescription>
+ <figure>
+ <title>Printing to a PostScript printer.</title>
<imagefile>2small</imagefile>
- </image>
+ </figure>
</para>
@@ -770,9 +770,10 @@ libcups.so.2 =&gt; /usr/lib/libcups.so.2 (0x40123000)
</para>
<para>
- <image><imagedescription>Ghostscript as a RIP for non-postscript printers.</imagedescription>
- <imagefile>3small</imagefile>
- </image>
+ <figure>
+ <title>Ghostscript as a RIP for non-postscript printers.</title>
+ <imagefile>3small</imagefile>
+ </figure>
</para>
<tip><para>
@@ -1177,10 +1178,10 @@ print options already embedded into the file.
</para>
<para>
- <image>
- <imagedescription>Pre-filtering in CUPS to form PostScript.</imagedescription>
+ <figure>
+ <title>Pre-filtering in CUPS to form PostScript.</title>
<imagefile scale="25">4small</imagefile>
- </image>
+ </figure>
</para>
</sect2>
@@ -1197,9 +1198,10 @@ stapling and punching it, and so on) into the PostScript file.
</para>
<para>
- <image><imagedescription>Adding device-specific print options.</imagedescription>
+ <figure>
+ <title>Adding device-specific print options.</title>
<imagefile scale="25">5small</imagefile>
- </image>
+ </figure>
</para>
<para>
@@ -1238,10 +1240,10 @@ that are able to generate device-specific printer data.
</para>
<para>
- <image>
- <imagedescription>PostScript to intermediate raster format.</imagedescription>
+ <figure>
+ <title>PostScript to intermediate raster format.</title>
<imagefile scale="25">6small</imagefile>
- </image>
+ </figure>
</para>
<para>
@@ -1258,10 +1260,10 @@ than one vendor financing the development of CUPS raster drivers).
</para>
<para>
- <image>
- <imagedescription>CUPS-raster production using Ghostscript.</imagedescription>
+ <figure>
+ <title>CUPS-raster production using Ghostscript.</title>
<imagefile>7small</imagefile>
- </image>
+ </figure>
</para>
<para>
@@ -1295,10 +1297,10 @@ filtering on <link linkend="small8">next picture</link>.
</para>
<para>
- <image id="small8">
- <imagedescription>Image format to CUPS-raster format conversion.</imagedescription>
+ <figure id="small8">
+ <title>Image format to CUPS-raster format conversion.</title>
<imagefile>8small</imagefile>
- </image>
+ </figure>
</para>
</sect2>
@@ -1321,10 +1323,10 @@ closely as possible with CUPS.
</para>
<para>
- <image id="small9">
- <imagedescription>Raster to printer-specific formats.</imagedescription>
+ <figure id="small9">
+ <title>Raster to printer-specific formats.</title>
<imagefile>9small</imagefile>
- </image>
+ </figure>
</para>
</sect2>
@@ -1788,10 +1790,10 @@ advantages) than other methods.
</para>
<para>
- <image id="cupsomatic-dia">
- <imagedescription>cupsomatic/foomatic Processing versus Native CUPS.</imagedescription>
+ <figure id="cupsomatic-dia">
+ <title>cupsomatic/foomatic Processing versus Native CUPS.</title>
<imagefile>10small</imagefile>
- </image>
+ </figure>
</para>
<para>
@@ -1880,10 +1882,10 @@ backend, which transfers the job to the printers.</para></listitem>
<para>
The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket">PDF to socket chain</link>.
- <image id="pdftosocket">
- <imagedescription>PDF to socket chain.</imagedescription>
+ <figure id="pdftosocket">
+ <title>PDF to socket chain.</title>
<imagefile>pdftosocket</imagefile>
- </image>
+ </figure>
</para>
@@ -1934,10 +1936,10 @@ which transfers the job to the printers.</para></listitem>
The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb">this figure</link>.
</para>
-<image id="pdftoepsonusb">
- <imagedescription>PDF to USB chain.</imagedescription>
+<figure id="pdftoepsonusb">
+ <title>PDF to USB chain.</title>
<imagefile>pdftoepsonusb</imagefile>
-</image>
+</figure>
</sect2>
<sect2>
@@ -2080,10 +2082,10 @@ clients.
</para>
<para>
- <image id="small11">
- <imagedescription>Print driver execution on the client.</imagedescription>
+ <figure id="small11">
+ <title>Print driver execution on the client.</title>
<imagefile>11small</imagefile>
- </image>
+ </figure>
</para>
</sect2>
@@ -2107,10 +2109,10 @@ understand.
</para>
<para>
- <image id="small12">
- <imagedescription>Print driver execution on the server.</imagedescription>
+ <figure id="small12">
+ <title>Print driver execution on the server.</title>
<imagefile>12small</imagefile>
- </image>
+ </figure>
</para>
<para>
@@ -2180,10 +2182,10 @@ simply use <smbconfoption name="printing">sysv</smbconfoption>).
</para>
<para>
- <image>
- <imagedescription>Printing via CUPS/Samba server.</imagedescription>
+ <figure>
+ <title>Printing via CUPS/Samba server.</title>
<imagefile>13small</imagefile>
- </image>
+ </figure>
</para>
</sect2>
@@ -3107,9 +3109,9 @@ not intended to, and does not work with, raw queues!
</para>
<para>
- <image id="small14">
- <imagedescription>cupsaddsmb flowchart.</imagedescription>
- <imagefile>14small</imagefile></image>
+ <figure id="small14">
+ <title>cupsaddsmb flowchart.</title>
+ <imagefile>14small</imagefile></figure>
</para>
</sect2>
@@ -5131,15 +5133,15 @@ feature of CUPS and you do not necessarily need to have smbd running.
The following diagrams reveal how CUPS handles print jobs.
</para>
-<image id="cups1">
- <imagedescription>Filtering chain 1.</imagedescription>
+<figure id="cups1">
+ <title>Filtering chain 1.</title>
<imagefile>cups1</imagefile>
-</image>
+</figure>
-<image id="cups2">
- <imagedescription>Filtering chain with cupsomatic</imagedescription>
+<figure id="cups2">
+ <title>Filtering chain with cupsomatic</title>
<imagefile>cups2</imagefile>
-</image>
+</figure>
</sect1>
@@ -5482,10 +5484,10 @@ files from the Adobe Web site.</para></sect2>
<para>A complete overview of the CUPS printing processes can be found in <link linkend="a_small">the next flowchart</link>.</para>
-<image id="a_small">
- <imagedescription>CUPS printing overview.</imagedescription>
+<figure id="a_small">
+ <title>CUPS printing overview.</title>
<imagefile>a_small</imagefile>
-</image>
+</figure>
</sect1>
</chapter>
diff --git a/docs/Samba3-HOWTO/TOSHARG-Compiling.xml b/docs/Samba3-HOWTO/TOSHARG-Compiling.xml
index 4473e60fbf..ac4c55ddb0 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Compiling.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Compiling.xml
@@ -495,14 +495,12 @@ netbios-ns dgram udp wait root /usr/local/samba/bin/nmbd nmbd
like this one, perhaps calling it <filename>startsmb</filename>.
</para>
-<smbfile name="startsmb.sh">
<para><programlisting>
#!/bin/sh
/usr/local/samba/bin/smbd -D
/usr/local/samba/bin/winbindd
/usr/local/samba/bin/nmbd -D
</programlisting></para>
-</smbfile>
<para>
Make it executable with <command>chmod +x startsmb</command>
diff --git a/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
index d693c7edf6..6a1318bb5e 100644
--- a/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-DNS-DHCP-Configuration.xml
@@ -122,7 +122,6 @@ a simple DHCP server that matches the DNS configuration.
determines the location of all further configuration files used.
The location and name of this file is specified in the start-up script
that is part of the operating system.
- <smbfile name="named.conf">
<programlisting>
# Quenya.Org configuration file
@@ -197,13 +196,11 @@ zone "1.168.192.in-addr.arpa" {
};
};
</programlisting>
-</smbfile>
</para>
<para>
The following files are all located in the directory <filename>/var/named</filename>.
This is the <filename>/var/named/localhost.zone</filename> file:
- <smbfile name="localhost.zone">
<programlisting>
$TTL 1W
@ IN SOA @ root (
@@ -216,12 +213,10 @@ $TTL 1W
IN NS @
IN A 127.0.0.1
</programlisting>
-</smbfile>
</para>
<para>
The <filename>/var/named/127.0.0.zone</filename> file:
- <smbfile name="127.0.0.0.zone">
<programlisting>
$TTL 1W
@ IN SOA localhost. root.localhost. (
@@ -234,12 +229,10 @@ $TTL 1W
IN NS localhost.
1 IN PTR localhost.
</programlisting>
-</smbfile>
</para>
<para>
The <filename>/var/named/quenya.org.host</filename> file:
- <smbfile name="quenya.org.host">
<programlisting>
$ORIGIN .
$TTL 38400 ; 10 hours 40 minutes
@@ -259,12 +252,10 @@ marvel A 192.168.1.2
mail CNAME marvel
www CNAME marvel
</programlisting>
-</smbfile>
</para>
<para>
The <filename>/var/named/192.168.1.0.rev</filename> file:
- <smbfile name="192.168.1.0.rev">
<programlisting>
$ORIGIN .
$TTL 38400 ; 10 hours 40 minutes
@@ -280,7 +271,6 @@ $ORIGIN 1.168.192.in-addr.arpa.
1 PTR frodo.quenya.org.
2 PTR marvel.quenya.org.
</programlisting>
-</smbfile>
</para>
<para>
@@ -302,7 +292,6 @@ $ORIGIN 1.168.192.in-addr.arpa.
</para>
<para>
- <smbfile name="dhcpd.conf">
<programlisting>
ddns-updates on;
ddns-domainname "quenya.org";
@@ -325,7 +314,6 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
allow unknown-clients;
}
</programlisting>
-</smbfile>
</para>
<para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml b/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml
index 0c7689c32f..0afacff24f 100644
--- a/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-DomainMember.xml
@@ -781,7 +781,6 @@ When manually configuring <filename>krb5.conf</filename>, the minimal configurat
</para>
<para>
- <smbfile name="krb5.conf">
<programlisting>
[libdefaults]
default_realm = YOUR.KERBEROS.REALM
@@ -793,7 +792,7 @@ When manually configuring <filename>krb5.conf</filename>, the minimal configurat
[domain_realms]
.kerberos.server = YOUR.KERBEROS.REALM
-</programlisting></smbfile></para>
+</programlisting></para>
<para>
When using Heimdal versions before 0.6 use the following configuration settings:
diff --git a/docs/Samba3-HOWTO/TOSHARG-FastStart.xml b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml
index 4469bc88ef..5395f69070 100644
--- a/docs/Samba3-HOWTO/TOSHARG-FastStart.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-FastStart.xml
@@ -991,7 +991,6 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false
Assign each of the UNIX groups to NT groups:
(It may be useful to copy this text to a shell script called
<filename>initGroups.sh</filename>.)
- <smbfile name="initGroups.sh">
<title>Shell script for initializing group mappings</title>
<programlisting>
#!/bin/bash
@@ -1007,7 +1006,6 @@ net groupmap add ntgroup="Designers" unixgroup=designers type=d
net groupmap add ntgroup="Engineers" unixgroup=engineers type=d
net groupmap add ntgroup="QA Team" unixgroup=qateam type=d
</programlisting>
-</smbfile>
</para></step>
<step><para>
@@ -1067,7 +1065,7 @@ net groupmap add ntgroup="QA Team" unixgroup=qateam type=d
Set up the LDAP server. This example is suitable for OpenLDAP 2.1.x.
The <filename>/etc/openldap/slapd.conf</filename> file:
<indexterm><primary>/etc/openldap/slapd.conf</primary></indexterm>
-<smbfile name="slapd.conf"><title>Example slapd.conf file</title>
+<title>Example slapd.conf file</title>
<programlisting>
# Note commented out lines have been removed
include /etc/openldap/schema/core.schema
@@ -1100,13 +1098,11 @@ index sambaPrimaryGroupSID eq
index sambaDomainName eq
index default sub
</programlisting>
-</smbfile>
</para></step>
<step><para>
Create the following file <filename>samba-ldap-init.ldif</filename>:
<indexterm><primary>samba-ldap-init.ldif</primary></indexterm>
- <smbfile name="samba-ldap-init.ldif">
<programlisting>
# Organization for SambaXP Demo
dn: dc=quenya,dc=org
@@ -1137,7 +1133,6 @@ objectclass: simpleSecurityObject
userPassword: {SSHA}0jBHgQ1vp4EDX2rEMMfIudvRMJoGwjVb
# The password for above is 'mordonL8'
</programlisting>
-</smbfile>
</para></step>
<step><para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
index 4a1664b1f6..b0e1a8cf48 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
@@ -56,15 +56,15 @@
parameters in the &smb.conf; file.
</para>
- <image id="idmap-sid2gid">
- <imagedescription>IDMAP: group SID to GID resolution.</imagedescription>
+ <figure id="idmap-sid2gid">
+ <title>IDMAP: group SID to GID resolution.</title>
<imagefile scale="50">idmap-sid2gid</imagefile>
- </image>
+ </figure>
- <image id="idmap-gid2sid">
- <imagedescription>IDMAP: GID resolution to matching SID.</imagedescription>
+ <figure id="idmap-gid2sid">
+ <title>IDMAP: GID resolution to matching SID.</title>
<imagefile scale="50">idmap-gid2sid</imagefile>
- </image>
+ </figure>
<para>
<indexterm><primary>IDMAP</primary></indexterm>
@@ -75,10 +75,10 @@
used to establish UNIX group to NT SID mappings as shown in <link linkend="idmap-store-gid2sid">IDMAP: storing group mappings</link>.
</para>
- <image id="idmap-store-gid2sid">
- <imagedescription>IDMAP storing group mappings.</imagedescription>
+ <figure id="idmap-store-gid2sid">
+ <title>IDMAP storing group mappings.</title>
<imagefile scale="50">idmap-store-gid2sid</imagefile>
- </image>
+ </figure>
<para>
<indexterm><primary>groupadd</primary></indexterm>
diff --git a/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml b/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
index 18f0d28454..9a574c2639 100644
--- a/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
@@ -171,10 +171,10 @@ Where a one-way trust has been established between two MS Windows NT4 domains (l
DomA and DomB), the following facilities are created:
</para>
-<image id="trusts1">
- <imagedescription>Trusts overview.</imagedescription>
+<figure id="trusts1">
+ <title>Trusts overview.</title>
<imagefile>trusts1</imagefile>
-</image>
+</figure>
<itemizedlist>
<listitem><para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml b/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml
index 4f65b8c0a7..e6c68bb5ff 100644
--- a/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-NT4Migration.xml
@@ -261,7 +261,6 @@ to function as a BDC, i.e., <parameter>domain master = No</parameter>.
<indexterm><primary>initGroups.sh</primary></indexterm>
Now assign each of the UNIX groups to NT groups:
(It may be useful to copy this text to a script called <filename>initGroups.sh</filename>)
- <smbfile name="initGroups.sh">
<programlisting>
#!/bin/bash
#### Keep this as a shell script for future re-use
@@ -276,7 +275,6 @@ net groupmap add ntgroup="Designers" unixgroup=designers type=d rid=3200
net groupmap add ntgroup="Engineers" unixgroup=engineers type=d rid=3210
net groupmap add ntgroup="QA Team" unixgroup=qateam type=d rid=3220
</programlisting>
-</smbfile>
</para></step>
<step><para><userinput>net groupmap list</userinput></para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
index 9592982429..dbbaac7b08 100644
--- a/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
@@ -1423,10 +1423,10 @@ Samba is capable of cross-subnet browsing when configured correctly.
Consider a network set up as in <link linkend="browsing1">Cross-Subnet Browsing Example</link>.
</para>
-<image id="browsing1">
- <imagedescription>Cross-Subnet Browsing Example.</imagedescription>
+<figure id="browsing1">
+ <title>Cross-Subnet Browsing Example.</title>
<imagefile scale="40">browsing1</imagefile>
-</image>
+</figure>
<para>
This consists of 3 subnets (1, 2, 3) connected by two routers
diff --git a/docs/Samba3-HOWTO/TOSHARG-PAM.xml b/docs/Samba3-HOWTO/TOSHARG-PAM.xml
index 4a09e808b4..82c006f271 100644
--- a/docs/Samba3-HOWTO/TOSHARG-PAM.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-PAM.xml
@@ -487,7 +487,6 @@ by commenting them out, except the calls to <filename>pam_pwdb.so</filename>.
<title>PAM: Original Login Config</title>
<para>
- <smbfile name="pam-login-default">
<programlisting>
#%PAM-1.0
# The PAM configuration file for the <quote>login</quote> service
@@ -504,7 +503,7 @@ session required pam_pwdb.so
# password required pam_cracklib.so retry=3
password required pam_pwdb.so shadow md5
</programlisting>
-</smbfile></para>
+</para>
</sect3>
@@ -553,7 +552,6 @@ source distribution.
</para>
<para>
- <smbfile name="pam-login-smbpass">
<programlisting>
#%PAM-1.0
# The PAM configuration file for the <quote>login</quote> service
@@ -562,7 +560,7 @@ auth required pam_smbpass.so nodelay
account required pam_smbpass.so nodelay
session required pam_smbpass.so nodelay
password required pam_smbpass.so nodelay
-</programlisting></smbfile></para>
+</programlisting></para>
<para>
The following is the PAM configuration file for a particular
@@ -570,7 +568,6 @@ Linux system. The default condition uses <filename>pam_pwdb.so</filename>.
</para>
<para>
- <smbfile name="pam-samba-default">
<programlisting>
#%PAM-1.0
# The PAM configuration file for the <quote>samba</quote> service
@@ -579,7 +576,7 @@ auth required pam_pwdb.so nullok nodelay shadow audit
account required pam_pwdb.so audit nodelay
session required pam_pwdb.so nodelay
password required pam_pwdb.so shadow md5
-</programlisting></smbfile></para>
+</programlisting></para>
<para>
In the following example, the decision has been made to use the
@@ -589,7 +586,7 @@ thus allow the <command>smbpasswd</command> passwords to be changed using the
<command>passwd</command> program:
</para>
-<para><smbfile name="pam-samba-smbpass">
+<para>
<programlisting>
#%PAM-1.0
# The PAM configuration file for the <quote>samba</quote> service
@@ -599,7 +596,7 @@ account required pam_pwdb.so audit nodelay
session required pam_pwdb.so nodelay
password required pam_smbpass.so nodelay smbconf=/etc/samba.d/smb.conf
</programlisting>
-</smbfile></para>
+</para>
<note><para>PAM allows stacking of authentication mechanisms. It is
also possible to pass information obtained within one PAM module through
@@ -741,7 +738,6 @@ application (such as <command>ssh</command>).
</para>
<para>
- <smbfile name="pam-synchronised-password">
<programlisting>
#%PAM-1.0
# password-sync
@@ -753,7 +749,7 @@ password requisite pam_cracklib.so retry=3
password requisite pam_unix.so shadow md5 use_authtok try_first_pass
password required pam_smbpass.so nullok use_authtok try_first_pass
session required pam_unix.so
-</programlisting></smbfile></para>
+</programlisting></para>
</sect3>
<sect3>
@@ -767,7 +763,7 @@ password migration takes place when users <command>ftp</command> in, login using
their mail, and so on.
</para>
-<para><smbfile name="pam-password-migration">
+<para>
<programlisting>
#%PAM-1.0
# password-migration
@@ -781,7 +777,7 @@ password requisite pam_cracklib.so retry=3
password requisite pam_unix.so shadow md5 use_authtok try_first_pass
password optional pam_smbpass.so nullok use_authtok try_first_pass
session required pam_unix.so
-</programlisting></smbfile></para>
+</programlisting></para>
</sect3>
<sect3>
@@ -793,7 +789,7 @@ A sample PAM configuration for a mature <filename>smbpasswd</filename> installat
the SMB password does not exist or does not match the UNIX password.
</para>
-<para><smbfile name="pam-fallback">
+<para>
<programlisting>
#%PAM-1.0
# password-mature
@@ -805,7 +801,7 @@ password requisite pam_cracklib.so retry=3
password requisite pam_unix.so shadow md5 use_authtok try_first_pass
password required pam_smbpass.so use_authtok use_first_pass
session required pam_unix.so
-</programlisting></smbfile></para>
+</programlisting></para>
</sect3>
<sect3>
@@ -817,7 +813,7 @@ A sample PAM configuration that shows <parameter>pam_smbpass</parameter> used to
a Kerberos realm.
</para>
-<para><smbfile name="pam-krb">
+<para>
<programlisting>
#%PAM-1.0
# kdc-pdc
@@ -830,7 +826,7 @@ password requisite pam_cracklib.so retry=3
password optional pam_smbpass.so nullok use_authtok try_first_pass
password required pam_krb5.so use_authtok try_first_pass
session required pam_krb5.so
-</programlisting></smbfile></para>
+</programlisting></para>
</sect3>
@@ -855,7 +851,6 @@ the Samba mailing list.
</para>
<para>
- <smbfile name="pam-winbind-erratic">
<programlisting>
auth required /lib/security/pam_securetty.so
auth sufficient /lib/security/pam_winbind.so
@@ -865,7 +860,7 @@ auth required /lib/security/pam_nologin.so
account required /lib/security/pam_stack.so service=system-auth
account required /lib/security/pam_winbind.so
password required /lib/security/pam_stack.so service=system-auth
-</programlisting></smbfile>
+</programlisting>
</para>
<para>
diff --git a/docs/Samba3-HOWTO/TOSHARG-PDC.xml b/docs/Samba3-HOWTO/TOSHARG-PDC.xml
index ee9d5155c0..595deaa0ca 100644
--- a/docs/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -33,10 +33,10 @@ network environment. Workstations A, B and C are representative of many physical
network clients.
</para>
-<image id="domain-example">
- <imagedescription>An Example Domain.</imagedescription>
+<figure id="domain-example">
+ <title>An Example Domain.</title>
<imagefile scale="50">domain</imagefile>
-</image>
+</figure>
<?latex \newpage ?>
diff --git a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
index 2ee109db01..45077188e8 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
@@ -229,10 +229,10 @@ Samba-3 introduces a number of new password backend capabilities.
</para>
- <image id="idmap-sid2uid">
- <imagedescription>IDMAP: Resolution of SIDs to UIDs.</imagedescription>
+ <figure id="idmap-sid2uid">
+ <title>IDMAP: Resolution of SIDs to UIDs.</title>
<imagefile scale="50">idmap-sid2uid</imagefile>
- </image>
+ </figure>
<para>
<indexterm><primary>SID</primary></indexterm>
@@ -241,10 +241,10 @@ Samba-3 introduces a number of new password backend capabilities.
<link linkend="idmap-uid2sid">resolution of UIDs to SIDs</link> diagrams.
</para>
- <image id="idmap-uid2sid">
- <imagedescription>IDMAP: Resolution of UIDs to SIDs.</imagedescription>
+ <figure id="idmap-uid2sid">
+ <title>IDMAP: Resolution of UIDs to SIDs.</title>
<imagefile scale="50">idmap-uid2sid</imagefile>
- </image>
+ </figure>
<sect2>
<title>Important Notes About Security</title>
@@ -1028,7 +1028,6 @@ index default sub
</para>
<para>
- <smbfile name="samba.ldif.example">
<programlisting>
# Organization for Samba Base
dn: dc=quenya,dc=org
@@ -1086,7 +1085,6 @@ objectclass: organizationalRole
objectclass: simpleSecurityObject
userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz
</programlisting>
-</smbfile>
</para>
<para>
@@ -1412,7 +1410,6 @@ access to attrs=SambaLMPassword,SambaNTPassword
</para>
<para>
- <smbfile name="samba.ldif.example2">
<programlisting>
dn: uid=guest2, ou=People,dc=quenya,dc=org
sambaLMPassword: 878D8014606CDA29677A44EFA1353FC7
@@ -1429,7 +1426,6 @@ access to attrs=SambaLMPassword,SambaNTPassword
sambaSID: S-1-5-21-2447931902-1787058256-3961074038-5006
sambaPwdCanChange: 0
</programlisting>
-</smbfile>
</para>
<para>
@@ -1438,7 +1434,6 @@ access to attrs=SambaLMPassword,SambaNTPassword
</para>
<para>
- <smbfile name="samba.ldif.example3">
<programlisting>
dn: uid=gcarter, ou=People,dc=quenya,dc=org
sambaLogonTime: 0
@@ -1463,7 +1458,6 @@ access to attrs=SambaLMPassword,SambaNTPassword
sambaPwdMustChange: 2147483647
sambaNTPassword: 878D8014606CDA29677A44EFA1353FC7
</programlisting>
-</smbfile>
</para>
</sect3>
diff --git a/docs/Samba3-HOWTO/TOSHARG-Problems.xml b/docs/Samba3-HOWTO/TOSHARG-Problems.xml
index 1aa065d1c8..71d4422e71 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Problems.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Problems.xml
@@ -89,7 +89,7 @@ SMB support is quite good.</para>
<para>For details on the use of <command>ethereal</command>, read the well-written
Ethereal User Guide.</para>
-<image id="ethereal1"><imagedescription>Starting a capture.</imagedescription><imagefile>ethereal1</imagefile></image>
+<figure id="ethereal1"><title>Starting a capture.</title><imagefile>ethereal1</imagefile></figure>
<para>Listen for data on ports 137, 138, 139, and 445. For example, use
the filter <userinput>port 137, port 138, port 139, or port
@@ -98,7 +98,7 @@ the filter <userinput>port 137, port 138, port 139, or port
<para>A console version of ethereal is available as well and is called
<command>tethereal</command>.</para>
-<image id="ethereal2"><imagedescription>Main ethereal data window.</imagedescription><imagefile>ethereal2</imagefile></image>
+<figure id="ethereal2"><title>Main ethereal data window.</title><imagefile>ethereal2</imagefile></figure>
</sect2>
diff --git a/docs/Samba3-HOWTO/TOSHARG-SWAT.xml b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
index 349312d61a..1995778d33 100644
--- a/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
@@ -251,7 +251,6 @@ A control file for the newer style xinetd could be:
</para>
<para>
- <smbfile name="xinetd.swat">
<programlisting>
# default: off
# description: SWAT is the Samba Web Admin Tool. Use swat \
@@ -269,7 +268,6 @@ service swat
disable = no
}
</programlisting>
-</smbfile>
In the above, the default setting for <parameter>disable</parameter> is <constant>yes</constant>.
This means that SWAT is disabled. To enable use of SWAT, set this parameter to <constant>no</constant>
as shown.
diff --git a/docs/Samba3-HOWTO/TOSHARG-Winbind.xml b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml
index eabdcf9a72..6cec77528d 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Winbind.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Winbind.xml
@@ -94,10 +94,10 @@
</para></note>
- <image id="winbind_idmap">
- <imagedescription>Winbind Idmap</imagedescription>
+ <figure id="winbind_idmap">
+ <title>Winbind Idmap</title>
<imagefile scale="50">idmap_winbind_no_loop</imagefile>
- </image>
+ </figure>
</sect1>
@@ -895,7 +895,6 @@ usually only starts smbd and nmbd but should now start winbindd, too. If you hav
</para>
<para>
- <smbfile name="samba.server.sh">
<programlisting>
##
## samba.server
@@ -943,7 +942,7 @@ usually only starts smbd and nmbd but should now start winbindd, too. If you hav
echo "Usage: /etc/init.d/samba.server { start | stop }"
;;
esac
-</programlisting></smbfile></para>
+</programlisting></para>
<para>
Again, if you would like to run Samba in dual daemon mode, replace:
@@ -1057,7 +1056,7 @@ samba file. My <filename>/etc/pam.d/ftp</filename> file was
changed to look like this:
</para>
-<para><smbfile name="pam.ftp.winbind"><programlisting>
+<para><programlisting>
auth required /lib/security/pam_listfile.so item=user sense=deny \
file=/etc/ftpusers onerr=succeed
auth sufficient /lib/security/pam_winbind.so
@@ -1066,14 +1065,14 @@ auth required /lib/security/pam_shells.so
account sufficient /lib/security/pam_winbind.so
account required /lib/security/pam_stack.so service=system-auth
session required /lib/security/pam_stack.so service=system-auth
-</programlisting></smbfile></para>
+</programlisting></para>
<para>
The <filename>/etc/pam.d/login</filename> file can be changed nearly the
same way. It now looks like this:
</para>
-<para><smbfile name="pam.login.winbind"><programlisting>
+<para><programlisting>
auth required /lib/security/pam_securetty.so
auth sufficient /lib/security/pam_winbind.so
auth sufficient /lib/security/pam_unix.so use_first_pass
@@ -1084,7 +1083,7 @@ account required /lib/security/pam_stack.so service=system-auth
password required /lib/security/pam_stack.so service=system-auth
session required /lib/security/pam_stack.so service=system-auth
session optional /lib/security/pam_console.so
-</programlisting></smbfile></para>
+</programlisting></para>
<para>
In this case, I added the <programlisting>auth sufficient /lib/security/pam_winbind.so</programlisting>
diff --git a/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
index be080638f6..2d8b78536e 100644
--- a/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
@@ -92,7 +92,7 @@ that are in common use today. These are:
On some installations the interface will be called <guimenu>Local Area Connection</guimenu> and
on others it will be called <guimenu>Network Bridge</guimenu>. On our system it is called <guimenu>Network Bridge</guimenu>.
Right click on <guimenu>Network Bridge -> Properties</guimenu>. See <link linkend="WXPP002"/>.
- <image id="WXPP002"><imagedescription>Network Bridge Configuration.</imagedescription><imagefile>WXPP002</imagefile></image>
+ <figure id="WXPP002"><title>Network Bridge Configuration.</title><imagefile>WXPP002</imagefile></figure>
</para>
</step>
@@ -105,10 +105,10 @@ that are in common use today. These are:
<para>
The default setting is DHCP enabled operation.
(i.e., <quote>Obtain an IP address automatically</quote>). See <link linkend="WXPP003"/>.
- <image id="WXPP003">
- <imagedescription>Internet Protocol (TCP/IP) Properties.</imagedescription>
+ <figure id="WXPP003">
+ <title>Internet Protocol (TCP/IP) Properties.</title>
<imagefile>WXPP003</imagefile>
- </image>
+ </figure>
</para>
<para>
@@ -128,7 +128,7 @@ that are in common use today. These are:
The technical name for the additional addresses is <emphasis>IP Aliases</emphasis>, and additionally this
panel permits the setting of more default gateways (routers). In most cases where DHCP is used, it will not be
necessary to create additional settings. See <link linkend="WXPP005"></link> to see the appearance of this panel.
- <image id="WXPP005"><imagedescription>Advanced Network Settings</imagedescription><imagefile>WXPP005</imagefile></image>
+ <figure id="WXPP005"><title>Advanced Network Settings</title><imagefile>WXPP005</imagefile></figure>
</para>
<para>
@@ -139,7 +139,7 @@ that are in common use today. These are:
Click the <guimenu>DNS</guimenu> tab to add DNS server settings.
The example system uses manually configured DNS settings. When finished making changes, click the <guibutton>OK</guibutton> to commit
the settings. See <link linkend="WXPP014"/>.
- <image id="WXPP014"><imagedescription>DNS Configuration.</imagedescription><imagefile>WXPP014</imagefile></image>
+ <figure id="WXPP014"><title>DNS Configuration.</title><imagefile>WXPP014</imagefile></figure>
</para></step>
<step><para>
@@ -147,7 +147,7 @@ that are in common use today. These are:
This step demonstrates an example system that uses manually configured WINS settings.
When finished making, changes click the <guibutton>OK</guibutton> to commit
the settings. See <link linkend="WXPP009"></link>.
- <image id="WXPP009"><imagedescription>WINS Configuration</imagedescription><imagefile>WXPP009</imagefile></image>
+ <figure id="WXPP009"><title>WINS Configuration</title><imagefile>WXPP009</imagefile></figure>
</para></step>
</procedure>
@@ -177,7 +177,7 @@ that are in common use today. These are:
<step><para>
Right click on <guimenu>Local Area Connection</guimenu>, now click the
<guimenuitem>Properties</guimenuitem>. See <link linkend="w2kp001"></link>.
- <image id="w2kp001"><imagedescription>Local Area Connection Properties.</imagedescription><imagefile>w2kp001</imagefile></image>
+ <figure id="w2kp001"><title>Local Area Connection Properties.</title><imagefile>w2kp001</imagefile></figure>
</para></step>
<step><para>
@@ -188,7 +188,7 @@ that are in common use today. These are:
<step><para>
The default setting is DHCP enabled operation.
(i.e., <quote>Obtain an IP address automatically</quote>). See <link linkend="w2kp002"/>.
- <image id="w2kp002"><imagedescription>Internet Protocol (TCP/IP) Properties.</imagedescription><imagefile>w2kp002</imagefile></image>
+ <figure id="w2kp002"><title>Internet Protocol (TCP/IP) Properties.</title><imagefile>w2kp002</imagefile></figure>
</para>
<para>
@@ -206,7 +206,7 @@ that are in common use today. These are:
<step><para>
Click the <guimenu>Advanced</guimenu> button to proceed with TCP/IP configuration.
Refer to <link linkend="w2kp003"></link>.
- <image id="w2kp003"><imagedescription>Advanced Network Settings.</imagedescription><imagefile>w2kp003</imagefile></image>
+ <figure id="w2kp003"><title>Advanced Network Settings.</title><imagefile>w2kp003</imagefile></figure>
</para>
<para>
@@ -217,7 +217,7 @@ that are in common use today. These are:
Click the <guimenu>DNS</guimenu> tab to add DNS server settings.
The example system uses manually configured DNS settings. When finished making changes,
click on <guibutton>OK</guibutton> to commit the settings. See <link linkend="w2kp004"></link>.
- <image id="w2kp004"><imagedescription>DNS Configuration.</imagedescription><imagefile>w2kp004</imagefile></image>
+ <figure id="w2kp004"><title>DNS Configuration.</title><imagefile>w2kp004</imagefile></figure>
</para></step>
<step><para>
@@ -225,7 +225,7 @@ that are in common use today. These are:
This step demonstrates an example system that uses manually configured WINS settings.
When finished making changes, click on <guibutton>OK</guibutton> to commit the settings.
See <link linkend="w2kp005"></link>.
- <image id="w2kp005"><imagedescription>WINS Configuration.</imagedescription><imagefile>w2kp005</imagefile></image>
+ <figure id="w2kp005"><title>WINS Configuration.</title><imagefile>w2kp005</imagefile></figure>
</para></step>
</procedure>
@@ -256,7 +256,7 @@ that are in common use today. These are:
<step><para>
In the box labeled <guimenuitem>The following network components are installed:</guimenuitem>,
click on <guimenu>Internet Protocol TCP/IP</guimenu>, now click on the <guibutton>Properties</guibutton> button. See <link linkend="WME001"></link>.
- <image id="WME001"><imagedescription>The Windows Me Network Configuration Panel.</imagedescription><imagefile>WME001</imagefile></image>
+ <figure id="WME001"><title>The Windows Me Network Configuration Panel.</title><imagefile>WME001</imagefile></figure>
</para></step>
<step><para>
@@ -265,7 +265,7 @@ that are in common use today. These are:
for Microsoft Windows client support see, <link linkend="DHCP"></link>.
The default setting on Microsoft Windows Me workstations is for DHCP enabled operation,
i.e., <guimenu>Obtain IP address automatically</guimenu> is enabled. See <link linkend="WME002"></link>.
- <image id="WME002"><imagedescription>IP Address.</imagedescription><imagefile>WME002</imagefile></image>
+ <figure id="WME002"><title>IP Address.</title><imagefile>WME002</imagefile></figure>
</para>
<para>
@@ -288,14 +288,14 @@ that are in common use today. These are:
<step><para>
The following example uses manually configured WINS settings. See <link linkend="WME005"></link>.
When finished making changes, click on <guibutton>OK</guibutton> to commit the settings.
- <image id="WME005"><imagedescription>DNS Configuration.</imagedescription><imagefile>WME005</imagefile></image>
+ <figure id="WME005"><title>DNS Configuration.</title><imagefile>WME005</imagefile></figure>
</para>
<para>
This is an example of a system that uses manually configured WINS settings. One situation where
this might apply is on a network that has a single DHCP server that provides settings for multiple
Windows workgroups or domains. See <link linkend="WME003"></link>.
- <image id="WME003"><imagedescription>WINS Configuration.</imagedescription><imagefile>WME003</imagefile></image>
+ <figure id="WME003"><title>WINS Configuration.</title><imagefile>WME003</imagefile></figure>
</para></step>
</procedure>
@@ -326,7 +326,7 @@ that are in common use today. These are:
<step><para>
The opening panel is the same one that can be reached by clicking <guimenu>System</guimenu> on the Control Panel.
See <link linkend="wxpp001"></link>.
- <image id="wxpp001"><imagedescription>The General Panel.</imagedescription><imagefile>wxpp001</imagefile></image>
+ <figure id="wxpp001"><title>The General Panel.</title><imagefile>wxpp001</imagefile></figure>
</para></step>
<step><para>
@@ -339,13 +339,13 @@ that are in common use today. These are:
Clicking the <guimenu>Network ID</guimenu> button will launch the configuration wizard. Do not use this with
Samba-3. If you wish to change the computer name, join or leave the domain, click the <guimenu>Change</guimenu> button.
See <link linkend="wxpp004"></link>.
- <image id="wxpp004"><imagedescription>The Computer Name Panel.</imagedescription><imagefile>wxpp004</imagefile></image>
+ <figure id="wxpp004"><title>The Computer Name Panel.</title><imagefile>wxpp004</imagefile></figure>
</para></step>
<step><para>
Click on <guimenu>Change</guimenu>. This panel shows that our example machine (TEMPTATION) is in a workgroup called WORKGROUP.
We will join the domain called MIDEARTH. See <link linkend="wxpp006"></link>.
- <image id="wxpp006"><imagedescription>The Computer Name Changes Panel.</imagedescription><imagefile>wxpp006</imagefile></image>
+ <figure id="wxpp006"><title>The Computer Name Changes Panel.</title><imagefile>wxpp006</imagefile></figure>
</para></step>
<step><para>
@@ -354,7 +354,7 @@ that are in common use today. These are:
<para>
This panel shows that our example machine (TEMPTATION) is set to join the domain called MIDEARTH. See <link linkend="wxpp007"></link>.
- <image id="wxpp007"><imagedescription>The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.</imagedescription><imagefile>wxpp007</imagefile></image>
+ <figure id="wxpp007"><title>The Computer Name Changes Panel &smbmdash; Domain MIDEARTH.</title><imagefile>wxpp007</imagefile></figure>
</para></step>
<step><para>
@@ -364,7 +364,7 @@ that are in common use today. These are:
<para>
Enter the name <quote>root</quote> and the root password from your Samba-3 server. See <link linkend="wxpp008"></link>.
- <image id="wxpp008"><imagedescription>Computer Name Changes &smbmdash; User name and Password Panel.</imagedescription><imagefile>wxpp008</imagefile></image>
+ <figure id="wxpp008"><title>Computer Name Changes &smbmdash; User name and Password Panel.</title><imagefile>wxpp008</imagefile></figure>
</para></step>
<step><para>
@@ -400,7 +400,7 @@ that are in common use today. These are:
<step><para>
The Network Configuration Panel allows all common network settings to be changed.
See <link linkend="WME009"></link>.
- <image id="WME009"><imagedescription>The Network Panel.</imagedescription><imagefile>WME009</imagefile></image>
+ <figure id="WME009"><title>The Network Panel.</title><imagefile>WME009</imagefile></figure>
</para>
<para>
@@ -412,7 +412,7 @@ that are in common use today. These are:
<step><para>
The Client for Microsoft Networks Properties panel is the correct location to configure network logon
settings. See <link linkend="WME010"></link>.
- <image id="WME010"><imagedescription>Client for Microsoft Networks Properties Panel.</imagedescription><imagefile>WME010</imagefile></image>
+ <figure id="WME010"><title>Client for Microsoft Networks Properties Panel.</title><imagefile>WME010</imagefile></figure>
</para>
<para>
@@ -423,14 +423,14 @@ that are in common use today. These are:
<step><para>
Click on the <guimenu>Identification</guimenu> button. This is the location at which the workgroup
(domain) name and the machine name (computer name) need to be set. See <link linkend="WME013"></link>.
- <image id="WME013"><imagedescription>Identification Panel.</imagedescription><imagefile>WME013</imagefile></image>
+ <figure id="WME013"><title>Identification Panel.</title><imagefile>WME013</imagefile></figure>
</para></step>
<step><para>
Now click the <guimenu>Access Control</guimenu> button. If you want to be able to assign share access
permissions using domain user and group accounts, it is necessary to enable
<guimenu>User-level access control</guimenu> as shown in this panel. See <link linkend="WME014"></link>.
- <image id="WME014"><imagedescription>Identification Panel.</imagedescription><imagefile>WME014</imagefile></image>
+ <figure id="WME014"><title>Identification Panel.</title><imagefile>WME014</imagefile></figure>
</para></step>
</procedure>
diff --git a/docs/Samba3-HOWTO/manpages.xml b/docs/Samba3-HOWTO/manpages.xml
index 69801c44ec..12e9827c89 100644
--- a/docs/Samba3-HOWTO/manpages.xml
+++ b/docs/Samba3-HOWTO/manpages.xml
@@ -27,5 +27,3 @@
<xi:include href="../manpages-3/winbindd.8.xml"/>
</reference>
-
-
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 87806a2aa2..5ded8c703b 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -4,7 +4,6 @@
Published under the GNU GPL
(C) Jelmer Vernooij 2002-2004
- (C) Alexander Bokovoy 2002-2004
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
@@ -152,101 +151,64 @@
<xsl:apply-templates/>
</xsl:template>
- <xsl:template match="smbfile">
- <xsl:apply-templates/>
- </xsl:template>
-
- <xsl:template match="image">
- <xsl:element name="figure">
- <xsl:attribute name="id">
- <xsl:choose>
- <xsl:when test="@id != ''">
- <xsl:value-of select="@id"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="imagefile"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
-
- <xsl:element name="title">
- <xsl:if test="imagedescription = ''">
- <xsl:message><xsl:text>imagedescription of image with id </xsl:text><xsl:value-of select="@id"/><xsl:text> is empty.</xsl:text></xsl:message>
- </xsl:if>
- <xsl:value-of select="imagedescription"/>
- </xsl:element>
- <xsl:element name="mediaobject">
- <xsl:element name="imageobject">
- <xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
- <xsl:element name="imagedata">
- <xsl:attribute name="fileref">
- <xsl:value-of select="$latex.imagebasedir"/><xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
- <xsl:attribute name="scale">
- <xsl:choose>
- <xsl:when test="@scale != ''">
- <xsl:value-of select="@scale"/>
- </xsl:when>
-
- <xsl:when test="imagefile/@scale != ''">
- <xsl:value-of select="imagefile/@scale"/>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:text>50</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
- </xsl:element>
+ <xsl:template match="imagefile">
+ <xsl:element name="mediaobject">
+ <xsl:element name="imageobject">
+ <xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
+ <xsl:element name="imagedata">
+ <xsl:attribute name="fileref">
+ <xsl:value-of select="$latex.imagebasedir"/><xsl:text>images/</xsl:text><xsl:value-of select="text()"/></xsl:attribute>
+ <xsl:attribute name="scale">
+ <xsl:choose>
+ <xsl:when test="@scale != ''">
+ <xsl:value-of select="@scale"/>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:text>50</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
</xsl:element>
- <xsl:element name="imageobject">
- <xsl:attribute name="role"><xsl:text>html</xsl:text></xsl:attribute>
- <xsl:element name="imagedata">
- <xsl:attribute name="fileref">
- <xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
- <xsl:attribute name="scale">
- <xsl:choose>
- <xsl:when test="@scale != ''">
- <xsl:value-of select="@scale"/>
- </xsl:when>
-
- <xsl:when test="imagefile/@scale != ''">
- <xsl:value-of select="imagefile/@scale"/>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:text>100</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
- </xsl:element>
+ </xsl:element>
+ <xsl:element name="imageobject">
+ <xsl:attribute name="role"><xsl:text>html</xsl:text></xsl:attribute>
+ <xsl:element name="imagedata">
+ <xsl:attribute name="fileref">
+ <xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+ <xsl:attribute name="scale">
+ <xsl:choose>
+ <xsl:when test="@scale != ''">
+ <xsl:value-of select="@scale"/>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:text>100</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
</xsl:element>
- <xsl:element name="imageobject">
- <xsl:element name="imagedata">
- <xsl:attribute name="fileref">
- <xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
- <xsl:attribute name="scale">
- <xsl:choose>
- <xsl:when test="@scale != ''">
- <xsl:value-of select="@scale"/>
- </xsl:when>
-
- <xsl:when test="imagefile/@scale != ''">
- <xsl:value-of select="imagefile/@scale"/>
- </xsl:when>
-
- <xsl:otherwise>
- <xsl:text>50</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
- </xsl:element>
+ </xsl:element>
+ <xsl:element name="imageobject">
+ <xsl:element name="imagedata">
+ <xsl:attribute name="fileref">
+ <xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+ <xsl:attribute name="scale">
+ <xsl:choose>
+ <xsl:when test="@scale != ''">
+ <xsl:value-of select="@scale"/>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:text>50</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute name="scalefit"><xsl:text>1</xsl:text></xsl:attribute>
</xsl:element>
-
</xsl:element>
</xsl:element>
</xsl:template>
-
</xsl:stylesheet>
diff --git a/docs/xslt/extract-smbfiles.xsl b/docs/xslt/extract-smbfiles.xsl
deleted file mode 100644
index 997320de4a..0000000000
--- a/docs/xslt/extract-smbfiles.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0'?>
-<!-- vim:set sts=2 shiftwidth=2 syntax=xml: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:exsl="http://exslt.org/common"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
- version="1.1"
- extension-element-prefixes="exsl">
-
-<xsl:output method="xml"/>
-
-<!-- Parse all varlistentries and extract those of them which are descriptions of smb.conf
- parameters. We determine them by existence of <anchor> element inside <term> element.
- If <anchor> is there, then its 'id' attribute is translated to lower case and is used
- as basis for file name for that parameter.
--->
-<xsl:template match="smbfile">
- <!-- reconstruct varlistentry - not all of them will go into separate files
- and also we must repair the main varlistentry itself.
- -->
- <xsl:variable name="content">
- <xsl:apply-templates/>
- </xsl:variable>
- <!-- Now put varlistentry into separate file _if_ it has anchor associated with it -->
- <xsl:variable name="filename"><xsl:text>output/examples/</xsl:text><xsl:value-of select="@name"/></xsl:variable>
- <!-- Debug message for an operator, just to show progress of processing :) -->
- <xsl:message>
- <xsl:text>Writing </xsl:text>
- <xsl:value-of select="$filename"/>
- </xsl:message>
- <!-- Write finally varlistentry to a separate file -->
- <exsl:document href="{$filename}"
- method="xml"
- encoding="UTF-8"
- indent="yes"
- omit-xml-declaration="yes">
- <xsl:copy-of select="$content"/>
- </exsl:document>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/docs/xslt/sambadoc2pearson.xsl b/docs/xslt/sambadoc2pearson.xsl
index 23bc30985c..5028d05064 100644
--- a/docs/xslt/sambadoc2pearson.xsl
+++ b/docs/xslt/sambadoc2pearson.xsl
@@ -13,10 +13,6 @@
<xsl:strip-space elements="smbconfoption smbconfsection"/>
- <xsl:template match="smbfile">
- <xsl:apply-templates/>
- </xsl:template>
-
<xsl:template match="smbconfexample/smbconfsection|smbconfblock/smbconfsection">
<xsl:text>&#10;</xsl:text>
<xsl:value-of select="."/><xsl:text>&#10;</xsl:text>