irc: remove server "freenode" from default config file (closes #309)

29 files changed, 221 insertions, 295 deletions

diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index f2307973a..fe8e9c855 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -17,6 +17,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 === New features
 
+* irc: remove server "freenode" from default config file (closes #309)
 * irc: add support of "ecdsa-nist256p-challenge" SASL mechanism (closes #251)
 * core: add priority in plugins to initialize them in order
 * doc: add Russian man page
diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.asciidoc
index 77004f25d..38919fea4 100644
--- a/doc/de/autogen/user/irc_commands.asciidoc
+++ b/doc/de/autogen/user/irc_commands.asciidoc
@@ -679,32 +679,31 @@ reason: Grund der Abmeldung
          del|keep <server>
          deloutq|jump|raw
 
-    list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-listfull: listet Server mit detaillierten Informationen über jeden einzelnen Server auf
-     add: erstellt einen neuen Server
-  server: Servername, dient der internen Nutzung und zur Darstellung
-hostname: Name oder IP-Adresse des Servers. Optional kann noch der Port festgelegt werden (Standard-Port: 6667). Verschiedene Ports können durch Kommata getrennt werden
-    temp: erstellt temporären Server (wird nicht gespeichert)
-  option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
-nooption: stellt die Boolean Einstellung auf "off" (Beispiel: -nossl)
-    copy: erstellt eine Kopie des Servers
-  rename: benennt den Server um
- reorder: Anordnung der Server ändern
-    keep: behält den Server in der Konfigurationsdatei (ausschließlich für die Nutzung bei temporären Servern)
-     del: entfernt einen Server
- deloutq: löscht bei allen Servern alle ausgehende Nachrichten, die in der Warteschlange stehen (dies betrifft alle Nachrichten die WeeChat gerade sendet)
-    jump: springt zum Server-Buffer
-     raw: öffnet Buffer mit Roh-IRC-Daten
-
-Beispiele:
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: create a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+    temp: create temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
+
+Examples:
   /server listfull
-  /server add oftc irc.oftc.net/6697 -ssl -autoconnect
-  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
-  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=mypass
-  /server copy oftc oftcbis
-  /server rename oftc newoftc
-  /server reorder oftc freenode
+  /server add freenode chat.freenode.net
+  /server add freenode chat.freenode.net/6697 -ssl -autoconnect
+  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667
+  /server copy freenode freenode-test
+  /server rename freenode-test freenode2
+  /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/de/weechat_quickstart.de.asciidoc b/doc/de/weechat_quickstart.de.asciidoc
index 3767f2c48..285cc105b 100644
--- a/doc/de/weechat_quickstart.de.asciidoc
+++ b/doc/de/weechat_quickstart.de.asciidoc
@@ -108,12 +108,11 @@ Erweiterungen sollten aufgelistet werden.
 [[create_irc_server]]
 == Einen IRC-Server erstellen
 
-Der Server 'freenode' wird standardmäßig beim ersten Programmstart erstellt.
-
-Ein weiterer IRC Server kann mit dem `/server` Befehl erstellt werden. Zum Beispiel:
+// TRANSLATION MISSING
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 Falls man nicht mehr weiter weiß, einfach die Hilfe verwenden:
diff --git a/doc/en/autogen/user/irc_commands.asciidoc b/doc/en/autogen/user/irc_commands.asciidoc
index 63a3b90d1..457e5275c 100644
--- a/doc/en/autogen/user/irc_commands.asciidoc
+++ b/doc/en/autogen/user/irc_commands.asciidoc
@@ -698,13 +698,12 @@ nooption: set boolean option to 'off' (for example: -nossl)
 
 Examples:
   /server listfull
-  /server add oftc irc.oftc.net/6697 -ssl -autoconnect
-  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
-  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=mypass
-  /server copy oftc oftcbis
-  /server rename oftc newoftc
-  /server reorder oftc freenode
+  /server add freenode chat.freenode.net
+  /server add freenode chat.freenode.net/6697 -ssl -autoconnect
+  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667
+  /server copy freenode freenode-test
+  /server rename freenode-test freenode2
+  /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/en/weechat_quickstart.en.asciidoc b/doc/en/weechat_quickstart.en.asciidoc
index 3fdd179d2..46da2f889 100644
--- a/doc/en/weechat_quickstart.en.asciidoc
+++ b/doc/en/weechat_quickstart.en.asciidoc
@@ -95,12 +95,10 @@ other plugins in the list.
 [[create_irc_server]]
 == Create an IRC server
 
-The server 'freenode' is created by default on first startup.
-
-You can add another IRC server with `/server` command, for example:
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 As usual, help is available if you're lost:
diff --git a/doc/es/weechat_quickstart.es.asciidoc b/doc/es/weechat_quickstart.es.asciidoc
index 1ae8f5a6e..164d9a3a6 100644
--- a/doc/es/weechat_quickstart.es.asciidoc
+++ b/doc/es/weechat_quickstart.es.asciidoc
@@ -109,13 +109,10 @@ seguramente vera irc y otros.
 == Crear un servidor IRC
 
 // TRANSLATION MISSING
-The server 'freenode' is created by default on first startup.
-
-// TRANSLATION MISSING
-You can add another IRC server with `/server` command, for example:
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 La ayuda está disponible; si te pierdes:
diff --git a/doc/fr/autogen/user/irc_commands.asciidoc b/doc/fr/autogen/user/irc_commands.asciidoc
index 1669c99ac..bd125b6b7 100644
--- a/doc/fr/autogen/user/irc_commands.asciidoc
+++ b/doc/fr/autogen/user/irc_commands.asciidoc
@@ -698,13 +698,12 @@ nooption : définir l'option booléenne à 'off' (par exemple : -nossl)
 
 Exemples :
   /server listfull
-  /server add oftc irc.oftc.net/6697 -ssl -autoconnect
-  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
-  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=mypass
-  /server copy oftc oftcbis
-  /server rename oftc newoftc
-  /server reorder oftc freenode
+  /server add freenode chat.freenode.net
+  /server add freenode chat.freenode.net/6697 -ssl -autoconnect
+  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667
+  /server copy freenode freenode-test
+  /server rename freenode-test freenode2
+  /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/fr/weechat_quickstart.fr.asciidoc b/doc/fr/weechat_quickstart.fr.asciidoc
index 411cfb890..68e0effc4 100644
--- a/doc/fr/weechat_quickstart.fr.asciidoc
+++ b/doc/fr/weechat_quickstart.fr.asciidoc
@@ -100,13 +100,10 @@ devriez voir "irc" et d'autres extensions dans cette liste.
 [[create_irc_server]]
 == Créer un serveur IRC
 
-Le serveur 'freenode' est créé par défaut au premier démarrage.
-
-Vous pouvez ajouter un autre serveur IRC avec la commande `/server`, par
-exemple :
+Vous pouvez ajouter un serveur IRC avec la commande `/server`, par exemple :
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 Comme d'habitude, de l'aide est disponible si vous êtes perdus :
diff --git a/doc/it/autogen/user/irc_commands.asciidoc b/doc/it/autogen/user/irc_commands.asciidoc
index 2a6b55cfd..86bd0fe6b 100644
--- a/doc/it/autogen/user/irc_commands.asciidoc
+++ b/doc/it/autogen/user/irc_commands.asciidoc
@@ -698,13 +698,12 @@ nooption: set boolean option to 'off' (for example: -nossl)
 
 Examples:
   /server listfull
-  /server add oftc irc.oftc.net/6697 -ssl -autoconnect
-  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
-  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=mypass
-  /server copy oftc oftcbis
-  /server rename oftc newoftc
-  /server reorder oftc freenode
+  /server add freenode chat.freenode.net
+  /server add freenode chat.freenode.net/6697 -ssl -autoconnect
+  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667
+  /server copy freenode freenode-test
+  /server rename freenode-test freenode2
+  /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/it/weechat_quickstart.it.asciidoc b/doc/it/weechat_quickstart.it.asciidoc
index 667617add..d6dab737b 100644
--- a/doc/it/weechat_quickstart.it.asciidoc
+++ b/doc/it/weechat_quickstart.it.asciidoc
@@ -104,13 +104,10 @@ vedere "irc" ed altri plugin nella lista.
 == Creare un server IRC
 
 // TRANSLATION MISSING
-The server 'freenode' is created by default on first startup.
-
-// TRANSLATION MISSING
-You can add another IRC server with `/server` command, for example:
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 Come al solito, è disponibile l'aiuto se c'è qualche problema:
diff --git a/doc/ja/autogen/user/irc_commands.asciidoc b/doc/ja/autogen/user/irc_commands.asciidoc
index dc46c236b..690652285 100644
--- a/doc/ja/autogen/user/irc_commands.asciidoc
+++ b/doc/ja/autogen/user/irc_commands.asciidoc
@@ -679,32 +679,31 @@ reason: 理由
          del|keep <server>
          deloutq|jump|raw
 
-    list: サーバをリストアップ (引数無しでは、リストが表示される)
-listfull: 詳細情報を含めてサーバをリストアップ
-     add: 新しいサーバを作成
-  server: サーバ名、内部的な利用と表示に利用
-hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切る
-    temp: 一時的なサーバを作成 (保存されない)
-  option: サーバのオプションを設定 (ブールオプションでは値が無視される)
-nooption: ブールオプションを 'off' に設定 (例: -nossl)
-    copy: サーバを複製
-  rename: サーバをリネーム
- reorder: サーバリストにおける順番を入れ替える
-    keep: 設定ファイルにサーバを保存 (一時的なサーバ用)
-     del: サーバを削除
- deloutq: 全てのサーバにメッセージの削除を要求 (WeeChat が送信している全てのメッセージ)
-    jump: サーババッファに移動
-     raw: 生 IRC データを表示するバッファを開く
-
-例:
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: create a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+    temp: create temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
+
+Examples:
   /server listfull
-  /server add oftc irc.oftc.net/6697 -ssl -autoconnect
-  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
-  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=mypass
-  /server copy oftc oftcbis
-  /server rename oftc newoftc
-  /server reorder oftc freenode
+  /server add freenode chat.freenode.net
+  /server add freenode chat.freenode.net/6697 -ssl -autoconnect
+  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667
+  /server copy freenode freenode-test
+  /server rename freenode-test freenode2
+  /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/ja/weechat_quickstart.ja.asciidoc b/doc/ja/weechat_quickstart.ja.asciidoc
index 59207cb55..d467bb009 100644
--- a/doc/ja/weechat_quickstart.ja.asciidoc
+++ b/doc/ja/weechat_quickstart.ja.asciidoc
@@ -100,12 +100,11 @@ IRC 等全てのネットワークプロトコルはそれぞれ異なるプラ�
 [[create_irc_server]]
 == サーバ情報を作成する
 
-デフォルト設定では最初の起動時にサーバ 'freenode' が作成されます。
-
-他のサーバを追加するには `/server` コマンドを使ってください、例:
+// TRANSLATION MISSING
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 書式が思い出せない場合はヘルプを利用してください:
diff --git a/doc/pl/autogen/user/irc_commands.asciidoc b/doc/pl/autogen/user/irc_commands.asciidoc
index 1be29ff91..edce66a10 100644
--- a/doc/pl/autogen/user/irc_commands.asciidoc
+++ b/doc/pl/autogen/user/irc_commands.asciidoc
@@ -678,32 +678,31 @@ powód: powód
          del|keep <serwer>]
          deloutq|jump|raw
 
-    list: wyświetla listę serwerów (bez argumentu wyświetlana jest ta lista)
-listfull: wyświetla listę serwerów ze szczegółowymi informacjami dla każdego serwera
-     add: tworzy nowy serwer
-  serwer: nazwa serwera, do użytku wewnętrznego i  wyświetlania
-host: nazwa albo adres IP serwera, z opcjonalnym numerem portu (domyślnie: 6667), wiele adresów należy rozdzielić przecinkiem
-    temp: tworzy serwer tymczasowy (nie zapisany)
-  opcja: ustawia opcję dla serwera (dla opcji boolowskich wartość może zostać pominięta)
-noopcja: ustawia opcje boolowskie na 'off' (na przykład: -nossl)
-    copy: duplikuje serwer
-  rename: zmienia nazwę serwera
- reorder: zmienia kolejność na liście serwerów
-    keep: zachowuje serwer w pliku konfiguracyjnym (tylko dla serwerów tymczasowych)
-     del: usuwa serwer
- deloutq: usuń wiadomości z kolejki dla wszystkich serwerów (wszystkie wiadomości jakie WeeChat obecnie wysyła)
-    jump: przechodzi do bufora serwera
-     raw: otwiera bufor z nieprzetworzonymi danymi IRC
-
-Przykłady:
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: create a new server
+  server: server name, for internal and display use
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+    temp: create temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
+
+Examples:
   /server listfull
-  /server add oftc irc.oftc.net/6697 -ssl -autoconnect
-  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
-  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
-  /server add freenode3 chat.freenode.net -password=moje_hasło
-  /server copy oftc oftcbis
-  /server rename oftc newoftc
-  /server reorder oftc freenode
+  /server add freenode chat.freenode.net
+  /server add freenode chat.freenode.net/6697 -ssl -autoconnect
+  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667
+  /server copy freenode freenode-test
+  /server rename freenode-test freenode2
+  /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
 ----
diff --git a/doc/pl/weechat_quickstart.pl.asciidoc b/doc/pl/weechat_quickstart.pl.asciidoc
index 66d2a26f9..07392d4ca 100644
--- a/doc/pl/weechat_quickstart.pl.asciidoc
+++ b/doc/pl/weechat_quickstart.pl.asciidoc
@@ -101,12 +101,11 @@ na liście "irc" oraz inne wtyczki.
 [[create_irc_server]]
 == Tworzenie serwera IRC
 
-Serwer 'freenode' jest tworzony domyślnie przy pierwszym uruchomieniu.
-
-Możesz dodać inne serwery IRC za pomocą komendy '/server', na przykład:
+// TRANSLATION MISSING
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 Jak zawsze w razie wątpliwości dostępna jest pomoc:
diff --git a/doc/ru/weechat_quickstart.ru.asciidoc b/doc/ru/weechat_quickstart.ru.asciidoc
index ba7388c85..6099e2192 100644
--- a/doc/ru/weechat_quickstart.ru.asciidoc
+++ b/doc/ru/weechat_quickstart.ru.asciidoc
@@ -101,12 +101,11 @@ WeeChat немедленно применяет все изменения (ва�
 [[create_irc_server]]
 == Добавление IRC-сервера
 
-Сервер 'freenode' по умолчанию добавляется при первом запуске.
-
-Другой IRC-сервер можно добавить с помощью команды `/server`, например:
+// TRANSLATION MISSING
+You can add an IRC server with `/server` command, for example:
 
 ----
-/server add oftc irc.oftc.net/6667
+/server add freenode chat.freenode.net
 ----
 
 Вы всегда можете обратиться к справке, набрав:
diff --git a/po/cs.po b/po/cs.po
index e0fa87214..2520c3bbb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-11-09 16:23+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6266,13 +6266,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 07ba715d2..5d95cc8fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2015-01-23 00:10+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <>\n"
@@ -543,9 +543,9 @@ msgid ""
 msgstr ""
 "%sFehler: Es ist nicht ratsam, die \"%s\"-Taste mit einer Funktion zu "
 "belegen, da diese Taste weder mit Strg noch Meta zusammen genutzt wird "
-"(Tipp: nutze Alt+k, um einen Tastencode anzeigen zu lassen); soll diese Taste "
-"wirklich genutzt werden, so muss die Einstellung weechat.look.key_bind_safe "
-"deaktiviert werden"
+"(Tipp: nutze Alt+k, um einen Tastencode anzeigen zu lassen); soll diese "
+"Taste wirklich genutzt werden, so muss die Einstellung weechat.look."
+"key_bind_safe deaktiviert werden"
 
 #, c-format
 msgid "%sError: context \"%s\" not found"
@@ -1009,8 +1009,8 @@ msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
 "current one"
 msgstr ""
-"%sFehler: Fenster können nicht nicht zusammengefügt werden. Es existiert kein "
-"Fenster mit derselben Größe neben dem aktuellen Fenster"
+"%sFehler: Fenster können nicht nicht zusammengefügt werden. Es existiert "
+"kein Fenster mit derselben Größe neben dem aktuellen Fenster"
 
 msgid "set or remove away status"
 msgstr "Abwesenheitsstatus setzen oder entfernen"
@@ -1116,8 +1116,8 @@ msgstr ""
 "\"-all\" entfernt werden).\n"
 "          set: setzt einen Wert für Infobar\n"
 "       option: Option, die verändert werden soll (für eine Liste aller "
-"möglichen Optionen bitte folgenden Befehl nutzen: /set weechat.bar."
-"<barname>.*)\n"
+"möglichen Optionen bitte folgenden Befehl nutzen: /set weechat.bar.<barname>."
+"*)\n"
 "        value: neuer Wert für Option\n"
 "         hide: Infobar wird ausgeblendet\n"
 "         show: zeigt eine ausgeblendete Infobar an\n"
@@ -7149,6 +7149,7 @@ msgstr ""
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
 "reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -7171,13 +7172,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
@@ -9341,8 +9341,8 @@ msgid ""
 "%sgnutls: certificate fingerprint does NOT match (check value of option irc."
 "server.%s.ssl_fingerprint)"
 msgstr ""
-"%sgnutls: Zertifikatsfingerabdruck stimmt NICHT überein (prüfe Wert der Option irc."
-"server.%s.ssl_fingerprint)"
+"%sgnutls: Zertifikatsfingerabdruck stimmt NICHT überein (prüfe Wert der "
+"Option irc.server.%s.ssl_fingerprint)"
 
 #, c-format
 msgid "%sgnutls: the hostname in the certificate does NOT match \"%s\""
diff --git a/po/es.po b/po/es.po
index 6c89df81b..58315ba40 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-11-09 16:23+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6505,13 +6505,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 7338b0e27..017d34976 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
-"PO-Revision-Date: 2015-01-21 07:52+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
+"PO-Revision-Date: 2015-01-24 09:59+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -7017,13 +7017,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
@@ -7051,13 +7050,12 @@ msgstr ""
 "\n"
 "Exemples :\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 
diff --git a/po/hu.po b/po/hu.po
index 442b631fa..25c0ccb05 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-11-09 16:23+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5743,13 +5743,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 4d073ce2d..2e16519cf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-11-09 16:23+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6645,13 +6645,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 16fd01d87..0ec80a823 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2015-01-02 09:23+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -6715,6 +6715,7 @@ msgstr ""
 "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || "
 "reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -6737,13 +6738,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 08ae4131d..9daa97e74 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-12-26 19:51+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6862,6 +6862,7 @@ msgstr ""
 "<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa> || "
 "reorder <serwer> [<serwer>...] || del|keep <serwer>] || deloutq|jump|raw"
 
+#, fuzzy
 msgid ""
 "    list: list servers (without argument, this list is displayed)\n"
 "listfull: list servers with detailed info for each server\n"
@@ -6884,13 +6885,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8d9c0e253..8d5f7c509 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-11-09 16:23+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6066,13 +6066,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 9e00b1736..d3a160a83 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-11-09 16:23+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5776,13 +5776,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 4d9becd3e..3863acf3f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-07-25 07:50+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5157,13 +5157,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 56214af1b..9c89483a8 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2015-01-21 07:41+0100\n"
+"POT-Creation-Date: 2015-01-24 09:58+0100\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5133,13 +5133,12 @@ msgid ""
 "\n"
 "Examples:\n"
 "  /server listfull\n"
-"  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-"  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-"  /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
-"  /server add freenode3 chat.freenode.net -password=mypass\n"
-"  /server copy oftc oftcbis\n"
-"  /server rename oftc newoftc\n"
-"  /server reorder oftc freenode\n"
+"  /server add freenode chat.freenode.net\n"
+"  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+"  /server add freenode chat.eu.freenode.net/6667,chat.us.freenode.net/6667\n"
+"  /server copy freenode freenode-test\n"
+"  /server rename freenode-test freenode2\n"
+"  /server reorder freenode2 freenode\n"
 "  /server del freenode\n"
 "  /server deloutq"
 msgstr ""
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 80a9210a1..cd8b66d42 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -6526,14 +6526,13 @@ irc_command_init ()
            "\n"
            "Examples:\n"
            "  /server listfull\n"
-           "  /server add oftc irc.oftc.net/6697 -ssl -autoconnect\n"
-           "  /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl\n"
-           "  /server add freenode2 chat.eu.freenode.net/6667,"
+           "  /server add freenode chat.freenode.net\n"
+           "  /server add freenode chat.freenode.net/6697 -ssl -autoconnect\n"
+           "  /server add freenode chat.eu.freenode.net/6667,"
            "chat.us.freenode.net/6667\n"
-           "  /server add freenode3 chat.freenode.net -password=mypass\n"
-           "  /server copy oftc oftcbis\n"
-           "  /server rename oftc newoftc\n"
-           "  /server reorder oftc freenode\n"
+           "  /server copy freenode freenode-test\n"
+           "  /server rename freenode-test freenode2\n"
+           "  /server reorder freenode2 freenode\n"
            "  /server del freenode\n"
            "  /server deloutq"),
         "list %(irc_servers)"
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 4d1154216..7fce35e20 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -1497,49 +1497,6 @@ irc_config_ignore_write_cb (void *data, struct t_config_file *config_file,
 }
 
 /*
- * Writes default server section in IRC configuration file.
- */
-
-int
-irc_config_server_write_default_cb (void *data,
-                                    struct t_config_file *config_file,
-                                    const char *section_name)
-{
-    int i;
-    char option_name[128];
-
-    /* make C compiler happy */
-    (void) data;
-
-    if (!weechat_config_write_line (config_file, section_name, NULL))
-        return WEECHAT_CONFIG_WRITE_ERROR;
-
-    for (i = 0; i < IRC_SERVER_NUM_OPTIONS; i++)
-    {
-        snprintf (option_name, sizeof (option_name),
-                  "freenode.%s",
-                  irc_server_options[i][0]);
-        switch (i)
-        {
-            case IRC_SERVER_OPTION_ADDRESSES:
-                if (!weechat_config_write_line (config_file,
-                                                option_name,
-                                                "%s", "\"chat.freenode.net/6667\""))
-                    return WEECHAT_CONFIG_WRITE_ERROR;
-                break;
-            default:
-                if (!weechat_config_write_line (config_file,
-                                                option_name,
-                                                WEECHAT_CONFIG_OPTION_NULL))
-                    return WEECHAT_CONFIG_WRITE_ERROR;
-                break;
-        }
-    }
-
-    return WEECHAT_CONFIG_WRITE_OK;
-}
-
-/*
  * Creates a new option for a server.
  *
  * Returns pointer to new option, NULL if error.
@@ -3076,7 +3033,7 @@ irc_config_init ()
                                               0, 0,
                                               &irc_config_server_read_cb, NULL,
                                               &irc_config_server_write_cb, NULL,
-                                              &irc_config_server_write_default_cb, NULL,
+                                              NULL, NULL,
                                               NULL, NULL,
                                               NULL, NULL);
     if (!ptr_section)