diff --git a/docs/docbook/projdoc/ADS-HOWTO.sgml b/docs/docbook/projdoc/ADS-HOWTO.xml
similarity index 100%
rename from docs/docbook/projdoc/ADS-HOWTO.sgml
rename to docs/docbook/projdoc/ADS-HOWTO.xml
diff --git a/docs/docbook/projdoc/AdvancedNetworkAdmin.sgml b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml
similarity index 100%
rename from docs/docbook/projdoc/AdvancedNetworkAdmin.sgml
rename to docs/docbook/projdoc/AdvancedNetworkAdmin.xml
diff --git a/docs/docbook/projdoc/Bugs.sgml b/docs/docbook/projdoc/Bugs.xml
similarity index 100%
rename from docs/docbook/projdoc/Bugs.sgml
rename to docs/docbook/projdoc/Bugs.xml
diff --git a/docs/docbook/projdoc/CUPS-printing.sgml b/docs/docbook/projdoc/CUPS-printing.xml
similarity index 99%
rename from docs/docbook/projdoc/CUPS-printing.sgml
rename to docs/docbook/projdoc/CUPS-printing.xml
index 57faebdcd66..7e302000e60 100644
--- a/docs/docbook/projdoc/CUPS-printing.sgml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -1177,7 +1177,6 @@ Summary - You need:
-
A "foomatic+something" PPD is not enough to print with CUPS (but it is *one* important component)The "cupsomatic" filter script (Perl) in /usr/lib/cups/filters/Perl to make cupsomatic run
@@ -1427,15 +1426,15 @@ download is "cups-samba-1.1.16.tar.gz". Upon untar-/unzip-ping it will reveal
the files:
-
-
- cups-samba.install
- cups-samba.license
- cups-samba.readme
- cups-samba.remove
- cups-samba.ss
-
-
+
+
+ cups-samba.install
+ cups-samba.license
+ cups-samba.readme
+ cups-samba.remove
+ cups-samba.ss
+
+
These have been packaged with the ESP meta packager software "EPM". The
@@ -1444,13 +1443,13 @@ These have been packaged with the ESP meta packager software "EPM". The
into /usr/share/cups/drivers/. Its contents are 3 files:
-
-
- cupsdrvr.dll
- cupsui.dll
- cups.hlp
-
-
+
+
+ cupsdrvr.dll
+ cupsui.dll
+ cups.hlp
+
+
Due to a bug one CUPS release puts the cups.hlp
@@ -1460,8 +1459,8 @@ the file after running the "./cups-samba.install" script manually to the right p
- cp /usr/share/drivers/cups.hlp /usr/share/cups/drivers/
-
+ cp /usr/share/drivers/cups.hlp /usr/share/cups/drivers/
+
@@ -1535,16 +1534,16 @@ as compared to the Adobe drivers?
-
-
+
+
no hassle with the Adobe EULA
-
+
-
+
no hassle with the question "where do I get the ADOBE*.* driver files from?"
-
+
-
+
the Adobe drivers (depending on the printer PPD associated with them)
often put a PJL header in front of the core PostScript part of the print
file (thus the file starts with "1B%-12345X"
@@ -1557,47 +1556,47 @@ as compared to the Adobe drivers?
leads to the page accounting in "/var/log/cups/page_log" not receiving
the exact mumber of pages; instead the dummy page number of "1" is
logged in a standard setup)
-
+
-
+
the Adobe driver has more options to "mis-configure" the PostScript
generated by it (like setting it inadvertedly to "Optimize for Speed",
instead of "Optimize for Portability", which could lead to CUPS being
unable to process it)
-
+
-
+
the CUPS PostScript driver output sent by Windows clients to the CUPS
server will be guaranteed to be auto-typed as generic MIME type
"application/postscript", thusly passing thru the CUPS "pstops" filter
and logging the correct number of pages in the page_log for accounting
and quota purposes
-
+
-
+
the CUPS PostScript driver supports the sending of additional print
options by the Win NT/2k/XP clients, such as naming the CUPS standard
banner pages (or the custom ones, should they be installed at the time
of driver download), using the CUPS "page-label" option, setting a
job-priority and setting the scheduled time of printing (with the option
to support additional useful IPP job attributes in the future).
-
+
-
+
the CUPS PostScript driver supports the inclusion of the new
"*cupsJobTicket" comments at the beginnig of the PostScript file (which
could be used in the future for all sort of beneficial extensions on
the CUPS side, but which will not disturb any other application as those
will regard it as a comment and simply ignore it).
-
+
-
+
the CUPS PostScript driver will be the heart of the fully fledged CUPS
IPP client for Windows NT/2k/XP to be released soon (probably alongside
the first Beta release for CUPS 1.2).
-
+
-
+
diff --git a/docs/docbook/projdoc/Compiling.sgml b/docs/docbook/projdoc/Compiling.xml
similarity index 95%
rename from docs/docbook/projdoc/Compiling.sgml
rename to docs/docbook/projdoc/Compiling.xml
index 664975779ca..9638663dde7 100644
--- a/docs/docbook/projdoc/Compiling.sgml
+++ b/docs/docbook/projdoc/Compiling.xml
@@ -276,11 +276,16 @@ you would not want to see would be:
Compiling samba with Active Directory supportIn order to compile samba with ADS support, you need to have installed
- on your system:
-
- the MIT kerberos development libraries (either install from the sources or use a package). The heimdal libraries will not work.
- the OpenLDAP development libraries.
-
+ on your system:
+
+
+ the MIT kerberos development libraries
+ (either install from the sources or use a package). The
+ heimdal libraries will not work.
+
+ the OpenLDAP development libraries.
+
+ If your kerberos libraries are in a non-standard location then
remember to add the configure option --with-krb5=DIR.
@@ -290,7 +295,7 @@ you would not want to see would be:
#define HAVE_KRB5 1
#define HAVE_LDAP 1
-
+
If it doesn't then configure did not find your krb5 libraries or
your ldap libraries. Look in config.log to figure out why and fix
@@ -301,10 +306,10 @@ you would not want to see would be:
On Debian you need to install the following packages:
-
- libkrb5-dev
- krb5-user
-
+
+ libkrb5-dev
+ krb5-user
+
@@ -313,11 +318,11 @@ you would not want to see would be:
On RedHat this means you should have at least:
-
- krb5-workstation (for kinit)
- krb5-libs (for linking with)
- krb5-devel (because you are compiling from source)
-
+
+ krb5-workstation (for kinit)
+ krb5-libs (for linking with)
+ krb5-devel (because you are compiling from source)
+ in addition to the standard development environment.
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.sgml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
similarity index 100%
rename from docs/docbook/projdoc/DOMAIN_MEMBER.sgml
rename to docs/docbook/projdoc/DOMAIN_MEMBER.xml
diff --git a/docs/docbook/projdoc/Diagnosis.sgml b/docs/docbook/projdoc/Diagnosis.xml
similarity index 100%
rename from docs/docbook/projdoc/Diagnosis.sgml
rename to docs/docbook/projdoc/Diagnosis.xml
diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml
similarity index 100%
rename from docs/docbook/projdoc/GROUP-MAPPING-HOWTO.sgml
rename to docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml
diff --git a/docs/docbook/projdoc/Integrating-with-Windows.sgml b/docs/docbook/projdoc/Integrating-with-Windows.xml
similarity index 100%
rename from docs/docbook/projdoc/Integrating-with-Windows.sgml
rename to docs/docbook/projdoc/Integrating-with-Windows.xml
diff --git a/docs/docbook/projdoc/InterdomainTrusts.sgml b/docs/docbook/projdoc/InterdomainTrusts.xml
similarity index 100%
rename from docs/docbook/projdoc/InterdomainTrusts.sgml
rename to docs/docbook/projdoc/InterdomainTrusts.xml
diff --git a/docs/docbook/projdoc/IntroSMB.sgml b/docs/docbook/projdoc/IntroSMB.xml
similarity index 100%
rename from docs/docbook/projdoc/IntroSMB.sgml
rename to docs/docbook/projdoc/IntroSMB.xml
diff --git a/docs/docbook/projdoc/NT4Migration.sgml b/docs/docbook/projdoc/NT4Migration.xml
similarity index 96%
rename from docs/docbook/projdoc/NT4Migration.sgml
rename to docs/docbook/projdoc/NT4Migration.xml
index 7b1d2f20b35..585cfe6a476 100644
--- a/docs/docbook/projdoc/NT4Migration.sgml
+++ b/docs/docbook/projdoc/NT4Migration.xml
@@ -340,14 +340,14 @@ based solution fit into three basic categories.
The 3 Major Site Types
-
+
- Number of UsersDescription
+ Number of UsersDescription
- < 50Want simple conversion with NO pain
- 50 - 250Want new features, can manage some in-house complexity
- > 250Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas
+ < 50Want simple conversion with NO pain
+ 50 - 250Want new features, can manage some in-house complexity
+ > 250Solution/Implementation MUST scale well, complex needs. Cross departmental decision process. Local expertise in most areas
@@ -397,7 +397,7 @@ No matter what choice you make, the following rules will minimise down-stream pr
Nature of the Conversion Choices
-
+SimpleUpgradedRedesign
diff --git a/docs/docbook/projdoc/NT_Security.sgml b/docs/docbook/projdoc/NT_Security.xml
similarity index 100%
rename from docs/docbook/projdoc/NT_Security.sgml
rename to docs/docbook/projdoc/NT_Security.xml
diff --git a/docs/docbook/projdoc/NetworkBrowsing.sgml b/docs/docbook/projdoc/NetworkBrowsing.xml
similarity index 100%
rename from docs/docbook/projdoc/NetworkBrowsing.sgml
rename to docs/docbook/projdoc/NetworkBrowsing.xml
diff --git a/docs/docbook/projdoc/Other-Clients.sgml b/docs/docbook/projdoc/Other-Clients.xml
similarity index 100%
rename from docs/docbook/projdoc/Other-Clients.sgml
rename to docs/docbook/projdoc/Other-Clients.xml
diff --git a/docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml b/docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
similarity index 100%
rename from docs/docbook/projdoc/PAM-Authentication-And-Samba.sgml
rename to docs/docbook/projdoc/PAM-Authentication-And-Samba.xml
diff --git a/docs/docbook/projdoc/PolicyMgmt.sgml b/docs/docbook/projdoc/PolicyMgmt.xml
similarity index 100%
rename from docs/docbook/projdoc/PolicyMgmt.sgml
rename to docs/docbook/projdoc/PolicyMgmt.xml
diff --git a/docs/docbook/projdoc/Portability.sgml b/docs/docbook/projdoc/Portability.xml
similarity index 100%
rename from docs/docbook/projdoc/Portability.sgml
rename to docs/docbook/projdoc/Portability.xml
diff --git a/docs/docbook/projdoc/Problems.sgml b/docs/docbook/projdoc/Problems.xml
similarity index 100%
rename from docs/docbook/projdoc/Problems.sgml
rename to docs/docbook/projdoc/Problems.xml
diff --git a/docs/docbook/projdoc/ProfileMgmt.sgml b/docs/docbook/projdoc/ProfileMgmt.xml
similarity index 100%
rename from docs/docbook/projdoc/ProfileMgmt.sgml
rename to docs/docbook/projdoc/ProfileMgmt.xml
diff --git a/docs/docbook/projdoc/SWAT.sgml b/docs/docbook/projdoc/SWAT.xml
similarity index 100%
rename from docs/docbook/projdoc/SWAT.sgml
rename to docs/docbook/projdoc/SWAT.xml
diff --git a/docs/docbook/projdoc/Samba-BDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-BDC-HOWTO.xml
similarity index 100%
rename from docs/docbook/projdoc/Samba-BDC-HOWTO.sgml
rename to docs/docbook/projdoc/Samba-BDC-HOWTO.xml
diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
similarity index 98%
rename from docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
rename to docs/docbook/projdoc/Samba-PDC-HOWTO.xml
index 0bb3ccbfb7e..6a3bcacf175 100644
--- a/docs/docbook/projdoc/Samba-PDC-HOWTO.sgml
+++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml
@@ -368,10 +368,7 @@ There are two ways to create machine trust accounts:
account is automatically created by Samba at the time the client
is joined to the domain. (For security, this is the
recommended method.) The corresponding Unix account may be
- created automatically or manually. This option requires that the
- administrator configures in smb.conf [globals] the add machine script
- parameter entry.
-
+ created automatically or manually.
@@ -469,20 +466,20 @@ is joined to the domain.
Since each Samba machine trust account requires a corresponding
Unix account, a method for automatically creating the
Unix account is usually supplied; this requires configuration of the
-add machine script
+add user script
option in smb.conf. This
method is not required, however; corresponding Unix accounts may also
be created manually.
-Below is an example for a Red Hat Linux system.
+Below is an example for a RedHat 6.2 Linux system.
[global]
# <...remainder of parameters...>
- add machine script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u
+ add user script = /usr/sbin/useradd -d /dev/null -g 100 -s /bin/false -M %u
diff --git a/docs/docbook/projdoc/ServerType.sgml b/docs/docbook/projdoc/ServerType.xml
similarity index 100%
rename from docs/docbook/projdoc/ServerType.sgml
rename to docs/docbook/projdoc/ServerType.xml
diff --git a/docs/docbook/projdoc/Speed.sgml b/docs/docbook/projdoc/Speed.xml
similarity index 100%
rename from docs/docbook/projdoc/Speed.sgml
rename to docs/docbook/projdoc/Speed.xml
diff --git a/docs/docbook/projdoc/UNIX_INSTALL.sgml b/docs/docbook/projdoc/UNIX_INSTALL.xml
similarity index 100%
rename from docs/docbook/projdoc/UNIX_INSTALL.sgml
rename to docs/docbook/projdoc/UNIX_INSTALL.xml
diff --git a/docs/docbook/projdoc/VFS.sgml b/docs/docbook/projdoc/VFS.xml
similarity index 100%
rename from docs/docbook/projdoc/VFS.sgml
rename to docs/docbook/projdoc/VFS.xml
diff --git a/docs/docbook/projdoc/locking.sgml b/docs/docbook/projdoc/locking.xml
similarity index 100%
rename from docs/docbook/projdoc/locking.sgml
rename to docs/docbook/projdoc/locking.xml
diff --git a/docs/docbook/projdoc/msdfs_setup.sgml b/docs/docbook/projdoc/msdfs_setup.xml
similarity index 100%
rename from docs/docbook/projdoc/msdfs_setup.sgml
rename to docs/docbook/projdoc/msdfs_setup.xml
diff --git a/docs/docbook/projdoc/passdb.sgml b/docs/docbook/projdoc/passdb.xml
similarity index 100%
rename from docs/docbook/projdoc/passdb.sgml
rename to docs/docbook/projdoc/passdb.xml
diff --git a/docs/docbook/projdoc/printer_driver2.sgml b/docs/docbook/projdoc/printer_driver2.xml
similarity index 100%
rename from docs/docbook/projdoc/printer_driver2.sgml
rename to docs/docbook/projdoc/printer_driver2.xml
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.xml
similarity index 91%
rename from docs/docbook/projdoc/samba-doc.sgml
rename to docs/docbook/projdoc/samba-doc.xml
index a729caf99ff..e06ce2901e1 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.xml
@@ -1,4 +1,5 @@
-
+ %globalentities;
]>
@@ -24,9 +25,9 @@ documentation represents a major revision or layout as well as contents.
The most recent version of this document can be found at
http://www.samba.org/
on the "Documentation" page. Please send updates to
-jelmer@samba.org,
-jht@samba.org or
-jerry@samba.org.
+Jelmer Venrooij,
+John Terpstra or
+Gerald (Jerry) Carter.
@@ -50,6 +51,8 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt
+
+
@@ -126,4 +129,5 @@ Samba has several features that you might want or might not want to use. The cha
&SWAT;
&SPEED;
+
diff --git a/docs/docbook/projdoc/securing-samba.sgml b/docs/docbook/projdoc/securing-samba.xml
similarity index 100%
rename from docs/docbook/projdoc/securing-samba.sgml
rename to docs/docbook/projdoc/securing-samba.xml
diff --git a/docs/docbook/projdoc/security_level.sgml b/docs/docbook/projdoc/security_level.xml
similarity index 100%
rename from docs/docbook/projdoc/security_level.sgml
rename to docs/docbook/projdoc/security_level.xml
diff --git a/docs/docbook/projdoc/unicode.sgml b/docs/docbook/projdoc/unicode.xml
similarity index 100%
rename from docs/docbook/projdoc/unicode.sgml
rename to docs/docbook/projdoc/unicode.xml
diff --git a/docs/docbook/projdoc/upgrading-to-3.0.sgml b/docs/docbook/projdoc/upgrading-to-3.0.xml
similarity index 100%
rename from docs/docbook/projdoc/upgrading-to-3.0.sgml
rename to docs/docbook/projdoc/upgrading-to-3.0.xml
diff --git a/docs/docbook/projdoc/winbind.sgml b/docs/docbook/projdoc/winbind.xml
similarity index 97%
rename from docs/docbook/projdoc/winbind.sgml
rename to docs/docbook/projdoc/winbind.xml
index 962e81b8638..d46c32c2e40 100644
--- a/docs/docbook/projdoc/winbind.sgml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -543,16 +543,21 @@ should be named WINBIND. A stanza like the following:
WINBIND:
program = /usr/lib/security/WINBIND
options = authonly
-
+
-can then be added to /usr/lib/security/methods.cfg.
-This module only supports identification, but there have been success reports
-using the standard winbind pam module for authentication. Use caution
-configuring loadable authentication modules as it is possible to make
-it impossible to logon to the system. More information about the AIX
-authentication module API can be found at
- and more information on administering the
-modules at .
+can then be added to
+/usr/lib/security/methods.cfg. This module only
+supports identification, but there have been success reports using the
+standard winbind pam module for authentication. Use caution configuring
+loadable authentication modules as it is possible to make it impossible
+to logon to the system. More information about the AIX authentication
+module API can be found at "Kernel Extensions and Device Support
+Programming Concepts for AIX":
+Chapter 18. Loadable Authentication Module Programming Interface
+and more information on administering the modules at
+"System Management Guide: Operating System and Devices".
@@ -563,7 +568,8 @@ modules at winbindd(8) man page. My
+the winbindd
+8 man page. My
smb.conf file was modified to
include the following entries in the [global] section: