From 92cb8c4c251fb04a483b29e7108e7a52388f14dd Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 7 Jun 2010 00:47:46 +0100
Subject: Complete (hopefully) fix for nickname changes: Add flags to the
 identify command to allow identifying without loading any new settings. With
 some documentation hints.

---
 doc/user-guide/commands.xml | 10 +++++++++-
 doc/user-guide/misc.xml     | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml
index 97c54bae..bba2df73 100644
--- a/doc/user-guide/commands.xml
+++ b/doc/user-guide/commands.xml
@@ -1113,7 +1113,7 @@
 	</bitlbee-command>
 
 	<bitlbee-command name="identify">
-		<syntax>identify &lt;password&gt;</syntax>
+		<syntax>identify [-noload|-force] &lt;password&gt;</syntax>
 		<short-description>Identify yourself with your password</short-description>
 
 		<description>
@@ -1124,6 +1124,14 @@
 			<para>
 				Once you're registered, you can change your password using <emphasis>set password &lt;password&gt;</emphasis>.
 			</para>
+
+			<para>
+				The <emphasis>-noload</emphasis> and <emphasis>-force</emphasis> flags can be used to identify when you're logged into some IM accounts already. <emphasis>-force</emphasis> will let you identify yourself and load all saved accounts (and keep the accounts you're logged into already).
+			</para>
+			
+			<para>
+				<emphasis>-noload</emphasis> will log you in but not load any accounts and settings saved under your current nickname. These will be overwritten once you save your settings (i.e. when you disconnect).
+			</para>
 		</description>
 	</bitlbee-command>
 
diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml
index a926775a..2427ef69 100644
--- a/doc/user-guide/misc.xml
+++ b/doc/user-guide/misc.xml
@@ -116,4 +116,21 @@ If you want to set an away state for only one of your connections, you can use t
 
 </sect1>
 
+<sect1 id="nick_changes">
+<title>Changing your nickname</title>
+
+<para>
+BitlBee now allows you to change your nickname. So far this was not possible because it made managing saved accounts more complicated.
+</para>
+
+<para>
+The restriction no longer exists now though. When you change your nick (just using the <emphasis>/nick</emphasis> command), your logged-in status will be reset, which means any changes made to your settings/accounts will not be saved.
+</para>
+
+<para>
+To restore your logged-in status, you need to either use the <emphasis>register</emphasis> command to create an account under the new nickname, or use <emphasis>identify -noload</emphasis> to re-identify yourself under the new nickname. The <emphasis>-noload</emphasis> flag tells the command to verify your password and log you in, but not load any new settings. See <emphasis>help identify</emphasis> for more information.
+</para>
+
+</sect1>
+
 </chapter>
-- 
cgit v1.2.3