Index: doc/CREDITS
===================================================================
--- doc/CREDITS	(revision 2ff20765990c756533957e8da9c7c29dd3102e79)
+++ doc/CREDITS	(revision 0fbd3a6d26d8fe747bd5e061748e75f397801064)
@@ -55,4 +55,5 @@
 - Greg (gropeep.org), for updating the Yahoo! module to fix some issues
   that were there for quite some time already.
+- misc@mandriva.org for lots of Jabber contributions.
 
 - And all other users who help us by sending useful bug reports, positive
Index: doc/user-guide/commands.xml
===================================================================
--- doc/user-guide/commands.xml	(revision 2ff20765990c756533957e8da9c7c29dd3102e79)
+++ doc/user-guide/commands.xml	(revision 0fbd3a6d26d8fe747bd5e061748e75f397801064)
@@ -17,5 +17,5 @@
 
 		<bitlbee-command name="add">
-			<syntax>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt; [&lt;server&gt;]</syntax>
+			<syntax>account add &lt;protocol&gt; &lt;username&gt; &lt;password&gt;</syntax>
 
 			<description>
@@ -26,5 +26,5 @@
 			
 			<bitlbee-command name="jabber">
-				<syntax>account add jabber &lt;handle@server.tld&gt; &lt;password&gt; [&lt;servertag&gt;]</syntax>
+				<syntax>account add jabber &lt;handle@server.tld&gt; &lt;password&gt;</syntax>
 
 				<description>
@@ -50,14 +50,14 @@
 			
 			<bitlbee-command name="oscar">
-				<syntax>account add oscar &lt;handle&gt; &lt;password&gt; [&lt;servername&gt;]</syntax>
+				<syntax>account add oscar &lt;handle&gt; &lt;password&gt;</syntax>
 
 				<description>
 					<para>
-						Specifying a server is required for OSCAR, since OSCAR can be used for both ICQ- and AIM-connections. Although these days it's supposed to be possible to connect to ICQ via AIM-servers and vice versa, we like to stick with this separation for now. For ICQ connections, the servername is <emphasis>login.icq.com</emphasis>, for AIM connections it's <emphasis>login.oscar.aol.com</emphasis>.
+						OSCAR is the protocol used to connect to AIM and/or ICQ. The servers will automatically detect if you're using a numeric or non-numeric username so there's no need to tell which network you want to connect to.
 					</para>
 				</description>
 
 				<ircexample>
-					<ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw login.icq.com</ircline>
+					<ircline nick="wilmer">account add oscar 72696705 hobbelmeeuw</ircline>
 					<ircline nick="root">Account successfully added</ircline>
 				</ircexample>
@@ -595,5 +595,5 @@
 		<description>
 			<para>
-				Can be set for Jabber- and OSCAR-connections. For OSCAR, this must be set to <emphasis>login.icq.com</emphasis> if it's an ICQ connection, or <emphasis>login.oscar.aol.com</emphasis> if it's an AIM connection. For Jabber, you have to set this if the servername isn't equal to the part after the @ in the Jabber handle.
+				Can be set for Jabber- and OSCAR-connections. For Jabber, you might have to set this if the servername isn't equal to the part after the @ in the Jabber handle. For OSCAR this shouldn't be necessary anymore in recent BitlBee versions.
 			</para>
 		</description>
Index: doc/user-guide/quickstart.xml
===================================================================
--- doc/user-guide/quickstart.xml	(revision 2ff20765990c756533957e8da9c7c29dd3102e79)
+++ doc/user-guide/quickstart.xml	(revision 0fbd3a6d26d8fe747bd5e061748e75f397801064)
@@ -38,10 +38,10 @@
 
 <ircexample>
-	<ircline nick="you">account add oscar 72696705 QuickStart login.icq.com</ircline>
+	<ircline nick="you">account add jabber bitlbee@jabber.org QuickStart</ircline>
 	<ircline nick="root">Account successfully added</ircline>
 </ircexample>
 
 <para>
-Other available IM protocols are jabber, msn, and yahoo. Oscar is the protocol used by ICQ and AOL. For oscar, you need to specify the IM-server as a fourth argument (for msn and yahoo there is no fourth argument). For AOL Instant Messenger, the server name is <emphasis>login.oscar.aol.com</emphasis>. For ICQ, the server name is <emphasis>login.icq.com</emphasis>.
+Other available IM protocols are msn, oscar, and yahoo. Oscar is the protocol used by ICQ and AOL.
 </para>
 
