Merge branch 'master' into next

* master:
  Update docs
  Fix the .topic help to mention #chan is mandatory

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -3,9 +3,12 @@ next
   * Properly honor exemptions when kicking matched RBL clients
   * Fix LASTON not being shared
   * Fix cmd_hublevel not properly requiring a hublevel argument
-  * Fix cmd_slowjoin eating the first channel option (This fixes groups support)
-  * Fix 'bl %group cmd' giving incorrect message when group/bots not found.
+
+maint
   * Read in /etc/hosts on startup
+  * Fix 'bl %group cmd' giving incorrect message when group/bots not found.
+  * Fix cmd_slowjoin eating the first channel option (This fixes groups support)
+  * Fix help for 'topic' to show optional channel argument
 
 1.4.3
   * Default 'set promisc' to ignore since it's usually a false positive

doc/help.txt

@@ -1907,9 +1907,12 @@ See also: find
 ###  $btcl$b script
    Executes the given string and returns the result.
 :leaf:topic
-###  $btopic$b <text>
+###  $btopic$b [channel] [new topic]
    Changes the channel's topic, assuming the bot is a chanop or the
    channel is not +t (uses your current console channel).
+
+   If no chanel is specified, the console channel is used.
+   If no new topic is specified, the current topic of the channel will be displayed.
  
 See also: console
 :hub:trace