r12209: Fix some issues with XML entities.

(This used to be commit 754e51b19d2d1fd6be8e01d62b6ec892688f934c)

18 files changed, 63 insertions, 31 deletions

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 1183fe9497..d3fcbd1370 100644
--- 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 c89a7df520..1729c4ac63 100644
--- 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 d9ed135f20..d6223b0743 100644
--- 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 0b3122ab32..11ed847b75 100644
--- 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 2f98f9d427..51ae18e685 100644
--- 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 0b5c63a17a..e2b2fd053f 100644
--- 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 e39f74fffa..e936746ed7 100644
--- 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 32456243af..b0480ca366 100644
--- 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 8361aa97ff..f940526a72 100644
--- 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 d4d9d75b91..0e237bfece 100644
--- 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 f1792d8bc9..c04bad9e66 100644
--- 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 fbfff86b09..edec729120 100644
--- 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 7fc0de2721..98e58070d1 100644
--- 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 377d2f2e96..8f7f314ec6 100644
--- 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 5b386fdeb2..37d056af53 100644
--- 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 3dad70bb04..170450bc08 100644
--- 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 1c0ac9485f..194c0d3fb9 100644
--- 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 55ac95491a..a9caa371e5 100644
--- 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>