Added help for the new subcommands

docs/help/in/channel.in

@@ -7,6 +7,7 @@
 
     LIST:       Displays the list of configured channels.
     ADD:        Adds a channel to your configuration.
+    MODIFY:     Modifies a channel in your configuration.
     REMOVE:     Removes a channel from your configuration.
 
     -auto:      Automatically join the channel.
@@ -36,6 +37,7 @@
     /CHANNEL ADD -auto #basementcat Quakenet secret_lair
     /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout Freenode
     /CHANNEL ADD -auto -bots 'Q!TheQBot@CServe.quakenet.org' -botcmd '^MSG Q op #irssi' #irssi Quakenet
+    /CHANNEL MODIFY -noauto #irssi Freenode
     /CHANNEL REMOVE #hideout Freenode
 
 %9Special Example:%9

docs/help/in/network.in

@@ -7,6 +7,7 @@
 
     LIST:            Displays the list of configured networks.
     ADD:             Adds a network to your configuration.
+    MODIFY:          Modifies a network in your configuration.
     REMOVE:          Removes a network from your configuration.
 
     -nick:           Specifies the nickname to use.
@@ -47,9 +48,6 @@
     Displays, adds, modifies or removes the network configuration of IRC
     networks.
 
-    When using the ADD parameter on a network that already exists, the
-    configuration will be merged with each other.
-
     We recommend using 'WAIT 2000' between the automated commands in order to
     prevent you from being kicked from the network due to flooding commands.
 
@@ -59,6 +57,7 @@
     /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org Freenode
     /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' Freenode
     /NETWORK ADD -autosendcmd '^MSG Q@CServe.quakenet.org AUTH mike WzerT8zq; WAIT 2000; OPER mike WzerT8zq; WAIT 2000; MODE mike +kXP' Quakenet
+    /NETWORK MODIFY -usermode +gi EFnet
     /NETWORK REMOVE Freenode
 
 %9See also:%9 CHANNEL, CONNECT, SERVER

docs/help/in/server.in

@@ -8,6 +8,7 @@
     LIST:              Displays the list of servers you are connected to.
     CONNECT:           Connects to the given server.
     ADD:               Adds a server to your configuration.
+    MODIFY:            Modifies a server in your configuration.
     REMOVE:            Removes a server from your configuration.
     PURGE:             Purges the commands queued to be sent to the server.
 
@@ -62,6 +63,7 @@
     /SERVER CONNECT +chat.freenode.net
     /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
     /SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
+    /SERVER MODIFY -network Freenode -noauto orwell.freenode.net
     /SERVER REMOVE orwell.freenode.net 6667 Freenode
     /SERVER PURGE
     /SERVER PURGE orwell.freenode.net

src/fe-common/core/fe-channels.c

@@ -248,6 +248,8 @@ static void cmd_channel(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 
 /* SYNTAX: CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
                        <channel> <network> [<password>] */
+/* SYNTAX: CHANNEL MODIFY [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
+                          <channel> <network> [<password>] */
 static void cmd_channel_add(const char *data)
 {
 	GHashTable *optlist;

src/fe-common/irc/fe-irc-server.c

@@ -56,6 +56,12 @@ const char *get_visible_target(IRC_SERVER_REC *server, const char *target)
                       [-auto | -noauto] [-network <network>] [-host <hostname>]
                       [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
                       <address> [<port> [<password>]] */
+/* SYNTAX: SERVER MODIFY [-4 | -6] [-ssl] [-ssl_cert <cert>] [-ssl_pkey <pkey>] [-ssl_pass <password>]
+                         [-ssl_verify] [-ssl_cafile <cafile>] [-ssl_capath <capath>]
+                         [-ssl_ciphers <list>]
+                         [-auto | -noauto] [-network <network>] [-host <hostname>]
+                         [-cmdspeed <ms>] [-cmdmax <count>] [-port <port>]
+                         <address> [<port> [<password>]] */
 /* NOTE: -network replaces the old -ircnet flag. */
 static void sig_server_add_fill(IRC_SERVER_SETUP_REC *rec,
 				GHashTable *optlist)

src/fe-common/irc/fe-ircnet.c

@@ -95,6 +95,13 @@ static void cmd_network_list(void)
                        [-cmdmax <count>] [-sasl_mechanism <mechanism>]
                        [-sasl_username <username>] [-sasl_password <password>]
                        <name> */
+/* SYNTAX: NETWORK MODIFY [-nick <nick>] [-user <user>] [-realname <name>]
+                          [-host <host>] [-usermode <mode>] [-autosendcmd <cmd>]
+                          [-querychans <count>] [-whois <count>] [-msgs <count>]
+                          [-kicks <count>] [-modes <count>] [-cmdspeed <ms>]
+                          [-cmdmax <count>] [-sasl_mechanism <mechanism>]
+                          [-sasl_username <username>] [-sasl_password <password>]
+                          <name> */
 static void cmd_network_add(const char *data)
 {
 	GHashTable *optlist;