r12209: Fix some issues with XML entities.

(This used to be commit 754e51b19d2d1fd6be8e01d62b6ec892688f934c)

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 1183fe9497927a68b3ce1261e8e232633cbeeacd..d3fcbd1370bcd616224a531bc19ed1044f49667a 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,6 +1,7 @@
 - split up proto.h into headers with public or private prototypes. 
   Public prototypes can be marked with _PUBLIC_ in the source
 - never install -rpath binaries / libraries, always relink before install
+ - keep files without -rpath in bin/install
 - init functions may be called more then once as different libraries 
  (in Samba or other projects) can use the same (3rd) library.
 - add register function to smbtorture

diff --git a/source4/gtk/man/gregedit.1.xml b/source4/gtk/man/gregedit.1.xml
index c89a7df520f05e11aa4b0c9ee0482c7be2b3f9cc..1729c4ac6341081c050a93f5d59c7e70e1f1f8af 100644 (file)
--- a/source4/gtk/man/gregedit.1.xml
+++ b/source4/gtk/man/gregedit.1.xml
@@ -63,8 +63,6 @@
        </variablelist>
 </refsect1>
 
-&man.registry.backends;
-
 <refsect1>
        <title>VERSION</title>
 
@@ -79,6 +77,8 @@
 <refsect1>
        <title>AUTHOR</title>
 
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
+
        <para>This manpage and gregedit were written by Jelmer Vernooij. </para>
        
 </refsect1>

diff --git a/source4/lib/ldb/man/ldb.3.xml b/source4/lib/ldb/man/ldb.3.xml
index d9ed135f206976c44d073ef8b5e8ffd753d08cd9..d6223b0743f5615186c3bce6b9bd19a45d25c67f 100644 (file)
--- a/source4/lib/ldb/man/ldb.3.xml
+++ b/source4/lib/ldb/man/ldb.3.xml
@@ -241,7 +241,7 @@ ldb_search(3) manual pages.
 </refsect1>
 
 <refsect1>
-       <title>description</title>
+       <title>DESCRIPTION</title>
 
        <para>
                ldb was written by 

diff --git a/source4/lib/ldb/man/ldbadd.1.xml b/source4/lib/ldb/man/ldbadd.1.xml
index 0b3122ab327df3071460e8f957237ca09090ddac..11ed847b75ee30bf8ff8d6edee6359d4fe2af09b 100644 (file)
--- a/source4/lib/ldb/man/ldbadd.1.xml
+++ b/source4/lib/ldb/man/ldbadd.1.xml
@@ -88,9 +88,15 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
 
-       <para>ldbadd was written by Andrew Tridgell.</para>
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
 
        <para>This manpage was written by Jelmer Vernooij.</para>
        

diff --git a/source4/lib/ldb/man/ldbdel.1.xml b/source4/lib/ldb/man/ldbdel.1.xml
index 2f98f9d427ba418f00e5643e2c695cae9ec5460d..51ae18e6855b758db746feaaffae855e2ade4534 100644 (file)
--- a/source4/lib/ldb/man/ldbdel.1.xml
+++ b/source4/lib/ldb/man/ldbdel.1.xml
@@ -86,7 +86,15 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+               <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
+
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
 
        <para>ldbdel was written by Andrew Tridgell.</para>
 

diff --git a/source4/lib/ldb/man/ldbedit.1.xml b/source4/lib/ldb/man/ldbedit.1.xml
index 0b5c63a17a87a2e435ae1da9bbba2f232624842a..e2b2fd053f93747e743e616361b60dedf3659c4e 100644 (file)
--- a/source4/lib/ldb/man/ldbedit.1.xml
+++ b/source4/lib/ldb/man/ldbedit.1.xml
@@ -114,9 +114,15 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
 
-       <para>ldbedit was written by Andrew Tridgell.</para>
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
 
        <para>This manpage was written by Jelmer Vernooij.</para>
        

diff --git a/source4/lib/ldb/man/ldbmodify.1.xml b/source4/lib/ldb/man/ldbmodify.1.xml
index e39f74fffaffdcab0cd004e06252e1a6be294c19..e936746ed7c0f0d17b4b812884dffaa343194e7f 100644 (file)
--- a/source4/lib/ldb/man/ldbmodify.1.xml
+++ b/source4/lib/ldb/man/ldbmodify.1.xml
@@ -76,9 +76,15 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
 
-       <para>ldbmodify was written by Andrew Tridgell.</para>
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
 
        <para>This manpage was written by Jelmer Vernooij.</para>
        

diff --git a/source4/lib/ldb/man/ldbrename.1.xml b/source4/lib/ldb/man/ldbrename.1.xml
index 32456243af295aba953158de0d8eaa7f70bbf3e6..b0480ca3667c35a3579d4d8d3f2f3cd77f591c06 100644 (file)
--- a/source4/lib/ldb/man/ldbrename.1.xml
+++ b/source4/lib/ldb/man/ldbrename.1.xml
@@ -90,9 +90,15 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
 
-       <para>ldbrename was written by Andrew Tridgell.</para>
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
 
        <para>This manpage was written by Jelmer Vernooij.</para>
        

diff --git a/source4/lib/ldb/man/ldbsearch.1.xml b/source4/lib/ldb/man/ldbsearch.1.xml
index 8361aa97ffc75c262ed792557e9ba10854d346d7..f940526a72a8d9c0bf809d03d675f9113f58f21f 100644 (file)
--- a/source4/lib/ldb/man/ldbsearch.1.xml
+++ b/source4/lib/ldb/man/ldbsearch.1.xml
@@ -102,9 +102,15 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para> ldb was written by 
+                <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+       </para>
 
-       <para>ldbsearch was written by Andrew Tridgell.</para>
+       <para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+       </para>
 
        <para>This manpage was written by Jelmer Vernooij.</para>
        

