Index: doc/user-guide/Installation.xml
===================================================================
--- doc/user-guide/Installation.xml	(revision af6b7fa14a1362c8f12e07360a4cd011dd07c542)
+++ doc/user-guide/Installation.xml	(revision 7ec2ce8fd7d30a536823ef9e08a3dad80ce76d4e)
@@ -36,5 +36,5 @@
 settings and buddy information. <filename>/var/lib/bitlbee/</filename>
 is the default value.</para></listitem>
-<listitem><para>msn, jabber, oscar, twitter - By default, support for all
+<listitem><para>jabber, oscar, twitter - By default, support for all
 these IM-protocols (OSCAR is the protocol used by both ICQ and AIM) will
 be compiled in. To make the binary a bit smaller, you can use these options
@@ -50,6 +50,5 @@
 you can use this option. It's not compiled in by default because it needs
 more testing first.</para></listitem>
-<listitem><para>ssl - The MSN and Jabber modules require an SSL library for
-some of their tasks. BitlBee can use three different SSL libraries: GnuTLS,
+<listitem><para>ssl - BitlBee can use three different SSL libraries: GnuTLS,
 mozilla-nss and OpenSSL. (OpenSSL is, however, a bit troublesome because of
 licensing issues, so don't forget to read the information configure will
Index: doc/user-guide/commands.xml
===================================================================
--- doc/user-guide/commands.xml	(revision af6b7fa14a1362c8f12e07360a4cd011dd07c542)
+++ doc/user-guide/commands.xml	(revision 7ec2ce8fd7d30a536823ef9e08a3dad80ce76d4e)
@@ -43,14 +43,4 @@
 			</bitlbee-command>
 
-			<bitlbee-command name="msn">
-				<syntax>account add msn &lt;handle@server.tld&gt; [&lt;password&gt;]</syntax>
-
-				<description>
-					<para>
-						For MSN connections there are no special arguments.
-					</para>
-				</description>
-			</bitlbee-command>
-			
 			<bitlbee-command name="oscar">
 				<syntax>account add oscar &lt;handle&gt; [&lt;password&gt;]</syntax>
@@ -924,11 +914,8 @@
 		<description>
 			<para>
-				Currently only available for MSN connections, and for jabber groupchats.
-			</para>
-			<para>
-				For MSN: This setting allows you to read and change your "friendly name" for this connection. Since this is a server-side setting, it can't be changed when the account is off-line.
-			</para>
-			<para>
-				For jabber groupchats: this sets the default value of 'nick' for newly created groupchats. There is no way to set an account-wide nick like MSN.
+				Currently only available for jabber groupchats.
+			</para>
+			<para>
+				For jabber groupchats: this sets the default value of 'nick' for newly created groupchats. There is no way to set an account-wide nick.
 			</para>
 		</description>
@@ -1023,15 +1010,4 @@
 			<para>
 				Only supported by OSCAR so far, you can use this setting to ignore ICQ authorization requests, which are hardly used for legitimate (i.e. non-spam) reasons anymore.
-			</para>
-		</description>
-
-	</bitlbee-setting>
-
-	<bitlbee-setting name="local_display_name" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				Mostly meant to work around a bug in MSN servers (forgetting the display name set by the user), this setting tells BitlBee to store your display name locally and set this name on the MSN servers when connecting.
 			</para>
 		</description>
@@ -1620,22 +1596,4 @@
 	</bitlbee-setting>
 
-	<bitlbee-setting name="switchboard_keepalives" type="boolean" scope="account">
-		<default>false</default>
-
-		<description>
-			<para>
-				Turn on this flag if you have difficulties talking to offline/invisible contacts.
-			</para>
-			
-			<para>
-				With this setting enabled, BitlBee will send keepalives to MSN switchboards with offline/invisible contacts every twenty seconds. This should keep the server and client on the other side from shutting it down.
-			</para>
-			
-			<para>
-				This is useful because BitlBee doesn't support MSN offline messages yet and the MSN servers won't let the user reopen switchboards to offline users. Once offline messaging is supported, this flag might be removed.
-			</para>
-		</description>
-	</bitlbee-setting>
-
 	<bitlbee-setting name="tag" type="string" scope="account">
 		<description>
Index: doc/user-guide/misc.xml
===================================================================
--- doc/user-guide/misc.xml	(revision af6b7fa14a1362c8f12e07360a4cd011dd07c542)
+++ doc/user-guide/misc.xml	(revision 7ec2ce8fd7d30a536823ef9e08a3dad80ce76d4e)
@@ -1,51 +1,4 @@
 <chapter id="misc">
 <title>Misc Stuff</title>
-
-<sect1 id="smileys">
-<title>Smileys</title>
-
-<para>
-All MSN smileys (except one) are case insensitive and work without the nose too.
-</para>
-
-<variablelist>
-	<varlistentry><term>(Y)</term><listitem><para>Thumbs up</para></listitem></varlistentry>
-	<varlistentry><term>(N)</term><listitem><para>Thumbs down</para></listitem></varlistentry>
-	<varlistentry><term>(B)</term><listitem><para>Beer mug</para></listitem></varlistentry>
-	<varlistentry><term>(D)</term><listitem><para>Martini glass</para></listitem></varlistentry>
-	<varlistentry><term>(X)</term><listitem><para>Girl</para></listitem></varlistentry>
-	<varlistentry><term>(Z)</term><listitem><para>Boy</para></listitem></varlistentry>
-	<varlistentry><term>(6)</term><listitem><para>Devil smiley</para></listitem></varlistentry>
-	<varlistentry><term>:-[</term><listitem><para>Vampire bat</para></listitem></varlistentry>
-	<varlistentry><term>(})</term><listitem><para>Right hug</para></listitem></varlistentry>
-	<varlistentry><term>({)</term><listitem><para>Left hug</para></listitem></varlistentry>
-	<varlistentry><term>(M)</term><listitem><para>MSN Messenger or Windows Messenger icon (think a BitlBee logo here ;)</para></listitem></varlistentry>
-	<varlistentry><term>:-S</term><listitem><para>Crooked smiley (Confused smiley)</para></listitem></varlistentry>
-	<varlistentry><term>:-$</term><listitem><para>Embarrassed smiley</para></listitem></varlistentry>
-	<varlistentry><term>(H)</term><listitem><para>Smiley with sunglasses</para></listitem></varlistentry>
-	<varlistentry><term>:-@</term><listitem><para>Angry smiley</para></listitem></varlistentry>
-	<varlistentry><term>(A)</term><listitem><para>Angel smiley</para></listitem></varlistentry>
-	<varlistentry><term>(L)</term><listitem><para>Red heart (Love)</para></listitem></varlistentry>
-	<varlistentry><term>(U)</term><listitem><para>Broken heart</para></listitem></varlistentry>
-	<varlistentry><term>(K)</term><listitem><para>Red lips (Kiss)</para></listitem></varlistentry>
-	<varlistentry><term>(G)</term><listitem><para>Gift with bow</para></listitem></varlistentry>
-	<varlistentry><term>(F)</term><listitem><para>Red rose</para></listitem></varlistentry>
-	<varlistentry><term>(W)</term><listitem><para>Wilted rose</para></listitem></varlistentry>
-	<varlistentry><term>(P)</term><listitem><para>Camera</para></listitem></varlistentry>
-	<varlistentry><term>(~)</term><listitem><para>Film strip</para></listitem></varlistentry>
-	<varlistentry><term>(T)</term><listitem><para>Telephone receiver</para></listitem></varlistentry>
-	<varlistentry><term>(@)</term><listitem><para>Cat face</para></listitem></varlistentry>
-	<varlistentry><term>(&amp;)</term><listitem><para>Dog's head</para></listitem></varlistentry>
-	<varlistentry><term>(C)</term><listitem><para>Coffee cup</para></listitem></varlistentry>
-	<varlistentry><term>(I)</term><listitem><para>Light bulb</para></listitem></varlistentry>
-	<varlistentry><term>(S)</term><listitem><para>Half-moon (Case sensitive!)</para></listitem></varlistentry>
-	<varlistentry><term>(*)</term><listitem><para>Star</para></listitem></varlistentry>
-	<varlistentry><term>(8)</term><listitem><para>Musical eighth note</para></listitem></varlistentry>
-	<varlistentry><term>(E)</term><listitem><para>Envelope</para></listitem></varlistentry>
-	<varlistentry><term>(^)</term><listitem><para>Birthday cake</para></listitem></varlistentry>
-	<varlistentry><term>(O)</term><listitem><para>Clock</para></listitem></varlistentry>
-</variablelist>
-
-</sect1>
 
 <sect1 id="groupchats">
@@ -153,5 +106,5 @@
 
 <para>
-For example, you can have one channel with all contacts from your MSN Messenger account in it. Or all contacts from the group called "Work".
+For example, you can have one channel with all contacts from your jabber account in it. Or all contacts from the group called "Work".
 </para>
 
@@ -170,5 +123,5 @@
 
 <para>
-Any valid account ID (so a number, protocol name or part of screenname, as long as it's unique) can also be used as a channel name. So if you just join &amp;msn, it will contain all your MSN contacts. And if you have a Facebook account set up, you can see its contacts by just joining &amp;facebook.
+Any valid account ID (so a number, protocol name or part of screenname, as long as it's unique) can also be used as a channel name. So if you just join &amp;jabber, it will contain all your jabber contacts. And if you have a Facebook account set up, you can see its contacts by just joining &amp;facebook.
 </para>
 
Index: doc/user-guide/quickstart.xml
===================================================================
--- doc/user-guide/quickstart.xml	(revision af6b7fa14a1362c8f12e07360a4cd011dd07c542)
+++ doc/user-guide/quickstart.xml	(revision 7ec2ce8fd7d30a536823ef9e08a3dad80ce76d4e)
@@ -43,5 +43,5 @@
 
 <para>
-Other built-in IM protocols include msn, oscar and twitter. OSCAR is the protocol used by ICQ and AOL. Some protocols may be available as plugins that you can install, such as facebook, steam, discord and omegle. And you can get even more protocols by using the libpurple variant of BitlBee.
+Other built-in IM protocols include oscar and twitter. OSCAR is the protocol used by ICQ and AOL. Some protocols may be available as plugins that you can install, such as facebook, steam, discord and omegle. And you can get even more protocols by using the libpurple variant of BitlBee.
 </para>
 
@@ -124,5 +124,5 @@
 
 <para>
-With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &amp;msn</emphasis> you will join a channel that only contains your MSN contacts.
+With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &amp;jabber</emphasis> you will join a channel that only contains your jabber contacts.
 </para>
 
