diff options
Diffstat (limited to 'docs/docbook')
| -rw-r--r-- | docs/docbook/Makefile.in | 27 | ||||
| -rw-r--r-- | docs/docbook/devdoc/dev-doc.sgml | 6 | ||||
| -rw-r--r-- | docs/docbook/devdoc/internals.sgml | 1 | ||||
| -rw-r--r-- | docs/docbook/devdoc/parsing.sgml | 2 | ||||
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 55 |
5 files changed, 20 insertions, 71 deletions
diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index c79c9008ff..b225eb9780 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -57,41 +57,30 @@ all: @echo "txt - Build plain text version of HOWTO Collection" manpages: $(MANPAGES) -pdf: ../Samba-HOWTO-Collection.pdf ../Samba-Developers-Guide.pdf -ps: ../Samba-HOWTO-Collection.ps ../Samba-Developers-Guide.ps -txt: ../textdocs/Samba-HOWTO-Collection.txt ../textdocs/Samba-Developers-Guide.txt +pdf: ../Samba-HOWTO-Collection.pdf +ps: ../Samba-HOWTO-Collection.ps +txt: ../Samba-HOWTO-Collection.txt htmlman: $(MANPAGES_HTML) -html-single: ../$(HTMLDIR)/Samba-HOWTO-Collection.html ../$(HTMLDIR)/Samba-Developers-Guide.html html: $(DOCBOOK2HTML) -d samba.dsl -o $(HTMLDIR) projdoc/samba-doc.sgml +html-single: ../Samba-HOWTO-Collection.html ../Samba-Developers-Guide.html ../Samba-HOWTO-Collection.txt: $(SGMLDIR)/samba-doc.sgml $(DOCBOOK2TXT) -o .. $< mv ../samba-doc.txt $@ -../Samba-Developers-Guide.txt: $(SGMLDIR)/samba-doc.sgml - $(DOCBOOK2TXT) -o .. $< - mv ../samba-doc.txt $@ - ../Samba-HOWTO-Collection.ps: $(SGMLDIR)/samba-doc.sgml $(DOCBOOK2PS) -o .. $< mv ../samba-doc.ps $@ -../Samba-Developers-Guide.ps: $(SGMLDIR)/samba-doc.sgml - $(DOCBOOK2PS) -o .. $< - mv ../samba-doc.ps $@ - -../Samba-HOWTO-Collection.pdf: ../$(HTMLDIR)/Samba-HOWTO-Collection.html - $(HTMLDOC) --book --color --links -f $@ $< - -../Samba-Developers-Guide.pdf: ../$(HTMLDIR)/Samba-Developers-Guide.html +../Samba-HOWTO-Collection.pdf: ../Samba-HOWTO-Collection.html $(HTMLDOC) --book --color --links -f $@ $< -../$(HTMLDIR)/Samba-HOWTO-Collection.html: $(SGMLDIR)/samba-doc.sgml +../Samba-HOWTO-Collection.html: $(SGMLDIR)/samba-doc.sgml $(DOCBOOK2HTML) -u -o .. $< mv ../samba-doc.html $@ -../$(HTMLDIR)/Samba-Developers-Guide.html: devdoc/dev-doc.sgml +../Samba-Developers-Guide.html: devdoc/dev-doc.sgml $(DOCBOOK2HTML) -u -o .. $< mv ../dev-doc.html $@ @@ -106,4 +95,4 @@ $(MANDIR)/%: $(MANSGMLDIR)/%.sgml mv $@.temp $@ clean: - rm -f $(MANPAGES) $(MANPAGES_HTML) ../$(HTMLDIR)/*.html ../Samba-HOWTO-Collection.p* ../Samba-Developers-Guide.p* + rm -f $(MANPAGES) $(MANPAGES_HTML) ../htmldocs/*.html ../Samba-HOWTO-Collection.pdf ../Samba-HOWTO-Collection.ps diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.sgml index 5191ddcb93..c1ffb735ba 100644 --- a/docs/docbook/devdoc/dev-doc.sgml +++ b/docs/docbook/devdoc/dev-doc.sgml @@ -8,8 +8,6 @@ <!ENTITY CodingSuggestions SYSTEM "CodingSuggestions.sgml"> <!ENTITY Tracing SYSTEM "Tracing.sgml"> <!ENTITY cifsntdomain SYSTEM "cifsntdomain.sgml"> -<!ENTITY printing SYSTEM "printing.sgml"> -<!ENTITY wins SYSTEM "wins.sgml"> ]> <book id="Samba-Developer-Documentation"> @@ -27,7 +25,7 @@ <title>Abstract</title> <para> -<emphasis>Last Update</emphasis> : Mon Sep 30 15:23:53 CDT 2002 +<emphasis>Last Update</emphasis> : Mon aug 26 12:41:19 CEST 2002 </para> <para> @@ -60,7 +58,5 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u &unix-smb; &Tracing; &cifsntdomain; -&printing; -&wins; </book> diff --git a/docs/docbook/devdoc/internals.sgml b/docs/docbook/devdoc/internals.sgml index 982cfd2e10..79524347b6 100644 --- a/docs/docbook/devdoc/internals.sgml +++ b/docs/docbook/devdoc/internals.sgml @@ -26,7 +26,6 @@ telling if a particular char* is in dos codepage or unix codepage. This led to a nightmare of code that tried to cope with particular cases without handlingt the general case. </para> -</sect1> <sect1> <title>The new functions</title> diff --git a/docs/docbook/devdoc/parsing.sgml b/docs/docbook/devdoc/parsing.sgml index 8d929617f5..0121935d26 100644 --- a/docs/docbook/devdoc/parsing.sgml +++ b/docs/docbook/devdoc/parsing.sgml @@ -196,7 +196,7 @@ terminating character, and the rest of the line is ignored. The lines <section> :== <section header> { <parameter line> } <section header> :== '[' NAME ']' <parameter line> :== NAME '=' VALUE NL -</programlisting></para> +</programlisting><para> <para>Basically, this means that</para> diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index c0893f1005..d22ed39de5 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -656,9 +656,8 @@ <listitem><para><link linkend="LDAPFILTER"><parameter>ldap filter</parameter></link></para></listitem> <listitem><para><link linkend="LDAPSSL"><parameter>ldap ssl</parameter></link></para></listitem> <listitem><para><link linkend="LDAPSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem> - <listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap user suffix</parameter></link></para></listitem> - <listitem><para><link linkend="LDAPMACHINESUFFIX"><parameter>ldap machine suffix</parameter></link></para></listitem> - <listitem><para><link linkend="LDAPPASSWDSYNC"><parameter>ldap passwd sync</parameter></link></para></listitem> + <listitem><para><link linkend="LDAPUSERSUFFIX"><parameter>ldap suffix</parameter></link></para></listitem> + <listitem><para><link linkend="LDAPMACHINESUFFIX"><parameter>ldap suffix</parameter></link></para></listitem> <listitem><para><link linkend="LMANNOUNCE"><parameter>lm announce</parameter></link></para></listitem> <listitem><para><link linkend="LMINTERVAL"><parameter>lm interval</parameter></link></para></listitem> @@ -1139,16 +1138,7 @@ <varlistentry><term><anchor id="ADDGROUPSCRIPT">add group script (G)</term> <listitem><para>This is the full pathname to a script that will - be run <emphasis>AS ROOT</emphasis> by <ulink - url="smbd.8.html">smbd(8)</ulink> when a new group is - requested. It will expand any - <parameter>%g</parameter> to the group name passed. - This script is only useful for installations using the - Windows NT domain administration tools. The script is - free to create a group with an arbitrary name to - circumvent unix group name restrictions. In that case - the script must print the numeric gid of the created - group on stdout. + be run <emphasis>AS ROOT</emphasis> by <ulink url="smbd.8.html">smbd(8)</ulink> when a new group is requested. It will expand any <parameter>%g</parameter> to the group name passed. This script is only useful for installations using the Windows NT domain administration tools. </para></listitem> </varlistentry> @@ -3494,16 +3484,13 @@ <para> The <parameter>ldap ssl</parameter> can be set to one of three values: - </para> - <itemizedlist> - <listitem><para><parameter>On</parameter> = Always use SSL when contacting the - <parameter>ldap server</parameter>.</para></listitem> - - <listitem><para><parameter>Off</parameter> = Never use SSL when querying the directory.</para></listitem> - - <listitem><para><parameter>Start_tls</parameter> = Use the LDAPv3 StartTLS extended operation - (RFC2830) for communicating with the directory server.</para></listitem> - </itemizedlist> + (a) <constant>on</constant> - Always use SSL when contacting the + <parameter>ldap server</parameter>, (b) <constant>off</constant> - + Never use SSL when querying the directory, or (c) <constant>start_tls</constant> + - Use the LDAPv3 StartTLS extended operation + (RFC2830) for communicating with the directory server. + </para> + <para>Default : <command>ldap ssl = on</command></para> </listitem> @@ -3546,29 +3533,7 @@ </listitem> </varlistentry> - <varlistentry> - <term><anchor id="LDAPPASSWDSYNC">ldap passwd sync (G)</term> - <listitem><para>This option is used to define whether - or not Samba should sync the LDAP password with the NT - and LM hashes for normal accounts (NOT for - workstation, server or domain trusts) on a password - change via SAMBA. - </para> - <para> - The <parameter>ldap passwd sync</parameter> can be set to one of three values: - </para> - <itemizedlist> - <listitem><para><parameter>Yes</parameter> = Try to update the LDAP, NT and LM passwords and update the pwdLastSet time.</para></listitem> - - <listitem><para><parameter>No</parameter> = Update NT and LM passwords and update the pwdLastSet time.</para></listitem> - - <listitem><para><parameter>Only</parameter> = Only update the LDAP password and let the LDAP server do the rest.</para></listitem> - </itemizedlist> - - <para>Default : <command>ldap passwd sync = no</command></para> - </listitem> - </varlistentry> |