Add an attributions page to the Developers Guide as well

(This used to be commit de132bf201add9628c966a0da549e5fa668fb11a)

4 files changed, 24 insertions, 8 deletions

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 91a543826b..7847dac9e2 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -52,7 +52,7 @@ MANPAGES=$(patsubst %,$(MANDIR)/%,$(MANPAGES_NAMES))
 MANPAGES_HTML=$(patsubst %,$(HTMLDIR)/%.html,$(MANPAGES_NAMES))
 
 PROJDOC_DEPS = $(PROJDOC)/*.xml $(PROJDOC)/attributions.xml
-DEVDOC_DEPS = $(DEVDOC)/*.xml
+DEVDOC_DEPS = $(DEVDOC)/*.xml $(DEVDOC)/attributions.xml
 
 all: 
 	@echo "Supported make targets:"
@@ -177,7 +177,7 @@ $(SMBDOTCONFDOC)/parameters.all.xml: $(SMBDOTCONFDOC)/generate-file-list.sh
 
 $(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
 	@cd $(SMBDOTCONFDOC) && \
-	$(XSLTPROC) --xinclude \
+	@$(XSLTPROC) --xinclude \
 	--param smb.context "'G'" \
 	--output parameters.global.xml \
 	generate-context.xsl parameters.all.xml && \
@@ -185,7 +185,7 @@ $(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SM
 
 $(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
 	@cd $(SMBDOTCONFDOC) && \
-	$(XSLTPROC) --xinclude \
+	@$(XSLTPROC) --xinclude \
 	--param smb.context "'S'" \
 	--output parameters.service.xml \
 	generate-context.xsl parameters.all.xml && \
@@ -199,7 +199,12 @@ $(MANPROJDOC)/smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/p
 $(PROJDOC)/attributions.xml: $(PROJDOC)/samba-doc.xml
 	@echo > $@ # Make sure we don't get recursive dependencies, etc!
 	@echo "Generating attributions page"
-	$(XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+	@$(@XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
+
+$(DEVDOC)/attributions.xml: $(DEVDOC)/dev-doc.xml
+	@echo > $@ # Make sure we don't get recursive dependencies, etc!
+	@echo "Generating attributions page"
+	@$(@XSLTPROC) --output $@ xslt/generate-attributions.xsl $<
 
 $(MANDIR): 
 	mkdir $(MANDIR)
diff --git a/docs/docbook/devdoc/dev-doc.xml b/docs/docbook/devdoc/dev-doc.xml
index d4feff1aa5..cd77a0b810 100644
--- a/docs/docbook/devdoc/dev-doc.xml
+++ b/docs/docbook/devdoc/dev-doc.xml
@@ -47,7 +47,7 @@ the internals of various parts of samba and the SMB protocol. It's still incompl
 The most recent version of this document
 can be found at <ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>.
 Please send updates to <ulink 
-url="mailto:jelmer@samba.org">Jelmer Veenrooij</ulink>.
+url="mailto:jelmer@samba.org">Jelmer Vernooij</ulink>.
 </para>
 
 <para>
@@ -59,6 +59,18 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 
 </dedication>
 
+<legalnotice>
+
+<formalpara>
+	<title>Attributions</title>
+
+	<para>
+	&attributions-dev;
+	</para>
+</formalpara>
+	
+</legalnotice>
+
 <!-- Contents -->
 <toc/>
 
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index f4d2156d68..bd734345b4 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -503,11 +503,10 @@ an Active Directory environment.
 <!ENTITY WINBIND SYSTEM "projdoc/winbind.xml">
 <!ENTITY ClientConfig SYSTEM "projdoc/WindowsClientConfig.xml">
 <!ENTITY locking SYSTEM "projdoc/locking.xml">
-<!ENTITY pdb-mysql SYSTEM "projdoc/pdb_mysql.xml">
-<!ENTITY pdb.xml SYSTEM "projdoc/pdb.xml.xml">
 <!ENTITY problems SYSTEM "projdoc/Problems.xml">
 <!ENTITY unicode SYSTEM "projdoc/unicode.xml">
 <!ENTITY attributions SYSTEM "projdoc/attributions.xml">
+<!ENTITY attributions-dev SYSTEM "devdoc/attributions.xml">
 
 <!ENTITY not.implemented "<note><para>Currently NOT implemented.</para></note>">
 <!ENTITY rootprompt "<prompt>root# </prompt>">
diff --git a/docs/docbook/projdoc/winbind.xml b/docs/docbook/projdoc/winbind.xml
index 4b2951805e..48f3e5e34d 100644
--- a/docs/docbook/projdoc/winbind.xml
+++ b/docs/docbook/projdoc/winbind.xml
@@ -1149,7 +1149,7 @@ configured in the pam.conf.
 		we require the C library of the target operating system to 
 		support the Name Service Switch and Pluggable Authentication
 		Modules systems. This is becoming more common as NSS and 
-		PAM gain	support among UNIX vendors.</para></listitem>
+		PAM gain support among UNIX vendors.</para></listitem>
 		
 		<listitem><para>The mappings of Windows NT RIDs to UNIX ids 
 		is not made algorithmically and depends on the order in which