doc: replace freenode-tor by a generic TOR example in user's guide

diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc
index 7273670e49a829715094d0b7f488a1985df7cd13..7418d0e8b2920dd9696400ef49fbcf23a606cb82 100644 (file)
--- a/doc/de/weechat_user.de.adoc
+++ b/doc/de/weechat_user.de.adoc
@@ -3043,12 +3043,14 @@ Erneut mit dem Server verbinden:
 /reconnect libera
 ----
 
-[[irc_tor_freenode]]
-==== Verbindung zu Freenode mittels TOR/SASL herstellen
+// TRANSLATION MISSING
+[[irc_tor_sasl]]
+==== Connect with TOR and SASL
 
-Neben der Möglichkeit eine Verbindung zum Freenode Server mittels SSL aufzubauen,
-kann man außerdem eine Verbindung via TOR (https://www.torproject.org/) herstellen.
-Dies dient dazu die eigene Privatsphäre und Sicherheit im Internet zu erhöhen.
+// TRANSLATION MISSING
+Some servers support connections with TOR (https://www.torproject.org/),
+a network of virtual tunnels that allows people and groups to improve their
+privacy and security on the Internet.
 
 Im ersten Schritt muss TOR installiert werden. Für Debian (und Derivate):
 
@@ -3063,20 +3065,17 @@ und Port müssen dabei an die eigene TOR Konfiguration angepasst werden):
 /proxy add tor socks5 127.0.0.1 9050
 ----
 
-Jetzt muss der neue Server hinzufügt werden, zum Beispiel:
+// TRANSLATION MISSING
+Now, add a new server (replace server name "irc-tor" and the address by a valid one):
 
 ----
-/server add freenode-tor ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+/server add irc-tor this.is.the.address.onion
 ----
 
-[NOTE]
-Sollte eine alte Version (vor 0.3.5) von TOR verwendet werden, muss diese
-Adresse, `freenodeok2gncmy.onion`, genutzt werden.
-
 Einen Proxy für TOR anlegen:
 
 ----
-/set irc.server.freenode-tor.proxy "tor"
+/set irc.server.irc-tor.proxy "tor"
 ----
 
 SASL Authentifikation mit ECDSA-NIST256P-CHALLENGE nutzen (siehe Kapitel
@@ -3084,20 +3083,18 @@ SASL Authentifikation mit ECDSA-NIST256P-CHALLENGE nutzen (siehe Kapitel
 privaten Schlüssel zu generieren):
 
 ----
-/set irc.server.freenode-tor.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode-tor.sasl_username "your_nickname"
-/set irc.server.freenode-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
+/set irc.server.irc-tor.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.irc-tor.sasl_username "your_nickname"
+/set irc.server.irc-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
 ----
 
-Zum Abschluss stellt man eine Verbindung zum Server her:
+// TRANSLATION MISSING
+And finally, connect to the server:
 
 ----
-/connect freenode-tor
+/connect irc-tor
 ----
 
-Um mehr über Freenode und TOR zu erfahren:
-https://freenode.net/kb/answer/chat#accessing-freenode-via-tor
-
 [[irc_smart_filter_join_part_quit]]
 ==== einfacher Filter für join/part/quit Nachrichten
 

diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc
index 67a7f88f5a88297943907bf8dcc9ca8e5b3c7211..5e95f60ce79ca7407679a737e19332ba70f4a3e4 100644 (file)
--- a/doc/en/weechat_user.en.adoc
+++ b/doc/en/weechat_user.en.adoc
@@ -2989,12 +2989,12 @@ Reconnect to the server:
 /reconnect libera
 ----
 
-[[irc_tor_freenode]]
-==== Connect to Freenode with TOR/SASL
+[[irc_tor_sasl]]
+==== Connect with TOR and SASL
 
-In addition to SSL, Freenode servers support connections with TOR
-(https://www.torproject.org/), a network of virtual tunnels that allows people
-and groups to improve their privacy and security on the Internet.
+Some servers support connections with TOR (https://www.torproject.org/),
+a network of virtual tunnels that allows people and groups to improve their
+privacy and security on the Internet.
 
 In first place, install TOR. For Debian (and derived):
 
@@ -3009,20 +3009,16 @@ port depend on your TOR configuration):
 /proxy add tor socks5 127.0.0.1 9050
 ----
 
-Now, add a new server, for example:
+Now, add a new server (replace server name "irc-tor" and the address by a valid one):
 
 ----
-/server add freenode-tor ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+/server add irc-tor this.is.the.address.onion
 ----
 
-[NOTE]
-If you are using an old version of TOR (before 0.3.5) you should use the address
-`freenodeok2gncmy.onion` instead.
-
 Set proxy for TOR:
 
 ----
-/set irc.server.freenode-tor.proxy "tor"
+/set irc.server.irc-tor.proxy "tor"
 ----
 
 Set SASL authentication with ECDSA-NIST256P-CHALLENGE (see the chapter
@@ -3030,20 +3026,17 @@ Set SASL authentication with ECDSA-NIST256P-CHALLENGE (see the chapter
 a private key):
 
 ----
-/set irc.server.freenode-tor.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode-tor.sasl_username "your_nickname"
-/set irc.server.freenode-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
+/set irc.server.irc-tor.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.irc-tor.sasl_username "your_nickname"
+/set irc.server.irc-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
 ----
 
-And finally, connection to server:
+And finally, connect to the server:
 
 ----
-/connect freenode-tor
+/connect irc-tor
 ----
 
-For more info about Freenode and TOR:
-https://freenode.net/kb/answer/chat#accessing-freenode-via-tor
-
 [[irc_smart_filter_join_part_quit]]
 ==== Smart filter for join/part/quit messages
 

diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc
index 8995e0abbaa778f069c1f5b5f6c6bebb0a78ec74..7b38d12759f60a54566511c401d685c6877d7109 100644 (file)
--- a/doc/fr/weechat_user.fr.adoc
+++ b/doc/fr/weechat_user.fr.adoc
@@ -3093,12 +3093,12 @@ Reconnectez-vous au serveur :
 /reconnect libera
 ----
 
-[[irc_tor_freenode]]
-==== Connexion à Freenode avec TOR/SASL
+[[irc_tor_sasl]]
+==== Connexion avec TOR et SASL
 
-En plus du SSL, les serveurs Freenode supportent les connexions avec TOR
-(https://www.torproject.org/), un réseau de tunnels virtuels qui permet aux
-personnes et groupes d'améliorer leur vie privée et sécurité sur Internet.
+Quelques serveurs acceptent les connexions avec TOR (https://www.torproject.org/),
+un réseau de tunnels virtuels qui permet aux personnes et groupes d'améliorer
+leur vie privée et sécurité sur Internet.
 
 En premier lieu, installez TOR. Pour Debian (et dérivés) :
 
@@ -3113,20 +3113,17 @@ et port dépend de votre configuration de TOR) :
 /proxy add tor socks5 127.0.0.1 9050
 ----
 
-Maintenant, ajoutez un nouveau serveur, par exemple :
+Maintenant, ajouter un nouveau serveur (remplacez le nom du serveur "irc-tor" et
+l'adresse par une valide) :
 
 ----
-/server add freenode-tor ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+/server add irc-tor this.is.the.address.onion
 ----
 
-[NOTE]
-Si vous utilisez une ancienne version de TOR (avant 0.3.5) vous devriez plutôt
-utiliser l'adresse `freenodeok2gncmy.onion`.
-
 Définissez le proxy pour TOR :
 
 ----
-/set irc.server.freenode-tor.proxy "tor"
+/set irc.server.irc-tor.proxy "tor"
 ----
 
 Définissez l'authentification SASL avec ECDSA-NIST256P-CHALLENGE (voir le
@@ -3134,20 +3131,17 @@ chapitre <<irc_sasl_ecdsa_nist256p_challenge,SASL ECDSA-NIST256P-CHALLENGE>>
 pour générer une clé privée) :
 
 ----
-/set irc.server.freenode-tor.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode-tor.sasl_username "votre_pseudo"
-/set irc.server.freenode-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
+/set irc.server.irc-tor.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.irc-tor.sasl_username "your_nickname"
+/set irc.server.irc-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
 ----
 
-Et enfin, la connexion au serveur :
+Et enfin, connectez-vous au serveur :
 
 ----
-/connect freenode-tor
+/connect irc-tor
 ----
 
-Pour plus d'informations à propos de Freenode et TOR :
-https://freenode.net/kb/answer/chat#accessing-freenode-via-tor
-
 [[irc_smart_filter_join_part_quit]]
 ==== Filtre intelligent pour les messages join/part/quit
 

diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc
index f9d5814b93cdf08a84fbc17bf4817f448e85cedb..cbdeb46cda9739d46de5524d0d10a820545276f0 100644 (file)
--- a/doc/it/weechat_user.it.adoc
+++ b/doc/it/weechat_user.it.adoc
@@ -3222,12 +3222,14 @@ Reconnect to the server:
 /reconnect libera
 ----
 
-[[irc_tor_freenode]]
-==== Connessione a Freenode con TOR/SASL
+// TRANSLATION MISSING
+[[irc_tor_sasl]]
+==== Connect with TOR and SASL
 
-Oltre ad SSL, i server Freenode supportano connessioni con TOR
-(https://www.torproject.org), una rete di tunnel virtuali che consente ad
-utenti e gruppi di migliorare la propria privacy e la sicurezza su Internet.
+// TRANSLATION MISSING
+Some servers support connections with TOR (https://www.torproject.org/),
+a network of virtual tunnels that allows people and groups to improve their
+privacy and security on the Internet.
 
 Il primo passo consiste nell'installare TOR. Per Debian (e derivate):
 
@@ -3243,21 +3245,16 @@ host/IP e porta dipendono dalla propria configurazione di TOR):
 ----
 
 // TRANSLATION MISSING
-Now, add a new server, for example:
+Now, add a new server (replace server name "irc-tor" and the address by a valid one):
 
 ----
-/server add freenode-tor ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+/server add irc-tor this.is.the.address.onion
 ----
 
-// TRANSLATION MISSING
-[NOTE]
-If you are using an old version of TOR (before 0.3.5) you should use the address
-`freenodeok2gncmy.onion` instead.
-
 Impostare il proxy per TOR:
 
 ----
-/set irc.server.freenode-tor.proxy "tor"
+/set irc.server.irc-tor.proxy "tor"
 ----
 
 // TRANSLATION MISSING
@@ -3266,20 +3263,18 @@ Set SASL authentication with ECDSA-NIST256P-CHALLENGE (see the chapter
 a private key):
 
 ----
-/set irc.server.freenode-tor.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode-tor.sasl_username "your_nickname"
-/set irc.server.freenode-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
+/set irc.server.irc-tor.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.irc-tor.sasl_username "your_nickname"
+/set irc.server.irc-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
 ----
 
-E alla fine, connettersi al server:
+// TRANSLATION MISSING
+And finally, connect to the server:
 
 ----
-/connect freenode-tor
+/connect irc-tor
 ----
 
-Per maggiori informazioni su Freenode e TOR:
-https://freenode.net/kb/answer/chat#accessing-freenode-via-tor
-
 [[irc_smart_filter_join_part_quit]]
 ==== Filtro smart per i messaggi di entrata/uscita/disconnessione
 

diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc
index a35ca1a5e201f1270ae9902b1be006ad2c7f519c..4fc58b2847c299d063131dc8c595a71adef859b3 100644 (file)
--- a/doc/ja/weechat_user.ja.adoc
+++ b/doc/ja/weechat_user.ja.adoc
@@ -3070,12 +3070,14 @@ $ openssl ec -noout -text -conv_form compressed -in ~/.config/weechat/ecdsa.pem
 /reconnect libera
 ----
 
-[[irc_tor_freenode]]
-==== TOR/SASL を使って Freenode に接続する場合
+// TRANSLATION MISSING
+[[irc_tor_sasl]]
+==== Connect with TOR and SASL
 
-SSL に加えて、Freenode サーバは TOR (https://www.torproject.org/)
-経由の接続をサポートしています。TOR
-とはバーチャルトンネルのネットワークで、これを使うことで個人やグループがインターネット利用に伴うプライバシーとセキュリティを向上させることができます。
+// TRANSLATION MISSING
+Some servers support connections with TOR (https://www.torproject.org/),
+a network of virtual tunnels that allows people and groups to improve their
+privacy and security on the Internet.
 
 最初に、TOR をインストールしてください。Debian (とその派生ディストリビューション) の場合:
 
@@ -3090,41 +3092,35 @@ WeeChat で TOR サービスを使った socks5 プロキシを作成してく
 /proxy add tor socks5 127.0.0.1 9050
 ----
 
-そして、新しいサーバを追加します。例えば:
+// TRANSLATION MISSING
+Now, add a new server (replace server name "irc-tor" and the address by a valid one):
 
 ----
-/server add freenode-tor ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+/server add irc-tor this.is.the.address.onion
 ----
 
-// TRANSLATION MISSING
-[NOTE]
-If you are using an old version of TOR (before 0.3.5) you should use the address
-`freenodeok2gncmy.onion` instead.
-
 TOR プロキシを設定:
 
 ----
-/set irc.server.freenode-tor.proxy "tor"
+/set irc.server.irc-tor.proxy "tor"
 ----
 
 ECDSA-NIST256P-CHALLENGE メカニズムで SASL 認証を設定 (秘密鍵を作成するには
 <<irc_sasl_ecdsa_nist256p_challenge,SASL ECDSA-NIST256P-CHALLENGE 認証>>を参照してください):
 
 ----
-/set irc.server.freenode-tor.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode-tor.sasl_username "your_nickname"
-/set irc.server.freenode-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
+/set irc.server.irc-tor.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.irc-tor.sasl_username "your_nickname"
+/set irc.server.irc-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
 ----
 
-最後に、サーバに接続してください:
+// TRANSLATION MISSING
+And finally, connect to the server:
 
 ----
-/connect freenode-tor
+/connect irc-tor
 ----
 
-Freenode と TOR に関するより詳しい情報:
-https://freenode.net/kb/answer/chat#accessing-freenode-via-tor
-
 [[irc_smart_filter_join_part_quit]]
 ==== 参加/退出/終了メッセージに対するスマートフィルタ
 

diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc
index 010e4a5c0a39d20ede9590c4d452af709b8979a6..eb180542813326295c48a184e130b8c2f9d688e4 100644 (file)
--- a/doc/pl/weechat_user.pl.adoc
+++ b/doc/pl/weechat_user.pl.adoc
@@ -3010,12 +3010,14 @@ Ponowne połączenie z serwerem:
 /reconnect libera
 ----
 
-[[irc_tor_freenode]]
-==== Połączenie z siecią Freenode za pomocą TOR/SASL
+// TRANSLATION MISSING
+[[irc_tor_sasl]]
+==== Connect with TOR and SASL
 
-Jako dodatek do SSL, serwery Freenode wspierają połączenia za pomocą sieci TOR
-(https://www.torproject.org/), sieci wirtualnych tuneli umożliwiających ludziom
-oraz grupom polepszyć swoją prywatność i bezpieczeństwo w Internecie.
+// TRANSLATION MISSING
+Some servers support connections with TOR (https://www.torproject.org/),
+a network of virtual tunnels that allows people and groups to improve their
+privacy and security on the Internet.
 
 Pierwszym krokiem jest instalacja TORa. Dla Debiana (i pochodnych):
 
@@ -3030,20 +3032,17 @@ zależą od twojej konfiguracji TORa):
 /proxy add tor socks5 127.0.0.1 9050
 ----
 
-Teraz dodaj nowy serwer na przykład:
+// TRANSLATION MISSING
+Now, add a new server (replace server name "irc-tor" and the address by a valid one):
 
 ----
-/server add freenode-tor ajnvpgl6prmkb7yktvue6im5wiedlz2w32uhcwaamdiecdrfpwwgnlqd.onion
+/server add irc-tor this.is.the.address.onion
 ----
 
-[NOTE]
-Jeśli używasz starszej wersji TORa (przed 0.3.5) powinieneś użyć adresu
-`freenodeok2gncmy.onion`.
-
 Ustaw proxy dla TOR:
 
 ----
-/set irc.server.freenode-tor.proxy "tor"
+/set irc.server.irc-tor.proxy "tor"
 ----
 
 Ustaw uwierzytelnianie SASL z użyciem ECDSA-NIST256P-CHALLENGE (zobacz rozdział
@@ -3051,21 +3050,18 @@ Ustaw uwierzytelnianie SASL z użyciem ECDSA-NIST256P-CHALLENGE (zobacz rozdzia
 się jak wygenerować klucz prywatny):
 
 ----
-/set irc.server.freenode-tor.sasl_mechanism ecdsa-nist256p-challenge
-/set irc.server.freenode-tor.sasl_username "twój_użytkownik"
-/set irc.server.freenode-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
+/set irc.server.irc-tor.sasl_mechanism ecdsa-nist256p-challenge
+/set irc.server.irc-tor.sasl_username "twój_użytkownik"
+/set irc.server.irc-tor.sasl_key "${weechat_config_dir}/ecdsa.pem"
 ----
 
-Na koniec połącz się z serwerem:
+// TRANSLATION MISSING
+And finally, connect to the server:
 
 ----
-/connect freenode-tor
+/connect irc-tor
 ----
 
-Więcej informacji o Freenode i TOR:
-https://freenode.net/kb/answer/chat#accessing-freenode-via-tor
-
-
 [[irc_smart_filter_join_part_quit]]
 ==== Inteligentne filtry dla wiadomości