s/ircnet/network/ - patch by Joost Vunderink

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3270 dbcabf3a-b0e7-0310-adc4-f8d773084564

4 files changed, 8 insertions, 5 deletions

diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 7484ac15..eb4154b4 100644
--- a/docs/help/in/channel.in
+++ b/docs/help/in/channel.in
@@ -6,7 +6,7 @@ IRC networks. It can also automatically send the password when
 manually joining to channel without specifying the password.
 
 /CHANNEL ADD [-auto | -noauto] [-bots <masks>] [-botcmd <command>]
-             <channel> <ircnet> [<password>]
+             <channel> <network> [<password>]
 
 With -bots and -botcmd arguments you can automatically send
 commands to someone in channel. This is useful for automatically
@@ -23,7 +23,7 @@ for example bots, just give the -bots "" parameters to it. Password
 can be removed by setting it to - (or actually, "" works too).
 
 You can remove the channels with
-/CHANNEL REMOVE <channel> <ircnet>
+/CHANNEL REMOVE <channel> <network>
 
 /CHANNEL LIST displays list of channels with settings.
 
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index f5bf2f85..09501edf 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -8,7 +8,8 @@
      -ssl_verify: Verify servers SSL certificate
      -ssl_cafile: File with list of CA certificates (implies -ssl_verify)
      -ssl_capath: Directory with CA certificates (implies -ssl_verify)
-     -ircnet: the IRCNet
+     -network: the network this connection belongs to
+     -ircnet: Same as -network. Deprecated. Do not use.
      -host: the host
      -!: don't autojoin channels
      -rawlog: immediately open rawlog after connected
diff --git a/docs/help/in/ignore.in b/docs/help/in/ignore.in
index 1d3c9fb1..16a870af 100644
--- a/docs/help/in/ignore.in
+++ b/docs/help/in/ignore.in
@@ -9,7 +9,8 @@
               from Finland, but also anyone sending message
               "tofinnishnick: blahblah".
     -except: *DON'T* ignore - overrides an existing ignore.
-    -ircnet: Ignore only on this ircnet.
+    -network: Ignore only on this network.
+    -ircnet: Same as -network. Deprecated. Do not use.
     -channels: Ignore only in channels
     <mask>: Either a nick mask or list of channels
     <levels>: List of levels to ignore. You can use -<level> to remove levels
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index 3236aed5..1189f3f2 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -10,7 +10,8 @@
      -ssl_capath: Directory with CA certificates (implies -ssl_verify)
      -auto: Automatically connect to server at startup (default)
      -noauto: Don't connect to server at startup
-     -ircnet: Specify what IRC network this server belongs to
+     -network: Specify what IRC network this server belongs to
+     -ircnet: Same as -network. Deprecated. Do not use
      -host: Specify what host name to use, if you have multiple
      -!: don't autojoin channels
      -cmdspeed: Same as /SET cmd_queue_speed, see section 3.1