3 files changed, 14 insertions, 40 deletions
diff --git a/docs/docbook/faq/config.sgml b/docs/docbook/faq/config.sgml
index db27102cdf..2c17c86c4e 100644
--- a/docs/docbook/faq/config.sgml
+++ b/docs/docbook/faq/config.sgml
@@ -22,4 +22,16 @@ add users to this database using "smbpasswd -a user-name".
 See also the "User database" chapter of the samba HOWTO Collection.
 </para>
 </sect1>
+
+<sect1>
+<title>How can I make samba use netbios scope ID's</title>
+
+<para>By default Samba uses a blank scope ID. This means 
+all your windows boxes must also have a blank scope ID. 
+If you really want to use a non-blank scope ID then you will 
+need to use the 'netbios scope' smb.conf option.
+All your PCs will need to have the same setting for 
+this to work. Scope ID's are not recommended.</para>
+</sect1>
+
 </chapter>
diff --git a/docs/docbook/faq/general.sgml b/docs/docbook/faq/general.sgml
index 3f7c2074f9..54c620b382 100644
--- a/docs/docbook/faq/general.sgml
+++ b/docs/docbook/faq/general.sgml
@@ -35,7 +35,7 @@ unstable, and a series of alpha releases are distributed, for example
 doing.  The "alpha" in the filename will hopefully scare off those who
 are just looking for the latest version to install.</member>
 
-<member>When Andrew thinks that the alphas have stabilised to the point
+<member>When the release manager, currently Jerry, thinks that the alphas have stabilised to the point
 where he would recommend new users install it, he renames it to the
 same version number without the alpha, for example 1.9.16.</member>
 
@@ -128,43 +128,4 @@ Look at <ulink url="http://samba.org/samba/archives.html">the samba mailing list
 </para>
 </sect1>
 
-<sect1>
-<title>Pizza supply details</title>
-<para>
-Those who have registered in the Samba survey as "Pizza Factory" will
-already know this, but the rest may need some help. Andrew doesn't ask
-for payment, but he does appreciate it when people give him
-pizza. This calls for a little organisation when the pizza donor is
-twenty thousand kilometres away, but it has been done.
-</para>
-
-<para>
-Method 1: Ring up your local branch of an international pizza chain
-and see if they honour their vouchers internationally. Pizza Hut do,
-which is how the entire Canberra Linux Users Group got to eat pizza
-one night, courtesy of someone in the US.
-</para>
-
-<para>
-Method 2: Ring up a local pizza shop in Canberra and quote a credit
-card number for a certain amount, and tell them that Andrew will be
-collecting it (don't forget to tell him.) One kind soul from Germany
-did this.
-</para>
-
-<para>
-Method 3: Purchase a pizza voucher from your local pizza shop that has
-no international affiliations and send it to Andrew. It is completely
-useless but he can hang it on the wall next to the one he already has
-from Germany :-)
-</para>
-
-<para>
-Method 4: Air freight him a pizza with your favourite regional
-flavours. It will probably get stuck in customs or torn apart by
-hungry sniffer dogs but it will have been a noble gesture.
-</para>
-
-</sect1>
-
 </chapter>
diff --git a/docs/docbook/faq/printing.sgml b/docs/docbook/faq/printing.sgml
index 4a58c385bb..be2acbd905 100644
--- a/docs/docbook/faq/printing.sgml
+++ b/docs/docbook/faq/printing.sgml
@@ -1,4 +1,5 @@
 <chapter id="FAQ-Printing">
+<!-- Kurt Pfeifle's HOWTO chapter on printing should make this obsolete -->
 <chapterinfo>
 <author>
 	<firstname>Ronan</firstname><surname>Waide</surname>