diff --git a/source4/lib/registry/man/regdiff.1.xml b/source4/lib/registry/man/regdiff.1.xml
index d4d9d75b9126c9f42a92a5ef222870d2addc20e7..0e237bfecee5ae051255ad0e870dc0ecfdc006a3 100644 (file)
--- a/source4/lib/registry/man/regdiff.1.xml
+++ b/source4/lib/registry/man/regdiff.1.xml
@@ -75,8 +75,6 @@
        </variablelist>
 </refsect1>
 
-&man.registry.backends;
-
 <refsect1>
        <title>VERSION</title>
 
@@ -93,7 +91,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
        
        <para>This manpage and regdiff were written by Jelmer Vernooij. </para>
        

diff --git a/source4/lib/registry/man/regpatch.1.xml b/source4/lib/registry/man/regpatch.1.xml
index f1792d8bc9ff74443711d6c6681d57b4cfed759f..c04bad9e66d24be193ca9e955792e94601f34893 100644 (file)
--- a/source4/lib/registry/man/regpatch.1.xml
+++ b/source4/lib/registry/man/regpatch.1.xml
@@ -61,8 +61,6 @@
        </variablelist>
 </refsect1>
 
-&man.registry.backends;
-
 <refsect1>
        <title>VERSION</title>
 
@@ -79,7 +77,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
        
        <para>This manpage and regpatch were written by Jelmer Vernooij. </para>
        

diff --git a/source4/lib/registry/man/regshell.1.xml b/source4/lib/registry/man/regshell.1.xml
index fbfff86b09cc57da6f37a91647ba72945352fe37..edec729120d5ccb662392979857329b22b9e3ead 100644 (file)
--- a/source4/lib/registry/man/regshell.1.xml
+++ b/source4/lib/registry/man/regshell.1.xml
@@ -127,8 +127,6 @@
        </variablelist>
 </refsect1>
 
-&man.registry.backends;
-
 <refsect1>
        <title>EXAMPLES</title>
 
@@ -179,7 +177,7 @@ HKEY_CURRENT_USER\AppEvents> <userinput>exit</userinput>
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
        
        <para>This manpage and regshell were written by Jelmer Vernooij. </para>
        

diff --git a/source4/lib/registry/man/regtree.1.xml b/source4/lib/registry/man/regtree.1.xml
index 7fc0de2721591f01bed68a16f36dd95bdcf0e888..98e58070d196b55f49de58ed0b762582351facf2 100644 (file)
--- a/source4/lib/registry/man/regtree.1.xml
+++ b/source4/lib/registry/man/regtree.1.xml
@@ -73,9 +73,6 @@
        
 </refsect1>
 
-
-&man.registry.backends;
-
 <refsect1>
        <title>VERSION</title>
 
@@ -92,7 +89,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
        
        <para>This manpage and regtree were written by Jelmer Vernooij. </para>
        

diff --git a/source4/torture/man/gentest.1.xml b/source4/torture/man/gentest.1.xml
index 377d2f2e967d2dafee6795c656c70e34f9a55620..8f7f314ec640baf695ad0ed843744a5ee206b971 100644 (file)
--- a/source4/torture/man/gentest.1.xml
+++ b/source4/torture/man/gentest.1.xml
@@ -149,6 +149,8 @@
 <refsect1>
        <title>AUTHOR</title>
 
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
+
        <para>gentest was written by Andrew Tridgell.</para>
 
        <para>This manpage was written by Jelmer Vernooij.</para>

diff --git a/source4/torture/man/locktest.1.xml b/source4/torture/man/locktest.1.xml
index 5b386fdeb24fd5ebd1e43763c70d0654da37cc98..37d056af5322450a8e39d8c970d52b2037624cfd 100644 (file)
--- a/source4/torture/man/locktest.1.xml
+++ b/source4/torture/man/locktest.1.xml
@@ -146,7 +146,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
 
        <para>locktest was written by Andrew Tridgell.</para>
 

diff --git a/source4/torture/man/masktest.1.xml b/source4/torture/man/masktest.1.xml
index 3dad70bb043a9b8f4148ceec9ebe90242bbc50fa..170450bc087a6860b94830d7dacf3cf6dfc0b2e7 100644 (file)
--- a/source4/torture/man/masktest.1.xml
+++ b/source4/torture/man/masktest.1.xml
@@ -128,7 +128,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
 
        <para>masktest was written by Andrew Tridgell.</para>
 

diff --git a/source4/torture/man/smbtorture.1.xml b/source4/torture/man/smbtorture.1.xml
index 1c0ac9485f5a7ac572b6a8343336040698bec195..194c0d3fb93d108a4369f4fb3678f4c55282a038 100644 (file)
--- a/source4/torture/man/smbtorture.1.xml
+++ b/source4/torture/man/smbtorture.1.xml
@@ -161,7 +161,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
 
        <para>smbtorture was written by Andrew Tridgell.</para>
 

diff --git a/source4/utils/man/ndrdump.1.xml b/source4/utils/man/ndrdump.1.xml
index 55ac95491a63b36da5084e1657712d55a2bf6304..a9caa371e57c7b64c3204b005e164593f4307d90 100644 (file)
--- a/source4/utils/man/ndrdump.1.xml
+++ b/source4/utils/man/ndrdump.1.xml
@@ -72,7 +72,7 @@
 <refsect1>
        <title>AUTHOR</title>
 
-       &man.credits.samba;
+       <para>This utility is part of the <ulink url="http://www.samba.org/">Samba</ulink> suite, which is developed by the global <ulink url="http://www.samba.org/samba/team/">Samba Team</ulink>.</para>
 
        <para>ndrdump was written by Andrew Tridgell. </para>