diff options
Diffstat (limited to 'docs')
36 files changed, 522 insertions, 420 deletions
diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in index 7169cc90c4..030729cec4 100644 --- a/docs/docbook/Makefile.in +++ b/docs/docbook/Makefile.in @@ -126,18 +126,18 @@ $(TXTDIR)/%.txt: %.xml # Adobe PDF files $(PDFDIR)/%.pdf: %.tex - $(PDFLATEX) $< - $(PDFLATEX) $< - $(PDFLATEX) $< + -$(PDFLATEX) $< + -$(PDFLATEX) $< + -$(PDFLATEX) $< mv $(patsubst %.tex,%.pdf,$<) $@ epsimages: $(PROJDOC_IMAGES_EPS) # DVI files $(DVIDIR)/%.dvi: %.tex epsimages - $(LATEX) $< - $(LATEX) $< - $(LATEX) $< + -$(LATEX) $< + -$(LATEX) $< + -$(LATEX) $< mv $(patsubst %.tex,%.dvi,$<) $@ %.eps: %.png diff --git a/docs/docbook/devdoc/dev-doc.xml b/docs/docbook/devdoc/dev-doc.xml index e112a0f9e1..7000d09c98 100644 --- a/docs/docbook/devdoc/dev-doc.xml +++ b/docs/docbook/devdoc/dev-doc.xml @@ -20,7 +20,6 @@ <!ENTITY contributing SYSTEM "contributing.xml"> <!ENTITY vfs SYSTEM "vfs.xml"> <!ENTITY windows-deb SYSTEM "windows-debug.xml"> -<!ENTITY registry SYSTEM "registry.xml"> ]> <book id="Samba-Developers-Guide"> @@ -83,7 +82,6 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u &rpc-plugin; &vfs; &packagers; -®istry; &contributing; </book> diff --git a/docs/docbook/devdoc/modules.xml b/docs/docbook/devdoc/modules.xml index 171ee27f90..3adf130911 100644 --- a/docs/docbook/devdoc/modules.xml +++ b/docs/docbook/devdoc/modules.xml @@ -7,7 +7,14 @@ <address><email>jelmer@samba.org</email></address> </affiliation> </author> - <pubdate> 19 March 2003 </pubdate> + <author> + <firstname>Stefan</firstname><surname>Metzmacher</surname> + <affiliation> + <address><email>metze@metzemix.de</email></address> + </affiliation> + <contrib>events interface</contrib> + </author> + <pubdate> 17 September 2003 </pubdate> </chapterinfo> <title>Modules</title> @@ -161,4 +168,161 @@ be used as probing will most likely disappear in the future.</para> </sect2> </sect1> + +<sect1> +<title>Registration of events</title> + +<sect2> +<title>Intention</title> + +<para> +For some modules it is necessary to drop idle database connections, +or do other things periodically. +Some modules need to do close database connections or similar things +when the server exits. +</para> + +</sect2> + +<sect2> +<title>Advantages</title> + +<para> +The event registration system has the following advantages: +</para> + +<simplelist> +<member>Every module is able to register/unregister idle or exit handlers called from the main server loop</member> +<member>No need for hacking the main server anymore</member> +</simplelist> + +</sect2> + +<sect2> +<title>General stuff</title> + +<para> +Each event has an event_id of type smb_event_id_t, which identifies the event in its event list. +(Take a look at <filename>include/module.h</filename> and <filename>lib/module.c</filename>.) +There are currently two event types: +</para> + +<simplelist> +<member>idle events</member> +<member>exit events</member> +</simplelist> + +</sect2> + +<sect2> +<title>Type: idle event</title> + +<para> +Idle events are called periodically from the main server loop. +if the specified interval is less or equal than 0, the default SMB_IDLE_EVENT_DEFAULT_INTERVAL (180 s) is used. +if the specified interval is less than SMB_IDLE_EVENT_MIN_INTERVAL (30 s), SMB_IDLE_EVENT_MIN_INTERVAL is used. +In any other case the specified interval is used. +</para> + +<note><para> +the real interval can be differ from the specified interval about up to +/- 30 s. +</para></note> + +<para> +Idle events can be registered via the +<programlisting> +smb_event_id_t smb_register_idle_event(smb_idle_event_fn *fn, void *data, time_t interval); +</programlisting> function. +</para> + +<variablelist> + +<varlistentry><term>fn</term> +<listitem><para> +the function pointer to idle handler function. +this function must have the following prototype! +<programlisting> +void example_idle_event_fn(void **data, time_t *interval, time_t now); +</programlisting> +</para></listitem> +</varlistentry> + +<varlistentry><term>data</term> +<listitem><para>this is a pointer to private data which is passed to the idle function when it's called.</para></listitem> +</varlistentry> + +<varlistentry><term>interval</term> +<listitem><para> +this is a pointer to the time_t interval in witch the idle handler function is called. +the idle handler is able to change it's interval. +</para></listitem> +</varlistentry> +</variablelist> + +<para> +the event_id is returned on succes, on failure SMB_EVENT_ID_INVALID is returned. +</para> + +<para> +Idle events can be unregistered via the +<programlisting> +BOOL smb_unregister_idle_event(smb_event_id_t id); +</programlisting> function. +</para> + +<para> +True is returned on success, False on failure. +</para> + +</sect2> + +<sect2> +<title>Type: exit event</title> + +<para>Exit events are called when the server exits</para> + +<para> +Exit events can be registered via the +<programlisting> +smb_event_id_t smb_register_exit_event(smb_exit_event_fn *fn, void *data); +</programlisting> function. +</para> + +<variablelist> + +<varlistentry><term>fn</term> +<listitem><para> +the function pointer to exit handler function. +this function must have the following prototype! +<programlisting> +void example_exit_event_fn(void **data); +</programlisting> +</para></listitem> +</varlistentry> + +<varlistentry><term>data</term> +<listitem><para>this is a pointer to private data which is passed to the exit function when it's called.</para></listitem> +</varlistentry> + +</variablelist> + +<para> +the event_id is returned on success, on failure SMB_EVENT_ID_INVALID is returned. +</para> + +<para> +Exit events can be unregistered via the +<programlisting> +BOOL smb_unregister_exit_event(smb_event_id_t id); +</programlisting> function. +</para> + +<para> +True is returned on succes, False on failure. +</para> + +</sect2> + +</sect1> + </chapter> diff --git a/docs/docbook/devdoc/registry.xml b/docs/docbook/devdoc/registry.xml deleted file mode 100644 index b331ebce7f..0000000000 --- a/docs/docbook/devdoc/registry.xml +++ /dev/null @@ -1,209 +0,0 @@ -<chapter id="registry"> - <chapterinfo> - &author.jelmer; - <pubdate>24 September 2003</pubdate> - </chapterinfo> - - <title>The registry subsystem</title> - - <sect1><title>Planned backends</title> - -<para> - The new registry subsystem will work with several different backends: -</para> - -<itemizedlist> - <listitem><para>NT4 (NT4 registry files)</para></listitem> - <listitem><para>TDB (Samba TDB files)</para></listitem> - <listitem><para>RPC (Remote Registry over RPC, reg pipe)</para></listitem> - <listitem><para>wine (Wine Registry Files)</para></listitem> - <listitem><para>gconf (The GNOME configuration backend)</para></listitem> -</itemizedlist> - -</sect1> - -<sect1><title>Data structures</title> - -<para> -The following structure describes a registry key: -</para> - -<programlisting> -typedef struct reg_key_s { - char *name; /* Name of the key */ - smb_ucs2_t *class_name; /* Name of key class */ - int type; /* One of REG_ROOT_KEY or REG_SUB_KEY */ - NTTIME last_mod; /* Time last modified */ - struct reg_key_s *owner; - struct key_list_s *sub_keys; /* NULL indicates keys not available in memory, function should be called */ - struct val_list_s *values; /* NULL indicates values not available in memory, function should be called */ - SEC_DESC *security; - REG_HANDLE *handle; /* Pointer to REG_HANDLE this key belongs to */ - void *backend_data; /* Pointer used by the backend */ -} REG_KEY; -</programlisting> - -<para>The following structure describes a registry value:</para> - -<programlisting> -typedef struct val_key_s { - char *name; /* NULL if name not available */ - int data_type; - int data_len; - void *data_blk; /* Might want a separate block */ - REG_HANDLE *handle; /* Pointer to REG_HANDLE this key belongs to */ - void *backend_data; -} REG_VAL; -</programlisting> - -<para>The following structures are used for lists of subkeys or values:</para> - -<programlisting> -/* container for registry subkey names */ -typedef struct key_list_s { - TALLOC_CTX *ctx; - uint32 num_subkeys; - REG_KEY **subkeys; -} REG_KEY_LIST; - -/* container for registry values */ -typedef struct val_list_s { - TALLOC_CTX *ctx; - uint32 num_vals; - REG_VAL **vals; -} REG_VAL_LIST; -</programlisting> - -<para> -And this structure is used for an instance of a registry (a registry file that's opened, a remote registry pipe we're connected to, etc). -</para> - -<programlisting> -typedef struct reg_handle_s { - REGISTRY_OPS *functions; - REG_KEY *root; /* NULL if not available */ - void *backend_data; -} REG_HANDLE; -</programlisting> - -</sect1> - -<sect1> - <title>External interface</title> - -<programlisting> -REG_HANDLE *reg_open(char *backend, char *location, BOOL try_full_load); -REG_KEY *reg_open_key(REG_KEY *parent, char *name); -REG_VAL *reg_key_get_val(REG_KEY *key, char *name); -REG_VAL_LIST *reg_key_get_vals(REG_KEY *key); -REG_KEY_LIST *reg_key_get_subkeys(REG_KEY *key); -BOOL reg_key_del(REG_KEY *key); -BOOL reg_val_del(REG_VAL *val); -BOOL reg_key_add(REG_KEY *parent, REG_KEY *key); -BOOL reg_val_add(REG_KEY *parent, REG_VAL *val): -BOOL reg_val_update(REG_VAL *val); -BOOL reg_key_update(REG_KEY *key); -void reg_free_key(REG_KEY *key); -void reg_free_val(REG_VAL *val); -void reg_free(REG_HANDLE *h); -void reg_free_key_list(REG_KEY_LIST *list): -void reg_free_val_list(REG_VAL_LIST *list): -</programlisting> - -</sect1> - -<sect1> - <title>Utility functions</title> - - <para>The following helper functions are available:</para> - - <programlisting> -void reg_key_list_init( REG_KEY_LIST *ctr ); -int reg_key_list_addkey( REG_KEY_LIST *ctr, const char *keyname ); -int reg_key_list_numkeys( REG_KEY_LIST *ctr ); -char* reg_key_list_specific_key( REG_KEY_LIST *ctr, uint32 key_index ); -void reg_key_list_destroy( REG_KEY_LIST *ctr ); -void reg_val_list_init( REG_VAL_LIST *ctr ); -int reg_val_list_numvals( REG_VAL_LIST *ctr ); -void free_registry_value( REG_VAL *val ); -uint8* regval_data_p( REG_VAL *val ); -int regval_size( REG_VAL *val ); -char* regval_name( REG_VAL *val ); -uint32 regval_type( REG_VAL *val ); -TALLOC_CTX* reg_val_list_getctx( REG_VAL_LIST *val ); -int reg_val_list_addvalue( REG_VAL_LIST *ctr, const char *name, uint16 type, - const char *data_p, size_t size ); -int reg_val_list_copyvalue( REG_VAL_LIST *ctr, REG_VAL *val ); -int reg_val_list_delvalue( REG_VAL_LIST *ctr, const char *name ); -void reg_val_list_destroy( REG_VAL_LIST *ctr ); -</programlisting> - -</sect1> - -<sect1> - <title>Writing backends</title> - -<para>There are basically two ways of reading data from the registry: loading -it all into memory and then working in this copy in memory, or -re-reading/re-opening it every time necessary.</para> - -<para>This interface aims to support both types. </para> - -<para>A registry backend should provide the following functions:</para> - -<programlisting> -typedef struct { - REG_HANDLE *(*open_registry) (const char *location, BOOL try_complete_load); - REG_KEY *(*open_root_key) (REG_HANDLE *); - REG_KEY *(*open_key_rel) (REG_KEY *parent, const char *name); - /* if open_key_abs is set to NULL, a default implementation will be provided. */ - REG_KEY *(*open_key_abs) (REG_HANDLE *, const char *name); - REG_KEY_LIST *(*get_subkeys) (REG_KEY *); - REG_VAL_LIST *(*get_values) (REG_KEY *); - BOOL (*add_key)(REG_KEY *, REG_KEY *); - BOOL (*update_key)(REG_KEY *); - BOOL (*del_key)(REG_KEY *); - BOOL (*add_value)(REG_KEY *, REG_VAL *); - BOOL (*update_value)(REG_VAL *); - BOOL (*del_value)(REG_VAL *); - REG_VAL *(*get_value) (REG_KEY *, const char *name); - /* It is not guaranteed that no data has been stored before save() - * has been called. This function is only useful for backends that - * store the data in memory and then write out the whole registry at once */ - BOOL (*save)(REG_HANDLE *, const char *location); - BOOL (*close_registry) (REG_HANDLE *); - void (*free_key)(REG_KEY *); - void (*free_value)(REG_VAL *); -} REGISTRY_OPS; -</programlisting> - -<para>open_root_key() is optional. It's only called if the - <parameter>root</parameter> field of the REG_HANDLE struct is NULL.</para> - -<para>open_key_abs() is optional. If it's NULL, the frontend will - provide a replacement, using open_key_rel().</para> - -<para>get_values() and get_value() are optional. They're only called if -the <parameter>values</parameter> field of the REG_KEY struct is NULL.</para> - -<para>get_subkeys() and get_key() are optional. THey're only called - if the <parameter>subkeys</parameter> field of the REG_KEY struct is NULL.</para> - -</sect1> - -<sect1><title>Memory allocation</title> - -<para>Okay, so who's responsible for what parts of the memory? </para> - -<para>The memory is basically maintained by the backends. When the user -is finished using a particular structure, it should call the related free -function for the structure it's freeing.</para> - -<para>The backend should then decide what to do with the structure. It may -choose to free it, or, if it's maintaining single copies of everything in -memory, may choose to ignore the free and free it when the registry is closed. -</para> - -</sect1> - -</chapter> diff --git a/docs/docbook/faq/features.xml b/docs/docbook/faq/features.xml index 72a8e9c97f..271310b338 100644 --- a/docs/docbook/faq/features.xml +++ b/docs/docbook/faq/features.xml @@ -290,7 +290,7 @@ Wizzards) can be found at <title>How do I convert between unix and dos text formats?</title> <para> -Jim barry has written an <ulink url="ftp://samba.org/pub/samba/contributed/fixcrlf.zip"> +Jim barry has written an <ulink url="http://samba.org/samba/ftp/contributed/fixcrlf.zip"> excellent drag-and-drop cr/lf converter for windows</ulink>. Just drag your file onto the icon and it converts the file. </para> diff --git a/docs/docbook/faq/sambafaq.xml b/docs/docbook/faq/sambafaq.xml index 3c6fc85916..4476070862 100644 --- a/docs/docbook/faq/sambafaq.xml +++ b/docs/docbook/faq/sambafaq.xml @@ -23,7 +23,7 @@ Samba, the free and very popular SMB server product. An SMB server allows file and printer connections from clients such as Windows, OS/2, Linux and others. Current to version 3.0. Please send any corrections to the samba documentation mailinglist at -<ulink url="mailto:samba-doc@samba.org">samba-doc@samba.org</ulink>. +<ulink url="mailto:samba-docs@samba.org">samba-docs@samba.org</ulink>. This FAQ was based on the old Samba FAQ by Dan Shearer and Paul Blackman, and the old samba text documents which were mostly written by John Terpstra. </para> diff --git a/docs/docbook/manpages/ntlm_auth.1.xml b/docs/docbook/manpages/ntlm_auth.1.xml index 77794f0f3f..d769297c8f 100644 --- a/docs/docbook/manpages/ntlm_auth.1.xml +++ b/docs/docbook/manpages/ntlm_auth.1.xml @@ -34,11 +34,28 @@ <para><command>ntlm_auth</command> is a helper utility that authenticates users using NT/LM authentication. It returns 0 if the users is authenticated successfully and 1 if access was denied. ntlm_auth uses winbind to access - the user and authentication data for a domain. This utility - is only to be used by other programs (currently squid). + the user and authentication data for a domain. This utility + is only indended to be used by other programs (currently squid). </para> </refsect1> +<refsect1> + <title>OPERATIONAL REQUIREMENTS</title> + + <para> + The <citerefentry><refentrytitle>winbindd</refentrytitle> + <manvolnum>8</manvolnum></citerefentry> daemon must be operational + for many of these commands to function.</para> + + <para>Some of these commands also require access to the directory + <filename>winbindd_privileged</filename> in + <filename>$LOCKDIR</filename>. This should be done either by running + this command as root or providing group access + to the <filename>winbindd_privileged</filename> directory. For + security reasons, this directory should not be world-accessable. </para> + +</refsect1> + <refsect1> <title>OPTIONS</title> @@ -47,49 +64,106 @@ <varlistentry> <term>--helper-protocol=PROTO</term> <listitem><para> - Operate as a stdio-based helper - </para></listitem> - </varlistentry> - - <varlistentry> + Operate as a stdio-based helper. Valid helper protocols are: + </para> + <variablelist> + <varlistentry> + <term>squid-2.4-basic</term> + <listitem><para> + Server-side helper for use with Squid 2.4's basic (plaintext) + authentication. </para> + </listitem> + </varlistentry> + <varlistentry> + <term>squid-2.5-basic</term> + <listitem><para> + Server-side helper for use with Squid 2.5's basic (plaintext) + authentication. </para> + </listitem> + </varlistentry> + <varlistentry> + <term>squid-2.5-ntlmssp</term> + <listitem><para> + Server-side helper for use with Squid 2.5's NTLMSSP + authentication. </para> + <para>Requires access to the directory + <filename>winbindd_privileged</filename> in + <filename>$LOCKDIR</filename>. The protocol used is + described here: <ulink + url="http://devel.squid-cache.org/ntlm/squid_helper_protocol.html">http://devel.squid-cache.org/ntlm/squid_helper_protocol.html</ulink> + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>gss-spengo</term> + <listitem><para> + Server-side helper that implements GSS-SPNEGO. This + also uses the same as + <command>squid-2.5-ntlmssp</command> and is described + here: + <ulink + url="http://devel.squid-cache.org/ntlm/squid_helper_protocol.html">http://devel.squid-cache.org/ntlm/squid_helper_protocol.html</ulink> + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term>gss-spengo-client</term> + <listitem><para> + Client-side helper that implements GSS-SPNEGO. This + also uses a protocol similar to the above helpers, but + is currently undocumented. + </para> + </listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> + + <varlistentry> <term>--username=USERNAME</term> <listitem><para> Specify username of user to authenticate </para></listitem> - </varlistentry> - - <varlistentry> + + </varlistentry> + + <varlistentry> <term>--domain=DOMAIN</term> <listitem><para> Specify domain of user to authenticate </para></listitem> - </varlistentry> + </varlistentry> - <varlistentry> + <varlistentry> <term>--workstation=WORKSTATION</term> <listitem><para> Specify the workstation the user authenticated from </para></listitem> - </varlistentry> + </varlistentry> <varlistentry> <term>--challenge=STRING</term> - <listitem><para>challenge (HEX encoded)</para></listitem> + <listitem><para>NTLM challenge (in HEXADECIMAL)</para> + </listitem> </varlistentry> <varlistentry> <term>--lm-response=RESPONSE</term> - <listitem><para>LM Response to the challenge (HEX encoded)</para></listitem> + <listitem><para>LM Response to the challenge (in HEXADECIMAL)</para></listitem> </varlistentry> <varlistentry> <term>--nt-response=RESPONSE</term> - <listitem><para>NT or NTLMv2 Response to the challenge (HEX encoded)</para></listitem> + <listitem><para>NT or NTLMv2 Response to the challenge (in HEXADECIMAL)</para></listitem> </varlistentry> <varlistentry> <term>--password=PASSWORD</term> - <listitem><para>User's plaintext password</para></listitem> + <listitem><para>User's plaintext password</para><para>If + not specified on the command line, this is prompted for when + required. </para></listitem> </varlistentry> <varlistentry> @@ -102,6 +176,14 @@ <listitem><para>Request NT key</para></listitem> </varlistentry> + <varlistentry> + <term>--diagnostics</term> + <listitem><para>Perform Diagnostics on the authentication + chain. Uses the password from <command>--password</command> + or prompts for one.</para> + </listitem> + </varlistentry> + &popt.common.samba; &stdarg.help; @@ -109,6 +191,27 @@ </refsect1> <refsect1> + <title>EXAMPLE SETUP</title> + + <para>To setup ntlm_auth for use by squid 2.5, with both basic and + NTLMSSP authentication, the following + should be placed in the <filename>squid.conf</filename> file. +<programlisting> +auth_param ntlm program ntlm_auth --helper-protocol=squid-2.5-ntlmssp +auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic +auth_param basic children 5 +auth_param basic realm Squid proxy-caching web server +auth_param basic credentialsttl 2 hours +</programlisting></para> + +<note><para>This example assumes that ntlm_auth has been installed into your + path, and that the group permissions on + <filename>winbindd_privileged</filename> are as described above.</para></note> + +</refsect1> + + +<refsect1> <title>VERSION</title> <para>This man page is correct for version 3.0 of the Samba @@ -123,7 +226,8 @@ by the Samba Team as an Open Source project similar to the way the Linux kernel is developed.</para> - <para>The ntlm_auth manpage was written by Jelmer Vernooij.</para> + <para>The ntlm_auth manpage was written by Jelmer Vernooij and + Andrew Bartlett.</para> </refsect1> </refentry> diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml index 72348d44cd..2badb82810 100644 --- a/docs/docbook/projdoc/AccessControls.xml +++ b/docs/docbook/projdoc/AccessControls.xml @@ -346,7 +346,7 @@ drwsrwsrwx 2 maryo gnomes 48 2003-05-12 22:29 muchado08 </para> <para> - An overview of the permissions field can be found in <link linkend="access1"/>. + An overview of the permissions field can be found in <link linkend="access1">the image below</link>. </para> <image id="access1" scale="40"><imagedescription>Overview of UNIX permissions field.</imagedescription><imagefile>access1</imagefile></image> @@ -429,7 +429,7 @@ Before using any of the following options, please refer to the man page for &smb </para> <para> - <link linkend="ugbc"/> enumerates these controls. + <link linkend="ugbc">The table below</link> enumerates these controls. </para> <table frame='all' pgwide='0' id="ugbc"><title>User and Group Based Controls</title> @@ -527,7 +527,7 @@ Before using any of the following options, please refer to the man page for &smb </para> <para> - Refer to <link linkend="fdpbc"/> for information regarding the parameters that may be used to affect file and + Refer to <link linkend="fdpbc">the table below</link> for information regarding the parameters that may be used to affect file and directory permission-based access controls. </para> @@ -619,7 +619,7 @@ Before using any of the following options, please refer to the man page for &smb <para> The following are documented because of the prevalence of administrators creating inadvertent barriers to file - access by not understanding the full implications of &smb.conf; file settings. See <link linkend="mcoc"/>. + access by not understanding the full implications of &smb.conf; file settings. See <link linkend="mcoc">the table below</link>. </para> <table frame='all' id="mcoc"><title>Other Controls</title> @@ -872,7 +872,7 @@ Before using any of the following options, please refer to the man page for &smb </para> <para> - <command><quote>SERVER\user (Long name)</quote></command> + <command>"SERVER\user (Long name)"</command> </para> <para> @@ -1027,10 +1027,10 @@ Before using any of the following options, please refer to the man page for &smb These are: <itemizedlist> - <listitem><smbconfoption><name>security mask</name></smbconfoption></listitem> - <listitem><smbconfoption><name>force security mode</name></smbconfoption></listitem> - <listitem><smbconfoption><name>directory security mask</name></smbconfoption></listitem> - <listitem><smbconfoption><name>force directory security mode</name></smbconfoption></listitem> + <listitem><para><smbconfoption><name>security mask</name></smbconfoption></para></listitem> + <listitem><para><smbconfoption><name>force security mode</name></smbconfoption></para></listitem> + <listitem><para><smbconfoption><name>directory security mask</name></smbconfoption></para></listitem> + <listitem><para><smbconfoption><name>force directory security mode</name></smbconfoption></para></listitem> </itemizedlist> </para> @@ -1187,8 +1187,8 @@ are examples taken from the mailing list in recent times. </screen> </para> - <note><para> - <para>This is the same as doing:</para> + <note> + <para>This is the same as doing: <screen> &prompt;<userinput>chown jack /foodbar</userinput> &prompt;<userinput>chgrp engr /foodbar</userinput> diff --git a/docs/docbook/projdoc/AdvancedNetworkAdmin.xml b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml index 65d50b496e..3534074b2c 100644 --- a/docs/docbook/projdoc/AdvancedNetworkAdmin.xml +++ b/docs/docbook/projdoc/AdvancedNetworkAdmin.xml @@ -53,9 +53,9 @@ on <application>Windows 9x/Me</application> systems. The tools set includes: </para> <itemizedlist> - <listitem>Server Manager</listitem> - <listitem>User Manager for Domains</listitem> - <listitem>Event Viewer</listitem> + <listitem><para>Server Manager</para></listitem> + <listitem><para>User Manager for Domains</para></listitem> + <listitem><para>Event Viewer</para></listitem> </itemizedlist> <para> @@ -219,12 +219,12 @@ There are several opportunities for creating a custom network startup configurat </para> <itemizedlist> - <listitem>No Logon Script.</listitem> - <listitem>Simple universal Logon Script that applies to all users.</listitem> - <listitem>Use of a conditional Logon Script that applies per user or per group attributes.</listitem> - <listitem>Use of Samba's preexec and postexec functions on access to the NETLOGON share to create - a custom logon script and then execute it.</listitem> - <listitem>User of a tool such as KixStart.</listitem> + <listitem><para>No Logon Script.</para></listitem> + <listitem><para>Simple universal Logon Script that applies to all users.</para></listitem> + <listitem><para>Use of a conditional Logon Script that applies per user or per group attributes.</para></listitem> + <listitem><para>Use of Samba's preexec and postexec functions on access to the NETLOGON share to create + a custom logon script and then execute it.</para></listitem> + <listitem><para>User of a tool such as KixStart.</para></listitem> </itemizedlist> <para> @@ -323,8 +323,8 @@ Those wishing to use more elaborate or capable logon processing system should ch </para> <itemizedlist> - <listitem><ulink noescape="1" url="http://www.craigelachi.e.org/rhacer/ntlogon">http://www.craigelachi.e.org/rhacer/ntlogon</ulink></listitem> - <listitem><ulink noescape="1" url="http://www.kixtart.org">http://www.kixtart.org</ulink></listitem> + <listitem><para><ulink noescape="1" url="http://www.craigelachi.e.org/rhacer/ntlogon">http://www.craigelachi.e.org/rhacer/ntlogon</ulink></para></listitem> + <listitem><para><ulink noescape="1" url="http://www.kixtart.org">http://www.kixtart.org</ulink></para></listitem> </itemizedlist> <sect2> diff --git a/docs/docbook/projdoc/Bugs.xml b/docs/docbook/projdoc/Bugs.xml index 15bd14ac1a..a5149342a0 100644 --- a/docs/docbook/projdoc/Bugs.xml +++ b/docs/docbook/projdoc/Bugs.xml @@ -55,7 +55,7 @@ file for correct syntax. </para> <para> -Have you looked through <link linkend="diagnosis"/>? This is extremely important. + Have you looked through <link linkend="diagnosis">diagnosis</link>? This is extremely important. </para> <para> diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml index 5a8e9f5846..adb93dcc9d 100644 --- a/docs/docbook/projdoc/CUPS-printing.xml +++ b/docs/docbook/projdoc/CUPS-printing.xml @@ -151,7 +151,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <title>Simple &smb.conf; Settings for CUPS</title> <para> - To summarize, <link linkend="cups-exam-simple"/> shows simplest printing-related setup for &smb.conf; to enable basic CUPS support: + To summarize, <link linkend="cups-exam-simple">the example below</link> shows simplest printing-related setup for &smb.conf; to enable basic CUPS support: </para> <para><smbconfexample id="cups-exam-simple"> @@ -195,7 +195,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <title>More Complex CUPS &smb.conf; Settings</title> <para> - <link linkend="overridesettings"/> is a slightly more complex printing-related setup + <link linkend="overridesettings">The example below</link> is a slightly more complex printing-related setup for &smb.conf;. It enables general CUPS printing support for all printers, but defines one printer share, which is set up differently. @@ -588,7 +588,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) <para> - <image><imagedescription>Windows printing to a local printer.</imagedescription><imagefile>1small</imagefile></image> + <image id="small1"><imagedescription>Windows printing to a local printer.</imagedescription><imagefile>1small</imagefile></image> </para> </sect2> @@ -681,7 +681,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) </note> <para> - <image><imagedescription>Printing to a PostScript printer.</imagedescription> + <image id="small2"><imagedescription>Printing to a PostScript printer.</imagedescription> <imagefile>2small</imagefile></image> </para> @@ -714,7 +714,7 @@ libcups.so.2 => /usr/lib/libcups.so.2 (0x40123000) </para> <para> - <image><imagedescription>Ghostscript as a RIP for non-postscript printers.</imagedescription> + <image id="small3"><imagedescription>Ghostscript as a RIP for non-postscript printers.</imagedescription> <imagefile>3small</imagefile> </image> </para> @@ -1123,7 +1123,7 @@ print options already embedded into the file. </para> <para> - <image scale="25"><imagedescription>Pre-filtering in CUPS to form PostScript.</imagedescription> + <image id="small4" scale="25"><imagedescription>Pre-filtering in CUPS to form PostScript.</imagedescription> <imagefile>4small</imagefile> </image> </para> @@ -1142,7 +1142,7 @@ stapling and punching it, and so on) into the PostScript file. </para> <para> - <image scale="25"><imagedescription>Adding device-specific print options.</imagedescription> + <image scale="25" id="small5"><imagedescription>Adding device-specific print options.</imagedescription> <imagefile>5small</imagefile> </image> </para> @@ -1183,7 +1183,7 @@ that are able to generate device-specific printer data. </para> <para> - <image scale="25"><imagedescription>PostScript to intermediate raster format.</imagedescription><imagefile>6small</imagefile></image> + <image id="small6" scale="25"><imagedescription>PostScript to intermediate raster format.</imagedescription><imagefile>6small</imagefile></image> </para> <para> @@ -1200,7 +1200,7 @@ than one vendor financing the development of CUPS raster drivers). </para> <para> - <image><imagedescription>CUPS-raster production using Ghostscript.</imagedescription> + <image id="small7"><imagedescription>CUPS-raster production using Ghostscript.</imagedescription> <imagefile>7small</imagefile> </image> </para> @@ -1232,7 +1232,7 @@ that generates PostScript from image formats. The <parameter>imagetoraster</para filter is used to convert directly from image to raster, without the intermediate PostScript stage. It is used more often than the above mentioned pre-filters. A summarizing flowchart of image file -filtering is shown in <link linkend="small8"/>. +filtering is shown in <link linkend="small8">the figure below</link>. </para> <para> @@ -1656,14 +1656,14 @@ output device. CUPS by default ships only a few generic PPDs, but they are good for several hundred printer models. You may not be able to control different paper trays, or you may get larger margins than your -specific model supports. See <link linkend="cups-ppds"/> for summary information. +specific model supports. See <link linkend="cups-ppds">the figure below</link> for summary information. </para> <table frame="all" id="cups-ppds"> <title>PPDs shipped with CUPS</title> <tgroup cols="2" align="left"> <colspec align="left"/> - <colspec align="justify" width="1*"/> + <colspec align="justify" colwidth="1*"/> <thead><row><entry>PPD file</entry><entry>Printer type</entry></row></thead> <tbody> <row><entry>deskjet.ppd</entry><entry>older HP inkjet printers and compatible</entry></row> @@ -1736,8 +1736,8 @@ advantages) than other methods. One other method is the <parameter>cupsomatic/foomatic-rip</parameter> way. Note that <parameter>cupsomatic</parameter> is <emphasis>not</emphasis> made by the CUPS developers. It is an independent contribution to printing development, -made by people from Linuxprinting.org <footnote>see also <ulink - noescape="1" url="http://www.cups.org/cups-help.html">http://www.cups.org/cups-help.html</ulink></footnote>. +made by people from Linuxprinting.org <footnote><para>see also <ulink + noescape="1" url="http://www.cups.org/cups-help.html">http://www.cups.org/cups-help.html</ulink></para></footnote>. <parameter>cupsomatic</parameter> is no longer developed and maintained and is no longer supported. It has now been replaced by <parameter>foomatic-rip</parameter>. <parameter>foomatic-rip</parameter> is a complete re-write @@ -1773,7 +1773,7 @@ installation. Therefore the printfile bypasses the <parameter>pstoraster</parame (and also bypasses the CUPS-raster-drivers <parameter>rastertosomething</parameter>). After Ghostscript finished its rasterization, <parameter>cupsomatic</parameter> hands the rendered file directly to the CUPS backend. The -flowchart in <link linkend="cupsomatic-dia"/> illustrates the difference between native CUPS +flowchart in <link linkend="cupsomatic-dia">the image below</link> illustrates the difference between native CUPS rendering and the <parameter>Foomatic/cupsomatic</parameter> method. </para> </sect2> @@ -1817,7 +1817,7 @@ backend, which transfers the job to the printers.</para></listitem> </itemizedlist> <para> - The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket"/>. + The resulting filter chain, therefore, is as drawn in <link linkend="pdftosocket">the figure below</link>. </para> <image id="pdftosocket"><imagefile>pdftosocket</imagefile><imagedescription>PDF to socket chain.</imagedescription></image> @@ -1866,7 +1866,7 @@ which transfers the job to the printers.</para></listitem> </itemizedlist> <para> -The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb"/>. + The resulting filter chain therefore is as drawn in <link linkend="pdftoepsonusb">the figure below</link>. </para> <image id="pdftoepsonusb"><imagefile>pdftoepsonusb</imagefile><imagedescription>PDF to USB chain.</imagedescription></image> @@ -1994,7 +1994,7 @@ output.</para></listitem> </itemizedlist> <para> -Both print paths are shown in the flowcharts in <link linkend="small11"/> and <link linkend="small12"/>. + Both print paths are shown in the flowcharts in the figures below. </para> </sect2> @@ -2112,7 +2112,7 @@ simply use <smbconfoption><name>printing</name><value>sysv</value></smbconfoptio </para> <para> -<image><imagedescription>Printing via CUPS/Samba server.</imagedescription> +<image id="small13"><imagedescription>Printing via CUPS/Samba server.</imagedescription> <imagefile>13small</imagefile> </image> </para> @@ -2533,9 +2533,9 @@ the Windows NT/2000/XP client. <para> <itemizedlist> - <listitem>cups.hlp</listitem> - <listitem>cupsdrvr.dll</listitem> - <listitem>cupsui.dll</listitem> + <listitem><para>cups.hlp</para></listitem> + <listitem><para>cupsdrvr.dll</para></listitem> + <listitem><para>cupsui.dll</para></listitem> </itemizedlist> </para> @@ -2549,12 +2549,12 @@ different platforms. <para> <itemizedlist> - <listitem>ADFONTS.MFM</listitem> - <listitem>ADOBEPS4.DRV</listitem> - <listitem>ADOBEPS4.HLP</listitem> - <listitem>DEFPRTR2.PPD</listitem> - <listitem>ICONLIB.DLL</listitem> - <listitem>PSMON.DLL</listitem> + <listitem><para>ADFONTS.MFM</para></listitem> + <listitem><para>ADOBEPS4.DRV</para></listitem> + <listitem><para>ADOBEPS4.HLP</para></listitem> + <listitem><para>DEFPRTR2.PPD</para></listitem> + <listitem><para>ICONLIB.DLL</para></listitem> + <listitem><para>PSMON.DLL</para></listitem> </itemizedlist> </para> @@ -2562,9 +2562,9 @@ different platforms. <para> <itemizedlist> - <listitem>ADOBEPS5.DLL</listitem> - <listitem>ADOBEPSU.DLL</listitem> - <listitem>ADOBEPSU.HLP</listitem> + <listitem><para>ADOBEPS5.DLL</para></listitem> + <listitem><para>ADOBEPSU.DLL</para></listitem> + <listitem><para>ADOBEPSU.HLP</para></listitem> </itemizedlist> </para> @@ -3733,7 +3733,7 @@ back. <para> <indexterm significance="preferred"><primary>point 'n' print</primary></indexterm> <screen> -&dosprompt;<userinput>rundll32 printui.dll,PrintUIEntry /in /n <quote>\\sambaserver\mysmbtstprn</quote></userinput> +&dosprompt;<userinput>rundll32 printui.dll,PrintUIEntry /in /n "\\sambaserver\mysmbtstprn"</userinput> </screen></para> <para> @@ -5025,9 +5025,9 @@ for: You can include the required parameters as part of the </para> <itemizedlist> - <listitem><filename>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></listitem> - <listitem><filename>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></listitem> - <listitem><filename>smb://username:password@WINDOWSNETBIOSNAME/printersharename</filename></listitem> + <listitem><para><filename>smb://WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></para></listitem> + <listitem><para><filename>smb://username:password@WORKGROUP/WINDOWSNETBIOSNAME/printersharename</filename></para></listitem> + <listitem><para><filename>smb://username:password@WINDOWSNETBIOSNAME/printersharename</filename></para></listitem> </itemizedlist> <para> diff --git a/docs/docbook/projdoc/Compiling.xml b/docs/docbook/projdoc/Compiling.xml index da28e43859..20f27ce0e5 100644 --- a/docs/docbook/projdoc/Compiling.xml +++ b/docs/docbook/projdoc/Compiling.xml @@ -329,8 +329,8 @@ example of what you would not want to see would be: <para>On Debian, you need to install the following packages:</para> <para> <itemizedlist> - <listitem>libkrb5-dev</listitem> - <listitem>krb5-user</listitem> + <listitem><para>libkrb5-dev</para></listitem> + <listitem><para>krb5-user</para></listitem> </itemizedlist> </para> </sect3> @@ -341,9 +341,9 @@ example of what you would not want to see would be: <para>On Red Hat Linux, this means you should have at least: </para> <para> <itemizedlist> - <listitem>krb5-workstation (for kinit)</listitem> - <listitem>krb5-libs (for linking with)</listitem> - <listitem>krb5-devel (because you are compiling from source)</listitem> + <listitem><para>krb5-workstation (for kinit)</para></listitem> + <listitem><para>krb5-libs (for linking with)</para></listitem> + <listitem><para>krb5-devel (because you are compiling from source)</para></listitem> </itemizedlist> </para> diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml index b528fe9b61..059d586c54 100644 --- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml +++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml @@ -463,12 +463,12 @@ Server, and so on. </emphasis> </para> -<para><note> +<note><para> When Samba is configured to use an LDAP, or other identity management and/or directory service, it is Samba that continues to perform user and machine authentication. It should be noted that the LDAP server does not perform authentication handling in place of what Samba is designed to do. -</note></para> +</para></note> <para> Please refer to <link linkend="samba-pdc"></link>, for more information regarding @@ -867,7 +867,7 @@ may want to create the machine account within a particular organizational unit. this to be done using the following syntax: <screen> &rootprompt; <userinput>kinit Administrator@your.kerberos.REALM</userinput> -&rootprompt; <userinput>net ads join <quote>organizational_unit</quote></userinput> +&rootprompt; <userinput>net ads join "organizational_unit"</userinput> </screen> </para> @@ -925,9 +925,9 @@ be logged in with Kerberos without needing to know a password. If this fails the an encryption type of DES-CBC-MD5? </para> -<para><note> +<note><para> Samba can use both DES-CBC-MD5 encryption as well as ARCFOUR-HMAC-MD5 encoding. -</note></para> +</para></note> </sect2> diff --git a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml index 3e7dca6358..9e9d1a0e01 100644 --- a/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml +++ b/docs/docbook/projdoc/GROUP-MAPPING-HOWTO.xml @@ -165,7 +165,7 @@ <para> <screen> - &rootprompt;<userinput>net groupmap add ntgroup=<quote>Domain Admins</quote> UNIXgroup=domadm</userinput> + &rootprompt;<userinput>net groupmap add ntgroup="Domain Admins" UNIXgroup=domadm</userinput> </screen> </para> @@ -221,10 +221,10 @@ Aliases, and RIDs are shown in <link linkend="WKURIDS"/>. </para> - <para><note> + <note><para> When the <parameter>passdb backend</parameter> uses LDAP (<constant>ldapsam</constant>) it is the admininstrators' responsibility to create the essential Domain Groups, and to assign each its default RID. - </note></para> + </para></note> <para> It is permissible to create any Domain Group that may be necessary, just make certain that the essential diff --git a/docs/docbook/projdoc/NT4Migration.xml b/docs/docbook/projdoc/NT4Migration.xml index b5ba7c1ced..b5e651ae67 100644 --- a/docs/docbook/projdoc/NT4Migration.xml +++ b/docs/docbook/projdoc/NT4Migration.xml @@ -298,7 +298,7 @@ generally fit into three basic categories. <link linkend="majtypes"/> shows the <table frame="all" id="majtypes"><title>The Three Major Site Types</title> <tgroup cols="2"> <colspec align="left"/> - <colspec align="justify" colspec="1*"/> + <colspec align="justify" colwidth="1*"/> <thead> <row><entry>Number of Users</entry><entry>Description</entry></row> </thead> diff --git a/docs/docbook/projdoc/NetworkBrowsing.xml b/docs/docbook/projdoc/NetworkBrowsing.xml index 251b387a05..8b4f9bfd47 100644 --- a/docs/docbook/projdoc/NetworkBrowsing.xml +++ b/docs/docbook/projdoc/NetworkBrowsing.xml @@ -92,12 +92,12 @@ The technologies (or methods) employed in making all of this work include: </para> <itemizedlist> - <listitem>MS Windows machines register their presence to the network.</listitem> - <listitem>Machines announce themselves to other machines on the network.</listitem> - <listitem>One or more machine on the network collates the local announcements.</listitem> - <listitem>The client machine finds the machine that has the collated list of machines.</listitem> - <listitem>The client machine is able to resolve the machine names to IP addresses.</listitem> - <listitem>The client machine is able to connect to a target machine.</listitem> + <listitem><para>MS Windows machines register their presence to the network.</para></listitem> + <listitem><para>Machines announce themselves to other machines on the network.</para></listitem> + <listitem><para>One or more machine on the network collates the local announcements.</para></listitem> + <listitem><para>The client machine finds the machine that has the collated list of machines.</para></listitem> + <listitem><para>The client machine is able to resolve the machine names to IP addresses.</para></listitem> + <listitem><para>The client machine is able to connect to a target machine.</para></listitem> </itemizedlist> <para> @@ -1062,17 +1062,17 @@ are: </para> <itemizedlist> - <listitem>WINS &smbmdash; the best tool.</listitem> - <listitem>LMHOSTS &smbmdash; static and hard to maintain.</listitem> - <listitem>Broadcast &smbmdash; uses UDP and cannot resolve names across remote segments.</listitem> + <listitem><para>WINS &smbmdash; the best tool.</para></listitem> + <listitem><para>LMHOSTS &smbmdash; static and hard to maintain.</para></listitem> + <listitem><para>Broadcast &smbmdash; uses UDP and cannot resolve names across remote segments.</para></listitem> </itemizedlist> <para> Alternative means of name resolution include: </para> <itemizedlist> -<listitem>Static <filename>/etc/hosts</filename> &smbmdash; hard to maintain, and lacks name_type info.</listitem> -<listitem>DNS &smbmdash; is a good choice but lacks essential name_type info.</listitem> +<listitem><para>Static <filename>/etc/hosts</filename> &smbmdash; hard to maintain, and lacks name_type info.</para></listitem> +<listitem><para>DNS &smbmdash; is a good choice but lacks essential name_type info.</para></listitem> </itemizedlist> <para> @@ -1437,7 +1437,7 @@ as shown in <link linkend="brsex3"/>. <tgroup cols="3" align="left"> <colspec align="left"/> <colspec align="left"/> - <colspec align="justify" width="1*"/> + <colspec align="justify" colwidth="1*"/> <thead> <row><entry>Subnet</entry><entry>Browse Master</entry><entry>List</entry></row> diff --git a/docs/docbook/projdoc/Other-Clients.xml b/docs/docbook/projdoc/Other-Clients.xml index 76909e5236..735c858e7c 100644 --- a/docs/docbook/projdoc/Other-Clients.xml +++ b/docs/docbook/projdoc/Other-Clients.xml @@ -48,9 +48,9 @@ For more info on these packages, Samba, and Linux (and other UNIX-based systems) <para>Basically, you need three components:</para> <itemizedlist> - <listitem>The File and Print Client (IBM Peer)</listitem> - <listitem>TCP/IP (Internet support) </listitem> - <listitem>The <quote>NetBIOS over TCP/IP</quote> driver (TCPBEUI)</listitem> + <listitem><para>The File and Print Client (IBM Peer)</para></listitem> + <listitem><para>TCP/IP (Internet support) </para></listitem> + <listitem><para>The <quote>NetBIOS over TCP/IP</quote> driver (TCPBEUI)</para></listitem> </itemizedlist> <para>Installing the first two together with the base operating diff --git a/docs/docbook/projdoc/PolicyMgmt.xml b/docs/docbook/projdoc/PolicyMgmt.xml index fc06ffefb1..74d35a0555 100644 --- a/docs/docbook/projdoc/PolicyMgmt.xml +++ b/docs/docbook/projdoc/PolicyMgmt.xml @@ -339,11 +339,11 @@ Common restrictions that are frequently used include: <para> <indexterm><primary>Account Controls</primary></indexterm> <itemizedlist> - <listitem>Logon hours</listitem> - <listitem>Password aging</listitem> - <listitem>Permitted logon from certain machines only</listitem> - <listitem>Account type (local or global)</listitem> - <listitem>User rights</listitem> + <listitem><para>Logon hours</para></listitem> + <listitem><para>Password aging</para></listitem> + <listitem><para>Permitted logon from certain machines only</para></listitem> + <listitem><para>Account type (local or global)</para></listitem> + <listitem><para>User rights</para></listitem> </itemizedlist> </para> @@ -449,10 +449,10 @@ reboot and as part of the user logon: An ordered list of user GPOs is obtained. The list contents depends on what is configured in respect of: <itemizedlist> - <listitem>Is the user a Domain Member, thus subject to particular policies?</listitem> - <listitem>Loopback enablement, and the state of the loopback policy (Merge or Replace).</listitem> - <listitem>Location of the Active Directory itself.</listitem> - <listitem>Has the list of GPOs changed? No processing is needed if not changed.</listitem> + <listitem><para>Is the user a Domain Member, thus subject to particular policies?</para></listitem> + <listitem><para>Loopback enablement, and the state of the loopback policy (Merge or Replace).</para></listitem> + <listitem><para>Location of the Active Directory itself.</para></listitem> + <listitem><para>Has the list of GPOs changed? No processing is needed if not changed.</para></listitem> </itemizedlist> </para></listitem> diff --git a/docs/docbook/projdoc/Problems.xml b/docs/docbook/projdoc/Problems.xml index 2058b6867f..23da205292 100644 --- a/docs/docbook/projdoc/Problems.xml +++ b/docs/docbook/projdoc/Problems.xml @@ -236,13 +236,13 @@ If you do post a message to one of the lists, please observe the following guide <listitem><para>In addition to the version, if you obtained Samba via CVS, mention the date when you last checked it out.</para></listitem> - <listitem><para> Try and make your questions clear and brief. Lots of long, + <listitem><para>Try and make your questions clear and brief. Lots of long, convoluted questions get deleted before they are completely read! Do not post HTML encoded messages. Most people on mailing lists simply delete them. </para></listitem> - <listitem><para> If you run one of those nifty <quote>I'm on holidays</quote> things when + <listitem><para>If you run one of those nifty <quote>I'm on holidays</quote> things when you are away, make sure its configured to not answer mailing list traffic. Auto-responses to mailing lists really irritate the thousands of people who end up having to deal with such bad netiquet bahavior. @@ -262,7 +262,7 @@ If you do post a message to one of the lists, please observe the following guide <listitem><para>If you have a complete Netmon trace (from the opening of the pipe to the error), you can send the *.CAP file as well.</para></listitem> - ` + <listitem><para>Please think carefully before attaching a document to an email. Consider pasting the relevant parts into the body of the message. The Samba mailing lists go to a huge number of people. Do they all need a copy of your diff --git a/docs/docbook/projdoc/ProfileMgmt.xml b/docs/docbook/projdoc/ProfileMgmt.xml index 7171884410..7e70158c13 100644 --- a/docs/docbook/projdoc/ProfileMgmt.xml +++ b/docs/docbook/projdoc/ProfileMgmt.xml @@ -408,7 +408,7 @@ workstation as follows: </para> <note><para>You will need to log on if a logon box opens up. For example, connect as <replaceable>DOMAIN</replaceable>\root, password: - <replaceable>mypassword</replaceable>.</para></note> </step> + <replaceable>mypassword</replaceable>.</para></note></step> <step><para> To make the profile capable of being used by anyone, select <quote>Everyone</quote>. </para></step> @@ -424,7 +424,7 @@ workstation as follows: </para> <note><para> Under Windows NT/200x, the use of mandatory profiles forces the use of MS Exchange storage of mail data and keeps it out of the desktop profile. That keeps desktop profiles from becoming unusable. -</para> </note> +</para></note> <sect4> <title>Windows XP Service Pack 1</title> @@ -830,7 +830,7 @@ since it will involve copying a new default profile to every MS Windows 200x/XP exists there it will copy this to the workstation to the <filename>C:\Documents and Settings\</filename> under the Windows login name of the user. </para> -<note> <para> This path translates, in Samba parlance, to the &smb.conf; +<note><para> This path translates, in Samba parlance, to the &smb.conf; <smbconfsection>[NETLOGON]</smbconfsection> share. The directory should be created at the root of this share and must be called <filename>Default Profile</filename>. </para> </note> @@ -968,9 +968,9 @@ per-user settings using the Domain User Manager (as with MS Windows NT4/ Win 200 <para> In any case, you can configure only one profile per user. That profile can be either: </para> <itemizedlist> - <listitem>A profile unique to that user.</listitem> - <listitem>A mandatory profile (one the user cannot change).</listitem> - <listitem>A group profile (really should be mandatory, that is unchangable).</listitem> + <listitem><para>A profile unique to that user.</para></listitem> + <listitem><para>A mandatory profile (one the user cannot change).</para></listitem> + <listitem><para>A group profile (really should be mandatory, that is unchangable).</para></listitem> </itemizedlist> </sect2> diff --git a/docs/docbook/projdoc/SWAT.xml b/docs/docbook/projdoc/SWAT.xml index 346fe86948..e25b6470b5 100644 --- a/docs/docbook/projdoc/SWAT.xml +++ b/docs/docbook/projdoc/SWAT.xml @@ -351,7 +351,7 @@ and the SSL connection is up. SWAT can be configured to display its messages to match the settings of the language configurations of your Web browser. It will be passed to SWAT in the Accept-Language header of the HTTP request. -<para> +</para> <para> To enable this feature: @@ -391,7 +391,7 @@ and so on. If you find a mistake or create a new <command>msg</command> file, pl to us so we will include this in the next release of Samba. </para> -</para> +<para> Note that if you enable this feature and the <smbconfoption><name>display charset</name></smbconfoption> is not matched to your browser's setting, the SWAT display may be corrupted. In a future version of Samba, SWAT will always display messages with UTF-8 encoding. You will then not need to set diff --git a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml index f86a4d5904..2541d7a485 100644 --- a/docs/docbook/projdoc/Samba-PDC-HOWTO.xml +++ b/docs/docbook/projdoc/Samba-PDC-HOWTO.xml @@ -33,7 +33,7 @@ network clients. <figure id="domain-example"><title>An Example Domain.</title> <mediaobject> -<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/domain" width="4in" height="3in" scalefit="1"/></imageobject> +<imageobject role="latex"><imagedata fileref="projdoc/imagefiles/domain" width="4in" scalefit="1"/></imageobject> <imageobject><imagedata fileref="projdoc/imagefiles/domain.png" scale="50" scalefit="1"/></imageobject> </mediaobject> </figure> @@ -243,7 +243,7 @@ LDAP-based user and machine account backend. <para> New to Samba-3 is the ability to use a backend database that holds the same type of data as -the NT4-style SAM database (one of the registry files)<footnote>See also <link linkend="passdb"/>.</footnote>. +the NT4-style SAM database (one of the registry files)<footnote><para>See also <link linkend="passdb"/>.</para></footnote>. </para> <para> @@ -292,12 +292,12 @@ management requirements. Samba can act as a NT4-style DC in a Windows 2000/XP environment. However, there are certain compromises: <itemizedlist> - <listitem>No machine policy files.</listitem> - <listitem>No Group Policy Objects.</listitem> - <listitem>No synchronously executed AD logon scripts.</listitem> - <listitem>Can't use Active Directory management tools to manage users and machines.</listitem> - <listitem>Registry changes tattoo the main registry, while with AD they do not leave permanent changes in effect.</listitem> - <listitem>Without AD you cannot perform the function of exporting specific applications to specific users or groups.</listitem> + <listitem><para>No machine policy files.</para></listitem> + <listitem><para>No Group Policy Objects.</para></listitem> + <listitem><para>No synchronously executed AD logon scripts.</para></listitem> + <listitem><para>Can't use Active Directory management tools to manage users and machines.</para></listitem> + <listitem><para>Registry changes tattoo the main registry, while with AD they do not leave permanent changes in effect.</para></listitem> + <listitem><para>Without AD you cannot perform the function of exporting specific applications to specific users or groups.</para></listitem> </itemizedlist> </para> @@ -407,7 +407,7 @@ A Domain Controller is an SMB/CIFS server that: It is rather easy to configure Samba to provide these. Each Samba Domain Controller must provide the NETLOGON service that Samba calls the <smbconfoption><name>domain logons</name></smbconfoption> functionality (after the name of the parameter in the &smb.conf; file). Additionally, one server in a Samba-3 -Domain must advertise itself as the Domain Master Browser<footnote>See <link linkend="NetworkBrowsing"/>.</footnote>. +Domain must advertise itself as the Domain Master Browser<footnote><para>See <link linkend="NetworkBrowsing"/>.</para></footnote>. This causes the Primary Domain Controller to claim a domain-specific NetBIOS name that identifies it as a Domain Master Browser for its given domain or workgroup. Local master browsers in the same domain or workgroup on broadcast-isolated subnets then ask for a complete copy of the browse list for the whole wide area network. @@ -829,7 +829,7 @@ Create a user without the <quote>$</quote>. Then use <command>vipw</command> to the <quote>$</quote>. Or create the whole entry with vipw if you like; make sure you use a unique user login ID. </para> -<para><note>The machine account must have the exact name that the workstation has.</note></para> +<note><para>The machine account must have the exact name that the workstation has.</para></note> <note><para> The UNIX tool <command>vipw</command> is a common tool for directly editing the <filename>/etc/passwd</filename> file. diff --git a/docs/docbook/projdoc/ServerType.xml b/docs/docbook/projdoc/ServerType.xml index c7ee63cef2..f400cdd647 100644 --- a/docs/docbook/projdoc/ServerType.xml +++ b/docs/docbook/projdoc/ServerType.xml @@ -101,15 +101,15 @@ different type of servers:</para> <itemizedlist> <listitem><para>Domain Controller</para> <itemizedlist> - <listitem>Primary Domain Controller</listitem> - <listitem>Backup Domain Controller</listitem> - <listitem>ADS Domain Controller</listitem> + <listitem><para>Primary Domain Controller</para></listitem> + <listitem><para>Backup Domain Controller</para></listitem> + <listitem><para>ADS Domain Controller</para></listitem> </itemizedlist> </listitem> <listitem><para>Domain Member Server</para> <itemizedlist> - <listitem>Active Directory Domain Server</listitem> - <listitem>NT4 Style Domain Domain Server</listitem> + <listitem><para>Active Directory Domain Server</para></listitem> + <listitem><para>NT4 Style Domain Domain Server</para></listitem> </itemizedlist> </listitem> <listitem><para>Stand-alone Server</para></listitem> diff --git a/docs/docbook/projdoc/VFS.xml b/docs/docbook/projdoc/VFS.xml index 58bb64d3ef..90bcff2fd6 100644 --- a/docs/docbook/projdoc/VFS.xml +++ b/docs/docbook/projdoc/VFS.xml @@ -88,10 +88,10 @@ This can be done using a configuration similar to the one shown in <link linkend A simple module to audit file access to the syslog facility. The following operations are logged: <itemizedlist> - <listitem>share</listitem> - <listitem>connect/disconnect</listitem> - <listitem>directory opens/create/remove</listitem> - <listitem>file open/close/rename/unlink/chmod</listitem> + <listitem><para>share</para></listitem> + <listitem><para>connect/disconnect</para></listitem> + <listitem><para>directory opens/create/remove</para></listitem> + <listitem><para>file open/close/rename/unlink/chmod</para></listitem> </itemizedlist> </para> diff --git a/docs/docbook/projdoc/locking.xml b/docs/docbook/projdoc/locking.xml index 8bdb06ca8f..c2c0401e30 100644 --- a/docs/docbook/projdoc/locking.xml +++ b/docs/docbook/projdoc/locking.xml @@ -986,11 +986,13 @@ so far: <para> <quote> We are seeing lots of errors in the Samba logs, like: +</quote> <programlisting> tdb(/usr/local/samba_2.2.7/var/locks/locking.tdb): rec_read bad magic 0x4d6f4b61 at offset=36116 </programlisting> +<quote> What do these mean? </quote> </para> diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml index 1e0fcc6e2b..043c452a1f 100644 --- a/docs/docbook/projdoc/passdb.xml +++ b/docs/docbook/projdoc/passdb.xml @@ -106,6 +106,9 @@ as follows: </sect2> +<sect2> +<title>New Backends</title> + <para> Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>tdbsam</secondary></indexterm> @@ -114,9 +117,6 @@ Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>xmlsam</secondary></indexterm> </para> -<sect2> -<title>New Backends</title> - <variablelist> <varlistentry><term>tdbsam</term> <listitem> @@ -279,10 +279,10 @@ Samba-3 introduces a number of new password backend capabilities. </para> <itemizedlist> - <listitem>MS DOS Network client 3.0 with the basic network redirector installed.</listitem> - <listitem>Windows 95 with the network redirector update installed.</listitem> - <listitem>Windows 98 [Second Edition].</listitem> - <listitem>Windows Me.</listitem> + <listitem><para>MS DOS Network client 3.0 with the basic network redirector installed.</para></listitem> + <listitem><para>Windows 95 with the network redirector update installed.</para></listitem> + <listitem><para>Windows 98 [Second Edition].</para></listitem> + <listitem><para>Windows Me.</para></listitem> </itemizedlist> <note> @@ -296,11 +296,11 @@ Samba-3 introduces a number of new password backend capabilities. </para> <itemizedlist> - <listitem>Windows NT 3.5x.</listitem> - <listitem>Windows NT 4.0.</listitem> - <listitem>Windows 2000 Professional.</listitem> - <listitem>Windows 200x Server/Advanced Server.</listitem> - <listitem>Windows XP Professional.</listitem> + <listitem><para>Windows NT 3.5x.</para></listitem> + <listitem><para>Windows NT 4.0.</para></listitem> + <listitem><para>Windows 2000 Professional.</para></listitem> + <listitem><para>Windows 200x Server/Advanced Server.</para></listitem> + <listitem><para>Windows XP Professional.</para></listitem> </itemizedlist> <para> @@ -414,10 +414,9 @@ Samba-3 introduces a number of new password backend capabilities. <indexterm><primary>SAM backend</primary><secondary>ldapsam</secondary></indexterm> <smbconfexample id="idmapbackendexample"> <title>Example configuration with the LDAP idmap backend</title> -<indexterm><primary>SAM backend</primary><secondary>xmlsam</secondary></indexterm> <smbconfsection>[global]</smbconfsection> <smbconfoption><name>idmap backend</name><value>ldapsam:ldap://ldap-server.quenya.org:636</value></smbconfoption> -<smbcomment>Alternately, this could be specified as:</smbcomment> +<smbconfcomment>Alternately, this could be specified as:</smbconfcomment> <smbconfoption><name>idmap backend</name><value>ldapsam:ldaps://ldap-server.quenya.org</value></smbconfoption> </smbconfexample> </para> @@ -495,12 +494,12 @@ be announced in time for the Samba-3.0.1 release. </para> <itemizedlist> - <listitem><emphasis>add</emphasis> user or machine accounts.</listitem> - <listitem><emphasis>delete</emphasis> user or machine accounts.</listitem> - <listitem><emphasis>enable</emphasis> user or machine accounts.</listitem> - <listitem><emphasis>disable</emphasis> user or machine accounts.</listitem> - <listitem><emphasis>set to NULL</emphasis> user passwords.</listitem> - <listitem><emphasis>manage interdomain trust accounts.</emphasis></listitem> + <listitem><para><emphasis>add</emphasis> user or machine accounts.</para></listitem> + <listitem><para><emphasis>delete</emphasis> user or machine accounts.</para></listitem> + <listitem><para><emphasis>enable</emphasis> user or machine accounts.</para></listitem> + <listitem><para><emphasis>disable</emphasis> user or machine accounts.</para></listitem> + <listitem><para><emphasis>set to NULL</emphasis> user passwords.</para></listitem> + <listitem><para><emphasis>manage interdomain trust accounts.</emphasis></para></listitem> </itemizedlist> <para> @@ -563,9 +562,9 @@ be announced in time for the Samba-3.0.1 release. </para> <itemizedlist> - <listitem>add, remove or modify user accounts.</listitem> - <listitem>list user accounts.</listitem> - <listitem>migrate user accounts.</listitem> + <listitem><para>add, remove or modify user accounts.</para></listitem> + <listitem><para>list user accounts.</para></listitem> + <listitem><para>migrate user accounts.</para></listitem> </itemizedlist> <para> @@ -1326,10 +1325,10 @@ access to attrs=lmPassword,ntPassword </para> <itemizedlist> - <listitem>sambaHomePath</listitem> - <listitem>sambaLogonScript</listitem> - <listitem>sambaProfilePath</listitem> - <listitem>sambaHomeDrive</listitem> + <listitem><para>sambaHomePath</para></listitem> + <listitem><para>sambaLogonScript</para></listitem> + <listitem><para>sambaProfilePath</para></listitem> + <listitem><para>sambaHomeDrive</para></listitem> </itemizedlist> <para> @@ -1418,11 +1417,11 @@ access to attrs=lmPassword,ntPassword <para>The <smbconfoption><name>ldap passwd sync</name></smbconfoption> options can have the values shown in <link linkend="ldappwsync"/>.</para> - <table iframe="all" id="ldappwsync"> + <table frame="all" id="ldappwsync"> <title>Possible <emphasis>ldap passwd sync</emphasis> values</title> <tgroup cols="2"> - <colspec align="left" width="1*"/> - <colspec align="justify" width="4*"/> + <colspec align="left" colwidth="1*"/> + <colspec align="justify" colwidth="4*"/> <thead> <row><entry align="left">Value</entry><entry align="center">Description</entry></row> </thead> @@ -1690,10 +1689,7 @@ access to attrs=lmPassword,ntPassword <para> <smbconfblock> - <smbconfsection>[global]</smbconfsection> - <member>...</member> <smbconfoption><name>passdb backend</name><value>smbpasswd, tdbsam</value></smbconfoption> - <member>...</member> </smbconfblock> </para> @@ -1704,10 +1700,10 @@ access to attrs=lmPassword,ntPassword <para> <smbconfblock> -[globals] -... + <smbconfsection>[globals]</smbconfsection> + <member>...</member> <smbconfoption><name>passdb backend</name><value>tdbsam, smbpasswd</value></smbconfoption> -... + <member>...</member> </smbconfblock> </para> diff --git a/docs/docbook/projdoc/printer_driver2.xml b/docs/docbook/projdoc/printer_driver2.xml index c823de28bf..93358df7a1 100644 --- a/docs/docbook/projdoc/printer_driver2.xml +++ b/docs/docbook/projdoc/printer_driver2.xml @@ -2230,9 +2230,6 @@ paragraphs. Your users complain about various issues (such as, <quote>We need to for each job from Letter to A4 and it will not store it.</quote>) </para> -<sect2> -<title>Setting Default Print Options for Client Drivers</title> - <para> The last sentence might be viewed with mixed feelings by some users and admins. They have struggled for hours and could not arrive at a point @@ -2244,8 +2241,8 @@ you to set printer options in three different ways. Here is the definite answer to the Samba default driver setting FAQ: </para> -<formalpara><title><quote>I can not set and save default print options -for all users on Windows 200x/XP. Why not?</quote></title> +<sect2> +<title>Setting Default Print Options for Client Drivers</title> <para> How are you doing it? I bet the wrong way. (It is not easy to find out, though). There are three different @@ -2254,14 +2251,19 @@ dialogs look the same, but only one of them does what you intend. You need to be Administrator or Print Administrator to do this for all users. Here is how I reproduce it in an XP Professional: </para> -The following list needs periods after the letters and numbers::::::::: + +<para> + The following list needs periods after the letters and numbers::::::::: +</para> + +<para> <orderedlist numeration="upperalpha"> <listitem><para>The first <quote>wrong</quote> way: <orderedlist numeration="arabic"> <listitem><para>Open the <guiicon>Printers</guiicon> folder.</para></listitem> <listitem><para>Right-click on the printer (<emphasis>remoteprinter on cupshost</emphasis>) and - select in context menu <guimenu>Printing Preferences...</guimenu></para></listitem>. + select in context menu <guimenu>Printing Preferences...</guimenu></para></listitem> <listitem><para>Look at this dialog closely and remember what it looks like.</para></listitem> </orderedlist></para></listitem> @@ -2275,10 +2277,10 @@ The following list needs periods after the letters and numbers::::::::: <guimenuitem>Properties</guimenuitem></para></listitem> <listitem><para>Click on the <guilabel>General</guilabel> - tab</para></listitem>. + tab</para></listitem> <listitem><para>Click on the <guibutton>Printing - Preferences...</guibutton></para></listitem> button. + Preferences...</guibutton> button.</para></listitem> <listitem><para>A new dialog opens. Keep this dialog open and go back to the parent dialog.</para></listitem> @@ -2309,6 +2311,7 @@ The following list needs periods after the letters and numbers::::::::: </orderedlist> </listitem> </orderedlist> +</para> <para> Do you see any difference in the two settings dialogs? I do not either. However, only the last one, which @@ -2324,7 +2327,7 @@ arrive at when you right-click on the printer and select <guimenuitem>Print Sett is the one that you were taught to use back in the days of Windows NT, so it is only natural to try the same way with Windows 200x/XP. You would not dream that there is now a different path to arrive at an identically looking, but functionally different, dialog to set defaults for all users. -</para></formalpara> +</para> <tip><para>Try (on Windows 200x/XP) to run this command (as a user with the right privileges): </para> diff --git a/docs/docbook/projdoc/upgrading-to-3.0.xml b/docs/docbook/projdoc/upgrading-to-3.0.xml index 4461f0fdcb..cb49f5d95d 100644 --- a/docs/docbook/projdoc/upgrading-to-3.0.xml +++ b/docs/docbook/projdoc/upgrading-to-3.0.xml @@ -51,7 +51,7 @@ See <link linkend="pdbeditthing"/>. The major new features are: </para> -<orderedlist numberation="arabic"> +<orderedlist numeration="arabic"> <listitem><para> Active Directory support. This release is able to join an ADS realm as a member server and authenticate users using LDAP/kerberos. @@ -279,7 +279,7 @@ complete descriptions of new or modified parameters. <itemizedlist> <listitem><para>preload modules </para></listitem> - <listitem><para>privatedir </para></listitem> + <listitem><para>private dir </para></listitem> </itemizedlist> </sect2> @@ -327,7 +327,7 @@ complete descriptions of new or modified parameters. <table frame='all' id="tdbfiledesc"><title>TDB File Descriptions</title> <tgroup cols='3'> <colspec align="left"/> - <colspec align="justify" width="1*"/> + <colspec align="justify" colwidth="1*"/> <colspec align="left"/> <thead> <row> diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml index d460694496..408d1a4f72 100644 --- a/docs/docbook/projdoc/winbind.xml +++ b/docs/docbook/projdoc/winbind.xml @@ -19,8 +19,8 @@ <author> <firstname>John</firstname><surname>Trostel</surname> <affiliation> - <address><email>jtrostel@snapserver.com</email></address> <orgname>SNAP</orgname> + <address><email>jtrostel@snapserver.com</email></address> </affiliation> </author> @@ -576,7 +576,7 @@ linkend="winbindcfg"/>, was modified to include the necessary entries in the [gl <para><smbconfexample id="winbindcfg"> <title>smb.conf for Winbind set-up</title> <smbconfsection>[global]</smbconfsection> - <...> +<member><...></member> <smbconfcomment> separate domain and username with '+', like DOMAIN+username</smbconfcomment> <smbconfoption><name>winbind separator</name><value>+</value></smbconfoption> <smbconfcomment> use uids from 10000 to 20000 for domain users</smbconfcomment> @@ -1209,10 +1209,12 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false <para><quote> But the following command just fails: +</quote> <screen> &rootprompt;<userinput>chown maryo a_file</userinput> chown: `maryo': invalid user </screen> +<quote> This is driving me nuts! What can be wrong? </quote></para> diff --git a/docs/docbook/smbdotconf/logon/abortshutdownscript.xml b/docs/docbook/smbdotconf/logon/abortshutdownscript.xml index e9a7dba792..fcabd33ceb 100644 --- a/docs/docbook/smbdotconf/logon/abortshutdownscript.xml +++ b/docs/docbook/smbdotconf/logon/abortshutdownscript.xml @@ -3,13 +3,13 @@ advanced="1" developer="1" xmlns:samba="http://samba.org/common"> <listitem> - <para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis> + <para> This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> that should stop a shutdown procedure issued by the <link linkend="SHUTDOWNSCRIPT"> <parameter moreinfo="none">shutdown script</parameter></link>.</para> - <para>This command will be run as user.</para> + <para>This command will be run as the user connected to the server.</para> <para>Default: <emphasis>None</emphasis>.</para> diff --git a/docs/docbook/smbdotconf/logon/shutdownscript.xml b/docs/docbook/smbdotconf/logon/shutdownscript.xml index 8935714307..2cbf522586 100644 --- a/docs/docbook/smbdotconf/logon/shutdownscript.xml +++ b/docs/docbook/smbdotconf/logon/shutdownscript.xml @@ -3,7 +3,7 @@ advanced="1" developer="1" xmlns:samba="http://samba.org/common"> <listitem> - <para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis> + <para> This a full path name to a script called by <citerefentry><refentrytitle>smbd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> that should start a shutdown procedure.</para> diff --git a/docs/docbook/smbdotconf/security/privatedir.xml b/docs/docbook/smbdotconf/security/privatedir.xml index 1fc7eb0b36..3529de34ca 100644 --- a/docs/docbook/smbdotconf/security/privatedir.xml +++ b/docs/docbook/smbdotconf/security/privatedir.xml @@ -8,6 +8,6 @@ and <filename moreinfo="none">secrets.tdb</filename>. </para> - <para>Default :<command moreinfo="none">private dir = ${prefix}/private</command></para> + <para>Default: <command moreinfo="none">private dir = ${prefix}/private</command></para> </listitem> </samba:parameter> diff --git a/docs/docbook/smbdotconf/security/serversigning.xml b/docs/docbook/smbdotconf/security/serversigning.xml index 5108918d84..27277f73bf 100644 --- a/docs/docbook/smbdotconf/security/serversigning.xml +++ b/docs/docbook/smbdotconf/security/serversigning.xml @@ -14,6 +14,6 @@ When set to mandatory, SMB signing is required and if set to disabled, SMB signing is not offered either.</para> - <para>Default: <command>client signing = False</command></para> + <para>Default: <command>server signing = False</command></para> </listitem> </samba:parameter> diff --git a/docs/docbook/xslt/expand-sambadoc.xsl b/docs/docbook/xslt/expand-sambadoc.xsl index 2749fdf3e9..098512ce1d 100644 --- a/docs/docbook/xslt/expand-sambadoc.xsl +++ b/docs/docbook/xslt/expand-sambadoc.xsl @@ -301,4 +301,11 @@ </xsl:template> +<xsl:template match="filterline"> + <xsl:element name="programlisting"> + <xsl:apply-templates/> + </xsl:element> +</xsl:template> + + </xsl:stylesheet> diff --git a/docs/docbook/xslt/html-common.xsl b/docs/docbook/xslt/html-common.xsl index dce900ef67..eeb7d5d6b4 100644 --- a/docs/docbook/xslt/html-common.xsl +++ b/docs/docbook/xslt/html-common.xsl @@ -3,6 +3,40 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + <xsl:template match="ulink"> + <xsl:element name="ulink"> + <xsl:attribute name="url"> + <xsl:value-of select="@url"/> + </xsl:attribute> + <xsl:choose> + <xsl:when test=". != ''"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@url"/> + </xsl:otherwise> + </xsl:choose> + </xsl:element> +</xsl:template> + + + +<xsl:template match="link"> + <xsl:element name="link"> + <xsl:attribute name="linkend"> + <xsl:value-of select="@linkend"/> + </xsl:attribute> + <xsl:choose> + <xsl:when test=". != ''"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@linkend"/> + </xsl:otherwise> + </xsl:choose> + </xsl:element> +</xsl:template> + <xsl:param name="base.dir" select="'../htmldocs/'"/> <xsl:param name="bridgehead.in.toc" select="1"/> <xsl:param name="citerefentry.link" select="'1'"/> diff --git a/docs/docbook/xslt/html.xsl b/docs/docbook/xslt/html.xsl index 8481a86d24..1a5fe1bc65 100644 --- a/docs/docbook/xslt/html.xsl +++ b/docs/docbook/xslt/html.xsl @@ -6,4 +6,5 @@ <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/> <xsl:import href="html-common.xsl"/> + </xsl:stylesheet> |