From 1a30e646d9a450b19582bdf306d7aad66730a632 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Wed, 1 Sep 2021 13:37:17 +0200 Subject: [PATCH] Revert "Applied the updated docs changes in line with the upcoming blog post." This reverts commit 1773fa8d191c9f1dcc7c1e59dbcdf31c1263c918. --- README.md | 2 +- docs/help/in/admin.in | 2 +- docs/help/in/channel.in | 8 +++--- docs/help/in/connect.in | 6 ++--- docs/help/in/disconnect.in | 2 +- docs/help/in/info.in | 2 +- docs/help/in/join.in | 2 +- docs/help/in/knock.in | 2 +- docs/help/in/log.in | 8 +++--- docs/help/in/motd.in | 2 +- docs/help/in/names.in | 2 +- docs/help/in/nctcp.in | 2 +- docs/help/in/network.in | 6 ++--- docs/help/in/part.in | 2 +- docs/help/in/query.in | 4 +-- docs/help/in/recode.in | 2 +- docs/help/in/reconnect.in | 2 +- docs/help/in/server.in | 16 +++++------ docs/manual.txt | 2 +- docs/proxy.txt | 2 +- docs/startup-HOWTO.html | 4 +-- docs/startup-HOWTO.txt | 4 +-- irssi.conf | 54 ++++++++++++++++---------------------- 23 files changed, 65 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index d229391a..08be65b4 100644 --- a/README.md +++ b/README.md @@ -72,4 +72,4 @@ Irssi is always looking for developers. Feel free to submit patches through GitHub pull requests. You can also contact the Irssi developers in -[#irssi](https://irssi.org/support/irc/) on irc.example.com. +[#irssi](https://irssi.org/support/irc/) on freenode. diff --git a/docs/help/in/admin.in b/docs/help/in/admin.in index cfe66eba..2b6f8b73 100644 --- a/docs/help/in/admin.in +++ b/docs/help/in/admin.in @@ -15,7 +15,7 @@ %9Examples:%9 /ADMIN - /ADMIN irc.example.com + /ADMIN orwell.freenode.net /ADMIN mike %9See also:%9 INFO diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in index 0e15b6d5..86e824c2 100644 --- a/docs/help/in/channel.in +++ b/docs/help/in/channel.in @@ -33,12 +33,12 @@ /CHANNEL /CHANNEL LIST - /CHANNEL ADD -auto #irssi ExampleNet + /CHANNEL ADD -auto #irssi Freenode /CHANNEL ADD -auto #basementcat Quakenet secret_lair - /CHANNEL ADD -auto -bots '*!@*.irssi.org *!bot@irssi.org' -botcmd 'msg $0 op WzerTrzq' #hideout ExampleNet + /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 ExampleNet - /CHANNEL REMOVE #hideout ExampleNet + /CHANNEL MODIFY -noauto #irssi Freenode + /CHANNEL REMOVE #hideout Freenode %9Special Example:%9 diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in index 4d59dde1..e861ad74 100644 --- a/docs/help/in/connect.in +++ b/docs/help/in/connect.in @@ -34,9 +34,9 @@ %9Examples:%9 - /CONNECT ExampleNet - /CONNECT -6 ExampleNet - /CONNECT -4 -! -host staff.irssi.org -network ExampleNet irc.example.com + /CONNECT Freenode + /CONNECT -6 Freenode + /CONNECT -4 -! -host staff.irssi.org -network Freenode orwell.freenode.net /CONNECT irc.irssi.org 6667 WzerT8zq mike %9See also:%9 DISCONNECT, RMRECONNS, SERVER diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in index 88772e1e..bd4a4e17 100644 --- a/docs/help/in/disconnect.in +++ b/docs/help/in/disconnect.in @@ -18,7 +18,7 @@ %9Examples:%9 - /DISCONNECT ExampleNet I'm off for today, take care! + /DISCONNECT Freenode I'm off for today, take care! /DISCONNECT * Vacation time :D /DISCONNECT diff --git a/docs/help/in/info.in b/docs/help/in/info.in index 41578501..275f349d 100644 --- a/docs/help/in/info.in +++ b/docs/help/in/info.in @@ -15,7 +15,7 @@ %9Examples:%9 /INFO - /INFO irc.example.com + /INFO orwell.freenode.net %9See also:%9 ADMIN diff --git a/docs/help/in/join.in b/docs/help/in/join.in index 55190267..39fa23f8 100644 --- a/docs/help/in/join.in +++ b/docs/help/in/join.in @@ -20,7 +20,7 @@ /JOIN #irssi /JOIN #basementcat secret_lair /JOIN -invite - /JOIN -ExampleNet #github,#example,#irssi + /JOIN -freenode #github,#freenode,#irssi %9See also:%9 KICK, PART diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in index 3e2fdbdb..bb554d55 100644 --- a/docs/help/in/knock.in +++ b/docs/help/in/knock.in @@ -23,7 +23,7 @@ %9Examples:%9 /KNOCK #irssi - /KNOCK #example + /KNOCK #freenode /KNOCK #github %9See also:%9 INVITE, JOIN diff --git a/docs/help/in/log.in b/docs/help/in/log.in index dfe26e30..e4743d46 100644 --- a/docs/help/in/log.in +++ b/docs/help/in/log.in @@ -33,10 +33,10 @@ %9Examples:%9 /LOG OPEN -targets mike ~/irclogs/mike.log MSGS - /LOG OPEN -targets #irssi ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d - /LOG CLOSE ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d - /LOG STOP ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d - /LOG START ~/irclogs/ExampleNet/irssi-%%Y-%%m-%%d + /LOG OPEN -targets #irssi-freenode ~/irclogs/freenode/irssi-%%Y-%%m-%%d + /LOG CLOSE ~/irclogs/freenode/irssi-%%Y-%%m-%%d + /LOG STOP ~/irclogs/freenode/irssi-%%Y-%%m-%%d + /LOG START ~/irclogs/freenode/irssi-%%Y-%%m-%%d /SET autolog ON diff --git a/docs/help/in/motd.in b/docs/help/in/motd.in index ee1233b2..e33a1c75 100644 --- a/docs/help/in/motd.in +++ b/docs/help/in/motd.in @@ -15,7 +15,7 @@ %9Examples:%9 /MOTD - /MOTD irc.example.com + /MOTD orwel.freenode.org /MOTD bob %9See also:%9 ADMIN, INFO, LINKS, MAP diff --git a/docs/help/in/names.in b/docs/help/in/names.in index deccea40..8fd8cf91 100644 --- a/docs/help/in/names.in +++ b/docs/help/in/names.in @@ -21,7 +21,7 @@ %9Examples:%9 /NAMES -ops - /NAMES -voices #irssi,#example + /NAMES -voices #irssi,#freenode %9See also:%9 JOIN, PART, WHO, WHOIS diff --git a/docs/help/in/nctcp.in b/docs/help/in/nctcp.in index 68d789d6..93c3f3ec 100644 --- a/docs/help/in/nctcp.in +++ b/docs/help/in/nctcp.in @@ -15,7 +15,7 @@ %9Examples:%9 /NCTCP #irssi VERSION King of the Jungle v1.0 - /NCTCP bob,#example USERINFO I am bob :p + /NCTCP bob,#freenode USERINFO I am bob :p %9See also:%9 CTCP diff --git a/docs/help/in/network.in b/docs/help/in/network.in index 183fd5b5..fbdaa0b4 100644 --- a/docs/help/in/network.in +++ b/docs/help/in/network.in @@ -59,11 +59,11 @@ %9Examples:%9 /NETWORK ADD -usermode +giw EFnet - /NETWORK ADD -usermode +iw -nick mike -realname 'The one and only mike!' -host staff.irssi.org ExampleNet - /NETWORK ADD -autosendcmd '^MSG NickServ identify WzerT8zq' ExampleNet + /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 ExampleNet + /NETWORK REMOVE Freenode %9See also:%9 CHANNEL, CONNECT, SERVER diff --git a/docs/help/in/part.in b/docs/help/in/part.in index 51be59bd..e96abfbb 100644 --- a/docs/help/in/part.in +++ b/docs/help/in/part.in @@ -14,7 +14,7 @@ %9Examples:%9 /PART #irssi - /PART #example,#irssi + /PART #freenode,#irssi %9See also:%9 JOIN, KICK diff --git a/docs/help/in/query.in b/docs/help/in/query.in index 85f2556e..1c0ba5b9 100644 --- a/docs/help/in/query.in +++ b/docs/help/in/query.in @@ -17,8 +17,8 @@ %9Examples:%9 /QUERY mike - /QUERY -ExampleNet bob - /QUERY -ExampleNet -window sarah + /QUERY -freenode bob + /QUERY -freenode -window sarah %9See also:%9 MSG, UNQUERY, WINDOW diff --git a/docs/help/in/recode.in b/docs/help/in/recode.in index c34822de..63f52339 100644 --- a/docs/help/in/recode.in +++ b/docs/help/in/recode.in @@ -22,7 +22,7 @@ %9Examples:%9 /RECODE - /RECODE ADD ExampleNet/mike utf-8 + /RECODE ADD Freenode/mike utf-8 /RECODE ADD #korea euc-kr /RECODE REMOVE #korea diff --git a/docs/help/in/reconnect.in b/docs/help/in/reconnect.in index f2148c90..aa1dc946 100644 --- a/docs/help/in/reconnect.in +++ b/docs/help/in/reconnect.in @@ -15,7 +15,7 @@ %9Examples:%9 /RECONNECT - /RECONNECT ExampleNet + /RECONNECT Freenode /RECONNECT EFnet BRB :) %9See also:%9 CONNECT, DISCONNECT, NETWORK, RMRECONNS, SERVER diff --git a/docs/help/in/server.in b/docs/help/in/server.in index 8a4d8887..beb75114 100644 --- a/docs/help/in/server.in +++ b/docs/help/in/server.in @@ -61,15 +61,15 @@ %9Examples:%9 /SERVER - /SERVER CONNECT irc.example.com - /SERVER CONNECT +irc.example.com - /SERVER ADD -network ExampleNet -noautosendcmd irc.example.com - /SERVER ADD -! -auto -host staff.irssi.org -4 -network ExampleNet -noproxy irc.example.com 6667 - /SERVER MODIFY -network ExampleNet -noauto irc.example.com - /SERVER MODIFY -network ExampleNet irc.example.com 6697 - - /SERVER REMOVE irc.example.com 6667 ExampleNet + /SERVER CONNECT chat.freenode.net + /SERVER CONNECT +chat.freenode.net + /SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net + /SERVER ADD -! -auto -host staff.irssi.org -4 -network Freenode -noproxy orwell.freenode.net 6667 + /SERVER MODIFY -network Freenode -noauto orwell.freenode.net + /SERVER MODIFY -network Freenode orwell.freenode.net 6697 - + /SERVER REMOVE orwell.freenode.net 6667 Freenode /SERVER PURGE - /SERVER PURGE irc.example.com + /SERVER PURGE orwell.freenode.net %9See also:%9 CHANNEL, CONNECT, DISCONNECT, NETWORK, RECONNECT, RMRECONNS diff --git a/docs/manual.txt b/docs/manual.txt index 29065feb..0f24ffe3 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -349,7 +349,7 @@ after connecting to the network. This is useful for automatically identifying yourself to NickServ, for example - /NETWORK ADD -autosendcmd "/^msg NickServ identify secret" ExampleNet + /NETWORK ADD -autosendcmd "/^msg NickServ identify secret" freenode /NETWORK REMOVE diff --git a/docs/proxy.txt b/docs/proxy.txt index 9ed7ecdb..224d24e3 100644 --- a/docs/proxy.txt +++ b/docs/proxy.txt @@ -24,7 +24,7 @@ You really should set some password for the proxy with: Then you'll need to configure the ports/ircnets the proxy listens in, something like: - /SET irssiproxy_ports IRCnet=2777 EFNet=2778 ExampleNet=2779 + /SET irssiproxy_ports ircnet=2777 efnet=2778 freenode=2779 There we have 3 different irc networks answering in 3 ports. Note that you'll have to make the correct /IRCNET ADD and /SERVER ADD commands to diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html index ecbeb467..48f6e6df 100644 --- a/docs/startup-HOWTO.html +++ b/docs/startup-HOWTO.html @@ -68,7 +68,7 @@

And to connect to one of those networks and join a channel:

-
/CONNECT ExampleNet
+
/CONNECT Freenode
 /JOIN #irssi
 

 
@@ -94,7 +94,7 @@
 
 
If you have irssi 0.8.18 or higher and the irc network supports it, you can use SASL instead of nickserv, which is more reliable:

 
-
/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+
/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 

 
 
These commands have many more options, see their help for details:

diff --git a/docs/startup-HOWTO.txt b/docs/startup-HOWTO.txt
index 84397f33..61de27e3 100644
--- a/docs/startup-HOWTO.txt
+++ b/docs/startup-HOWTO.txt
@@ -43,7 +43,7 @@ has a few predefined networks, to list them:
 
 And to connect to one of those networks and join a channel:
 
-/CONNECT LiberaChat
+/CONNECT Freenode
 /JOIN #irssi
 
 To add more networks:
@@ -67,7 +67,7 @@ wait for 2 seconds before joining channels:
 If you have irssi 0.8.18 or higher and the irc network supports it, you can use
 SASL instead of nickserv, which is more reliable:
 
-/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN ExampleNet
+/NETWORK ADD -sasl_username yourname -sasl_password yourpassword -sasl_mechanism PLAIN Freenode
 
 These commands have many more options, see their help for details:
 
diff --git a/irssi.conf b/irssi.conf
index 9faa8973..edaeb3f5 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -1,19 +1,18 @@
 servers = (
-  { address = "irc.dal.net";       chatnet = "DALnet";     port = "6667"; },
-  { address = "ssl.efnet.org";     chatnet = "EFNet";      port = "9999"; use_tls = "yes"; tls_verify = "no"; },
-  { address = "irc.esper.net";     chatnet = "EsperNet";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "chat.freenode.net"; chatnet = "Freenode";   port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.gamesurge.net"; chatnet = "GameSurge";  port = "6667"; },
-  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "open.ircnet.net";   chatnet = "IRCnet";     port = "6667"; },
-  { address = "irc.ircsource.net"; chatnet = "IRCSource";  port = "6667"; },
-  { address = "irc.libera.chat";   chatnet = "LiberaChat"; port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.netfuze.net";   chatnet = "NetFuze";    port = "6667"; },
-  { address = "irc.oftc.net";      chatnet = "OFTC";       port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "irc.quakenet.org";  chatnet = "QuakeNet";   port = "6667"; },
-  { address = "irc.rizon.net";     chatnet = "Rizon";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
-  { address = "silc.silcnet.org";  chatnet = "SILC";       port = "706";  },
-  { address = "irc.undernet.org";  chatnet = "Undernet";   port = "6667"; }
+  { address = "irc.dal.net";       chatnet = "DALnet";    port = "6667"; },
+  { address = "ssl.efnet.org";     chatnet = "EFNet";     port = "9999"; use_tls = "yes"; tls_verify = "no"; },
+  { address = "irc.esper.net";     chatnet = "EsperNet";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "chat.freenode.net"; chatnet = "Freenode";  port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.gamesurge.net"; chatnet = "GameSurge"; port = "6667"; },
+  { address = "ssl.ircnet.ovh";    chatnet = "IRCnet";    port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "open.ircnet.net";   chatnet = "IRCnet";    port = "6667"; },
+  { address = "irc.ircsource.net"; chatnet = "IRCSource"; port = "6667"; },
+  { address = "irc.netfuze.net";   chatnet = "NetFuze";   port = "6667"; },
+  { address = "irc.oftc.net";      chatnet = "OFTC";      port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "irc.quakenet.org";  chatnet = "QuakeNet";  port = "6667"; },
+  { address = "irc.rizon.net";     chatnet = "Rizon";     port = "6697"; use_tls = "yes"; tls_verify = "yes"; },
+  { address = "silc.silcnet.org";  chatnet = "SILC";      port = "706";  },
+  { address = "irc.undernet.org";  chatnet = "Undernet";  port = "6667"; }
 );
 
 chatnets = {
@@ -59,12 +58,6 @@ chatnets = {
     max_msgs  = "4";
     max_whois = "1";
   };
-  LiberaChat = {
-    type      = "IRC";
-    max_kicks = "1";
-    max_msgs  = "4";
-    max_whois = "1";
-  };
   NetFuze = {
     type      = "IRC";
     max_kicks = "1";
@@ -101,16 +94,15 @@ chatnets = {
 };
 
 channels = (
-  { name = "#lobby";     chatnet = "EsperNet";   autojoin = "No"; },
-  { name = "#freenode";  chatnet = "Freenode";   autojoin = "No"; },
-  { name = "#gamesurge"; chatnet = "GameSurge";  autojoin = "No"; },
-  { name = "#irssi";     chatnet = "IRCNet";     autojoin = "No"; },
-  { name = "#ircsource"; chatnet = "IRCSource";  autojoin = "No"; },
-  { name = "#libera";    chatnet = "LiberaChat"; autojoin = "No"; },
-  { name = "#irssi";     chatnet = "LiberaChat"; autojoin = "No"; },
-  { name = "#netfuze";   chatnet = "NetFuze";    autojoin = "No"; },
-  { name = "#oftc";      chatnet = "OFTC";       autojoin = "No"; },
-  { name = "silc";       chatnet = "SILC";       autojoin = "No"; }
+  { name = "#lobby";     chatnet = "EsperNet";  autojoin = "No"; },
+  { name = "#freenode";  chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#irssi";     chatnet = "Freenode";  autojoin = "No"; },
+  { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; },
+  { name = "#irssi";     chatnet = "IRCNet";    autojoin = "No"; },
+  { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; },
+  { name = "#netfuze";   chatnet = "NetFuze";   autojoin = "No"; },
+  { name = "#oftc";      chatnet = "OFTC";      autojoin = "No"; },
+  { name = "silc";       chatnet = "SILC";      autojoin = "No"; }
 );
 
 aliases = {