Merge branch '0.8.x' into 0.9.x

Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php

2 files changed, 27 insertions, 16 deletions

diff --git a/doc-src/im b/doc-src/im
index da07f9fe7..c722a4e2c 100644
--- a/doc-src/im
+++ b/doc-src/im
@@ -32,4 +32,15 @@ currently-implemented commands:
   you subscribe to.
 * **off**: Turn off notifications. You'll no longer receive Jabber
   notifications.
-
+* **stop**: Same as 'off'
+* **quit**: Same as 'off'
+* **help**: Show this help. List available Jabber/XMPP commands
+* **follow <nickname>**: Subscribe to <nickname>
+* **sub <nickname>**: Same as follow
+* **leave <nickname>**: Subscribe to <nickname>
+* **unsub <nickname>**: Same as leave
+* **d <nickname> <text>**: Send direct message to <nickname> with message body <text>
+* **get <nickname>**: Get last notice from <nickname>
+* **last <nickname>**: Same as 'get'
+* **whois <nickname>**: Get Profile info on <nickname>
+* **fav <nickname>**: Add user's last notice as a favorite
\ No newline at end of file
diff --git a/doc-src/sms b/doc-src/sms
index 1beb49786..1a3064318 100644
--- a/doc-src/sms
+++ b/doc-src/sms
@@ -44,24 +44,24 @@ You can use the following commands with %%site.name%%.
 * on - turn on notifications
 * off - turn off notifications
 * help - show this help
-* follow <nickname> - subscribe to user
-* leave <nickname> - unsubscribe from user
-* d <nickname> <text> - direct message to user
-* get <nickname> - get last notice from user
-* whois <nickname> - get profile info on user
-* fav <nickname> - add user's last notice as a 'fave'
+* follow &lt;nickname&gt; - subscribe to user
+* leave &lt;nickname&gt; - unsubscribe from user
+* d &lt;nickname&gt; &lt;text&gt; - direct message to user
+* get &lt;nickname&gt; - get last notice from user
+* whois &lt;nickname&gt; - get profile info on user
+* fav &lt;nickname&gt; - add user's last notice as a 'fave'
 * stats - get your stats
 * stop - same as 'off'
 * quit - same as 'off'
-* sub <nickname> - same as 'follow'
-* unsub <nickname> - same as 'leave'
-* last <nickname> - same as 'get'
-* on <nickname> - not yet implemented.
-* off <nickname> - not yet implemented.
-* nudge <nickname> - not yet implemented.
-* invite <phone number> - not yet implemented.
-* track <word> - not yet implemented.
-* untrack <word> - not yet implemented.
+* sub &lt;nickname&gt; - same as 'follow'
+* unsub &lt;nickname&gt; - same as 'leave'
+* last &lt;nickname&gt; - same as 'get'
+* on &lt;nickname&gt; - not yet implemented.
+* off &lt;nickname&gt; - not yet implemented.
+* nudge &lt;nickname&gt; - not yet implemented.
+* invite &lt;phone number&gt; - not yet implemented.
+* track &lt;word&gt; - not yet implemented.
+* untrack &lt;word&gt; - not yet implemented.
 * track off - not yet implemented.
 * untrack all - not yet implemented.
 * tracks - not yet implemented.