--- FAQ.orig	Thu Jul 11 18:07:18 2002
+++ FAQ.sgml	Sat Nov 18 08:57:23 2006
@@ -12994,7 +12994,7 @@
 
 <em/NOTE/: both plaintext and challenge/response should return
 "succeeded." If there is no "challenge/response" status returned then Samba 
-has not built with "--with-winbind-auth-challenge." and cannot support ntlm
+was not built with "--with-winbind-auth-challenge" and cannot support ntlm
 authentication.
 <p>
 </enum>
@@ -13023,7 +13023,7 @@
 There are two sample options to change the trust account. Either may be scheduled daily via a cron job to
 change the trust password.
 <p>
-<url url="http://www.squid-cache.org/mail-archive/squid-dev/200207/att-0076/01-UglySolution.pl" name="UglySolution.pl">
+<url url="http://www.squid-cache.org/mail-archive/squid-dev/200207/att-0076/02-UglySolution.pl" name="UglySolution.pl">
 is a sample perl script to load smbd, connect to
 a Samba share using smbclient, and generate enough dummy activity to
 trigger smbd's machine trust account password change code.  
@@ -13157,6 +13157,8 @@
 <p>
 <url url="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection.html#WINBIND" name="Samba Winbind Overview">
 <p>
+<url url="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection.html#AEN1134" name="Joining a Domain in Samba 2.2.x">
+<p>
 <url url="http://www.samba.org/samba/docs/man/winbindd.8.html" name="winbindd man page">
 <p>
 <url url="http://www.samba.org/samba/docs/man/wbinfo.1.html" name="wbinfo man page">
@@ -13166,8 +13168,6 @@
 <url url="http://www.samba.org/samba/docs/man/smbd.8.html" name="smbd man page">
 <p>
 <url url="http://www.samba.org/samba/docs/man/smb.conf.5.html" name="smb.conf man page">
-<p>
-<url url="http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection.html#AEN1134" name="Joining a Domain in Samba 2.2.x">
 <p>
 <url url="http://www.samba.org/samba/docs/man/smbclient.1.html" name="smbclient man page">