commit - e49109e36deedc50188124126b66bd3ae40e451f
commit + 6caa947f989b692cf8bf3568cffa03b5c21374e9
blob - 2b7e7b875d226a5586331dc7994da8ea7850a57e
blob + 5093eea9f3ace44b40b5c6388f0395dcc66f4693
--- doc/Protocol.txt
+++ doc/Protocol.txt
@@ -141,12 +141,18 @@ therefore to disconnect the peer prior to registering 
 II.3 Exchange channel-modes, topics, and persistent channels
 
      Command: CHANINFO
-  Parameters: <channel> +<modes> <key> <limit> [<topic>]
+  Parameters: <channel> +<modes> [[<key> <limit>] <topic>]
      Used by: servers only
 
 CHANINFO is used by servers to inform each other about a channel: its
-modes, channel key, user limits and its topic. <topic> is optional.
+modes, channel key, user limits and its topic. The parameter combination
+<key> and <limit> is optional, as well as the <topic> parameter, so that
+there are three possible forms of this command:
 
+  CHANINFO <channel> +<modes>
+  CHANINFO <channel> +<modes> <topic>
+  CHANINFO <channel> +<modes> <key> <limit> <topic>
+
 If the channel already exists on the server receiving the CHANINFO command,
 it only adopts the <modes> (or the <topic>) if there are no modes (or topic)
 already set. It there are already values set the server ignores the