summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/help/in/channel.in2
-rw-r--r--docs/help/in/connect.in35
-rw-r--r--docs/help/in/dcc.in4
-rw-r--r--docs/help/in/hilight.in1
-rw-r--r--docs/help/in/network.in2
-rw-r--r--docs/help/in/script.in2
-rw-r--r--docs/help/in/server.in66
-rw-r--r--docs/irssi.13
-rw-r--r--docs/proxy.txt12
-rw-r--r--docs/signals.txt4
-rw-r--r--docs/startup-HOWTO.html17
11 files changed, 92 insertions, 56 deletions
diff --git a/docs/help/in/channel.in b/docs/help/in/channel.in
index 01bea3c1..86e824c2 100644
--- a/docs/help/in/channel.in
+++ b/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
diff --git a/docs/help/in/connect.in b/docs/help/in/connect.in
index df50d1b9..e861ad74 100644
--- a/docs/help/in/connect.in
+++ b/docs/help/in/connect.in
@@ -5,23 +5,24 @@
%9Parameters:%9
- -4: Connects using IPv4.
- -6: Connects using IPv6.
- -ssl: Connects using SSL encryption.
- -ssl_cert: The SSL client certificate file.
- -ssl_pkey: The SSL client private key, if not included in the
- certificate file.
- -ssl_pass: The password for the SSL client private key or certificate.
- -ssl_verify: Verifies the SSL certificate of the server.
- -ssl_cafile: The file with the list of CA certificates.
- -ssl_capath: The directory which contains the CA certificates.
- -ssl_ciphers: SSL cipher suite preference lists.
- -noproxy: Ignores the global proxy configuration.
- -network: The network this connection belongs to.
- -host: The hostname you would like to connect from.
- -rawlog: Immediately open rawlog after connecting.
- -!: Doesn't autojoin channels.
- -noautosendcmd: Doesn't execute autosendcmd.
+ -4: Connects using IPv4.
+ -6: Connects using IPv6.
+ -tls: Connects using TLS encryption.
+ -tls_cert: The TLS client certificate file.
+ -tls_pkey: The TLS client private key, if not included in the certificate file.
+ -tls_pass: The password for the TLS client private key or certificate.
+ -tls_verify: Verifies the TLS certificate of the server.
+ -tls_cafile: The file with the list of CA certificates.
+ -tls_capath: The directory which contains the CA certificates.
+ -tls_ciphers: TLS cipher suite preference lists.
+ -tls_pinned_cert: Pinned x509 certificate fingerprint.
+ -tls_pinned_pubkey: Pinned public key fingerprint.
+ -noproxy: Ignores the global proxy configuration.
+ -network: The network this connection belongs to.
+ -host: The hostname you would like to connect from.
+ -rawlog: Immediately open rawlog after connecting.
+ -!: Doesn't autojoin channels.
+ -noautosendcmd: Doesn't execute autosendcmd.
A network or server to connect to; you can optionally specify a custom port,
password and nickname.
diff --git a/docs/help/in/dcc.in b/docs/help/in/dcc.in
index dac31e58..18a77ee9 100644
--- a/docs/help/in/dcc.in
+++ b/docs/help/in/dcc.in
@@ -36,10 +36,10 @@
%9Examples:%9
/DCC CHAT mike
- /DCC GET bob summer vacation.mkv
+ /DCC GET bob "summer vacation.mkv"
/DCC SEND sarah "summer vacation.mkv"
/DCC CLOSE get mike
- /DCC CLOSE send bob summer vacation.mkv
+ /DCC CLOSE send bob "summer vacation.mkv"
%9See also:%9 CD
diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index cd91560b..0726e5e7 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -10,6 +10,7 @@
-line: Highlights the whole line.
-mask: Highlights all messages from users matching the mask.
-full: The text must match the full word.
+ -matchcase: The text must match case.
-regexp: The text is a regular expression.
-color: The color the display the highlight in.
-actcolor: The color to mark the highlight activity in the statusbar.
diff --git a/docs/help/in/network.in b/docs/help/in/network.in
index 2918f6ae..ba08ef69 100644
--- a/docs/help/in/network.in
+++ b/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.
@@ -59,6 +60,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
diff --git a/docs/help/in/script.in b/docs/help/in/script.in
index 6e94ef7f..e90135ad 100644
--- a/docs/help/in/script.in
+++ b/docs/help/in/script.in
@@ -12,6 +12,8 @@
RESET: Unloads all the scripts.
-permanent: In combination with EXEC, the code will be loaded into the
memory.
+ -autorun: When passed to RESET the scripts in the autorun folder are
+ reloaded.
If no argument is given, the list of active scripts will be displayed.
diff --git a/docs/help/in/server.in b/docs/help/in/server.in
index e407b6a9..60870111 100644
--- a/docs/help/in/server.in
+++ b/docs/help/in/server.in
@@ -5,44 +5,47 @@
%9Parameters:%9
- LIST: Displays the list of servers you are connected to.
- CONNECT: Connects to the given server.
- ADD: Adds a server to your configuration.
- REMOVE: Removes a server from your configuration.
- PURGE: Purges the commands queued to be sent to the server.
+ 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.
- -!: Doesn't autojoin the channels.
- -4: Connects using IPv4.
- -6: Connects using IPv6.
- -ssl: Connects using SSL encryption.
- -ssl_cert: The SSL client certificate file.
- -ssl_pkey: The SSL client private key, if not included in the
- certificate file.
- -ssl_pass: The password for the SSL client private key or certificate.
- -ssl_verify: Verifies the SSL certificate of the server.
- -ssl_cafile: The file with the list of CA certificates.
- -ssl_capath: The directory which contains the CA certificates.
- -ssl_ciphers: SSL cipher suite preference lists.
- -auto: Automatically connects to the server on startup.
- -noauto: Doesn't connect to the server on startup.
- -network: The network the server belongs to.
- -host: The hostname you would like to connect from.
- -cmdspeed: Specifies the minimum amount of time, expressed in
- milliseconds, that the client must wait before sending
- additional commands to the server.
- -cmdmax: Specifies the maximum number of commands to perform
- before starting the internal flood protection.
- -port: Specifies the port to connect to the server.
- -noproxy: Ignores the global proxy configuration.
- -rawlog: Immediately open rawlog after connecting.
- -noautosendcmd: Doesn't execute autosendcmd.
+ -!: Doesn't autojoin the channels.
+ -4: Connects using IPv4.
+ -6: Connects using IPv6.
+ -tls: Connects using TLS encryption.
+ -tls_cert: The TLS client certificate file.
+ -tls_pkey: The TLS client private key, if not included in the
+ certificate file.
+ -tls_pass: The password for the TLS client private key or certificate.
+ -tls_verify: Verifies the TLS certificate of the server.
+ -tls_cafile: The file with the list of CA certificates.
+ -tls_capath: The directory which contains the CA certificates.
+ -tls_ciphers: TLS cipher suite preference lists.
+ -tls_pinned_cert: Pinned x509 certificate fingerprint.
+ -tls_pinned_pubkey: Pinned public key fingerprint.
+ -auto: Automatically connects to the server on startup.
+ -noauto: Doesn't connect to the server on startup.
+ -network: The network the server belongs to.
+ -host: The hostname you would like to connect from.
+ -cmdspeed: Specifies the minimum amount of time, expressed in
+ milliseconds, that the client must wait before sending
+ additional commands to the server.
+ -cmdmax: Specifies the maximum number of commands to perform
+ before starting the internal flood protection.
+ -port: Specifies the port to connect to the server.
+ -noproxy: Ignores the global proxy configuration.
+ -rawlog: Immediately open rawlog after connecting.
+ -noautosendcmd: Doesn't execute autosendcmd.
The server, port and network to add, modify or remove; if no argument is
given, the list of servers you are connected to will be returned.
%9Description:%9
- Displays, adds, modifies or removes the network configuration of IRC
+ Displays, adds, modifies or removes the network configuration of IRC
servers.
When using the ADD parameter on a server that already exists, the
@@ -62,6 +65,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
diff --git a/docs/irssi.1 b/docs/irssi.1
index f38b639e..e1fab0d8 100644
--- a/docs/irssi.1
+++ b/docs/irssi.1
@@ -51,9 +51,6 @@ use
.I HOSTNAME
for your irc session
.TP
-.BI "\-d, \-\-dummy"
-use dummy terminal mode
-.TP
.BI "\-v, \-\-version"
display the version of Irssi
.TP
diff --git a/docs/proxy.txt b/docs/proxy.txt
index e6360a82..224d24e3 100644
--- a/docs/proxy.txt
+++ b/docs/proxy.txt
@@ -30,6 +30,18 @@ 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
make it work properly.
+The special network name "?" allows the client to select the network
+dynamically on connect:
+
+ /SET irssiproxy_ports ?=2777
+
+Now the client can send <network>:<password> as the server password, e.g.
+
+ /CONNECT ... 2777 efnet:secret
+
+to connect to efnet. If there is no irssiproxy_password set, you can
+omit the ":" and just send the network name as the password.
+
By default, the proxy binds to all available interfaces. To make it
only listen on (for example) the loopback address:
diff --git a/docs/signals.txt b/docs/signals.txt
index 5e03d901..7776dad7 100644
--- a/docs/signals.txt
+++ b/docs/signals.txt
@@ -56,9 +56,7 @@ modules.c:
"module error", int error, char *text, char *rootmodule, char *submodule
network-openssl.c:
- "tlsa available", SERVER_REC
- "tlsa verification success", SERVER_REC
- "tlsa verification failed", SERVER_REC
+ "tls handshake finished", SERVER_REC, TLS_REC
nicklist.c:
"nicklist new", CHANNEL_REC, NICK_REC
diff --git a/docs/startup-HOWTO.html b/docs/startup-HOWTO.html
index 12128c59..07a9f47c 100644
--- a/docs/startup-HOWTO.html
+++ b/docs/startup-HOWTO.html
@@ -497,6 +497,13 @@
<pre><code> /SET irssiproxy_ports *=2777
</code></pre>
+<p>The special network name <code>?</code> allows the client to select the
+network dynamically on connect (see below):</p>
+
+<pre>
+/SET irssiproxy_ports ?=2777
+</pre>
+
<p>Usage in client side:</p>
<p>Just connect to the irssi proxy like it is a normal server with password specified in <code>/SET irssiproxy_password</code>. For example:</p>
@@ -505,6 +512,16 @@
/SERVER ADD -network efnet my.irssi-proxy.org 2778 secret
</code></pre>
+<p>Or, if you used <code>?</code> in <code>irssiproxy_ports</code>:</p>
+
+<pre>
+/SERVER ADD -network IRCnet my.irssi-proxy.org 2777 IRCnet:secret
+/SERVER ADD -network efnet my.irssi-proxy.org 2777 efnet:secret
+</pre>
+
+<p>I.e. the network to connect to is specified as part of the password,
+separated by <code>:</code> from the actual proxy password.</p>
+
<p>Irssi proxy works fine with other IRC clients as well.</p>
<p><strong>SOCKS</strong></p>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 17:43:31 +0000