From 2ff18a8d46a5adb7b46525a993ca69367a1b6f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 2 May 2020 14:48:10 +0200 Subject: doc: merge files man_*.xx.adoc into a single file man.xx.adoc --- doc/cs/CMakeLists.txt | 8 +-- doc/cs/Makefile.am | 5 +- doc/cs/man.cs.adoc | 109 ++++++++++++++++++++++++++++++++++++ doc/cs/man_copyright.cs.adoc | 13 ----- doc/cs/man_files.cs.adoc | 74 ------------------------- doc/cs/man_plugin_options.cs.adoc | 14 ----- doc/cs/weechat-headless.1.cs.adoc | 6 +- doc/cs/weechat.1.cs.adoc | 6 +- doc/de/CMakeLists.txt | 8 +-- doc/de/Makefile.am | 5 +- doc/de/man.de.adoc | 110 +++++++++++++++++++++++++++++++++++++ doc/de/man_copyright.de.adoc | 13 ----- doc/de/man_files.de.adoc | 74 ------------------------- doc/de/man_plugin_options.de.adoc | 15 ----- doc/de/weechat-headless.1.de.adoc | 6 +- doc/de/weechat.1.de.adoc | 6 +- doc/en/CMakeLists.txt | 8 +-- doc/en/Makefile.am | 5 +- doc/en/man.en.adoc | 110 +++++++++++++++++++++++++++++++++++++ doc/en/man_copyright.en.adoc | 13 ----- doc/en/man_files.en.adoc | 74 ------------------------- doc/en/man_plugin_options.en.adoc | 15 ----- doc/en/weechat-headless.1.en.adoc | 6 +- doc/en/weechat.1.en.adoc | 6 +- doc/en/weechat_dev.en.adoc | 1 + doc/fr/CMakeLists.txt | 8 +-- doc/fr/Makefile.am | 5 +- doc/fr/man.fr.adoc | 112 +++++++++++++++++++++++++++++++++++++ doc/fr/man_copyright.fr.adoc | 13 ----- doc/fr/man_files.fr.adoc | 74 ------------------------- doc/fr/man_plugin_options.fr.adoc | 17 ------ doc/fr/weechat-headless.1.fr.adoc | 6 +- doc/fr/weechat.1.fr.adoc | 6 +- doc/fr/weechat_dev.fr.adoc | 1 + doc/it/CMakeLists.txt | 8 +-- doc/it/Makefile.am | 5 +- doc/it/man.it.adoc | 113 ++++++++++++++++++++++++++++++++++++++ doc/it/man_copyright.it.adoc | 14 ----- doc/it/man_files.it.adoc | 75 ------------------------- doc/it/man_plugin_options.it.adoc | 16 ------ doc/it/weechat-headless.1.it.adoc | 6 +- doc/it/weechat.1.it.adoc | 6 +- doc/ja/CMakeLists.txt | 8 +-- doc/ja/Makefile.am | 5 +- doc/ja/man.ja.adoc | 109 ++++++++++++++++++++++++++++++++++++ doc/ja/man_copyright.ja.adoc | 12 ---- doc/ja/man_files.ja.adoc | 74 ------------------------- doc/ja/man_plugin_options.ja.adoc | 15 ----- doc/ja/weechat-headless.1.ja.adoc | 6 +- doc/ja/weechat.1.ja.adoc | 6 +- doc/ja/weechat_dev.ja.adoc | 2 + doc/pl/CMakeLists.txt | 8 +-- doc/pl/Makefile.am | 5 +- doc/pl/man.pl.adoc | 111 +++++++++++++++++++++++++++++++++++++ doc/pl/man_copyright.pl.adoc | 13 ----- doc/pl/man_files.pl.adoc | 74 ------------------------- doc/pl/man_plugin_options.pl.adoc | 16 ------ doc/pl/weechat-headless.1.pl.adoc | 6 +- doc/pl/weechat.1.pl.adoc | 6 +- doc/ru/CMakeLists.txt | 8 +-- doc/ru/Makefile.am | 5 +- doc/ru/man.ru.adoc | 109 ++++++++++++++++++++++++++++++++++++ doc/ru/man_copyright.ru.adoc | 13 ----- doc/ru/man_files.ru.adoc | 74 ------------------------- doc/ru/man_plugin_options.ru.adoc | 14 ----- doc/ru/weechat-headless.1.ru.adoc | 6 +- doc/ru/weechat.1.ru.adoc | 6 +- 67 files changed, 975 insertions(+), 931 deletions(-) create mode 100644 doc/cs/man.cs.adoc delete mode 100644 doc/cs/man_copyright.cs.adoc delete mode 100644 doc/cs/man_files.cs.adoc delete mode 100644 doc/cs/man_plugin_options.cs.adoc create mode 100644 doc/de/man.de.adoc delete mode 100644 doc/de/man_copyright.de.adoc delete mode 100644 doc/de/man_files.de.adoc delete mode 100644 doc/de/man_plugin_options.de.adoc create mode 100644 doc/en/man.en.adoc delete mode 100644 doc/en/man_copyright.en.adoc delete mode 100644 doc/en/man_files.en.adoc delete mode 100644 doc/en/man_plugin_options.en.adoc create mode 100644 doc/fr/man.fr.adoc delete mode 100644 doc/fr/man_copyright.fr.adoc delete mode 100644 doc/fr/man_files.fr.adoc delete mode 100644 doc/fr/man_plugin_options.fr.adoc create mode 100644 doc/it/man.it.adoc delete mode 100644 doc/it/man_copyright.it.adoc delete mode 100644 doc/it/man_files.it.adoc delete mode 100644 doc/it/man_plugin_options.it.adoc create mode 100644 doc/ja/man.ja.adoc delete mode 100644 doc/ja/man_copyright.ja.adoc delete mode 100644 doc/ja/man_files.ja.adoc delete mode 100644 doc/ja/man_plugin_options.ja.adoc create mode 100644 doc/pl/man.pl.adoc delete mode 100644 doc/pl/man_copyright.pl.adoc delete mode 100644 doc/pl/man_files.pl.adoc delete mode 100644 doc/pl/man_plugin_options.pl.adoc create mode 100644 doc/ru/man.ru.adoc delete mode 100644 doc/ru/man_copyright.ru.adoc delete mode 100644 doc/ru/man_files.ru.adoc delete mode 100644 doc/ru/man_plugin_options.ru.adoc diff --git a/doc/cs/CMakeLists.txt b/doc/cs/CMakeLists.txt index c49893bb2..453b677d9 100644 --- a/doc/cs/CMakeLists.txt +++ b/doc/cs/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.cs.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.cs.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.cs.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.cs.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (cs)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.cs.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.cs.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.cs.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.cs.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (cs)" ) diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am index dca08b0fb..6734933b9 100644 --- a/doc/cs/Makefile.am +++ b/doc/cs/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.cs.adoc \ weechat-headless.1.cs.adoc \ cmdline_options.cs.adoc \ + man.cs.adoc \ weechat_quickstart.cs.adoc \ $(wildcard autogen/user/*.adoc) \ $(wildcard autogen/plugin_api/*.adoc) @@ -42,9 +43,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc +weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc man.cs.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.adoc -weechat-headless.1: weechat-headless.1.cs.adoc cmdline_options.cs.adoc +weechat-headless.1: weechat-headless.1.cs.adoc cmdline_options.cs.adoc man.cs.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/cs/weechat-headless.1.cs.adoc # quickstart diff --git a/doc/cs/man.cs.adoc b/doc/cs/man.cs.adoc new file mode 100644 index 000000000..457a02930 --- /dev/null +++ b/doc/cs/man.cs.adoc @@ -0,0 +1,109 @@ +// tag::plugin_options[] +Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na +https://weechat.org/doc[WeeChat user's guide]. + +S irc pluginem se můžete doččasně připojit na server s URL jako: + + irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] + +K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick": + + irc://mynick@chat.freenode.net/#weechat + +IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například: + + irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + hlavní konfigurační soubor WeeChatu + +$HOME/.weechat/plugins.conf:: + soubor konfigurace pluginů + +$HOME/.weechat/sec.conf:: + konfigurační soubor s chráněnými daty + +$HOME/.weechat/alias.conf:: + configurační soubor pro _alias_ plugin + +$HOME/.weechat/buflist.conf:: + konfigurační soubor pro _buflist_ plugin + +$HOME/.weechat/charset.conf:: + konfigurační soubor pro _charset_ plugin + +$HOME/.weechat/exec.conf:: + konfigurační soubor pro _exec_ plugin + +$HOME/.weechat/fifo.conf:: + konfigurační soubor pro _fifo_ plugin + +$HOME/.weechat/fset.conf:: + konfigurační soubor pro _fset_ plugin + +$HOME/.weechat/guile.conf:: + konfigurační soubor pro _guile_ plugin + +$HOME/.weechat/irc.conf:: + konfigurační soubor pro _irc_ plugin + +$HOME/.weechat/javascript.conf:: + konfigurační soubor pro _javascript_ plugin + +$HOME/.weechat/logger.conf:: + konfigurační soubor pro _logger_ plugin + +$HOME/.weechat/lua.conf:: + konfigurační soubor pro _lua_ plugin + +$HOME/.weechat/perl.conf:: + konfigurační soubor pro _perl_ plugin + +$HOME/.weechat/php.conf:: + konfigurační soubor pro _php_ plugin + +$HOME/.weechat/python.conf:: + konfigurační soubor pro _python_ plugin + +$HOME/.weechat/relay.conf:: + konfigurační soubor pro _relay_ plugin + +$HOME/.weechat/ruby.conf:: + konfigurační soubor pro _ruby_ plugin + +$HOME/.weechat/script.conf:: + konfigurační soubor pro _script_ plugin + +$HOME/.weechat/spell.conf:: + konfigurační soubor pro _spell_ plugin + +$HOME/.weechat/tcl.conf:: + konfigurační soubor pro _tcl_ plugin + +$HOME/.weechat/trigger.conf:: + konfigurační soubor pro _trigger_ plugin + +$HOME/.weechat/xfer.conf:: + konfigurační soubor pro _xfer_ plugin + +$HOME/.weechat/weechat.log:: + soubor záznamů WeeChatu +// end::files[] + +// tag::copyright[] +WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v +souboru AUTHORS.adoc). + +Copyright (C) 2003-2020 {author} + +WeeChat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +Prosím přečtěte si soubor COPYING pro více informací. + +Web: https://weechat.org/ +// end::copyright[] diff --git a/doc/cs/man_copyright.cs.adoc b/doc/cs/man_copyright.cs.adoc deleted file mode 100644 index 476275871..000000000 --- a/doc/cs/man_copyright.cs.adoc +++ /dev/null @@ -1,13 +0,0 @@ -WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v -souboru AUTHORS.adoc). - -Copyright (C) 2003-2020 {author} - -WeeChat is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -Prosím přečtěte si soubor COPYING pro více informací. - -Web: https://weechat.org/ diff --git a/doc/cs/man_files.cs.adoc b/doc/cs/man_files.cs.adoc deleted file mode 100644 index 43699a3e0..000000000 --- a/doc/cs/man_files.cs.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - hlavní konfigurační soubor WeeChatu - -$HOME/.weechat/plugins.conf:: - soubor konfigurace pluginů - -$HOME/.weechat/sec.conf:: - konfigurační soubor s chráněnými daty - -$HOME/.weechat/alias.conf:: - configurační soubor pro _alias_ plugin - -$HOME/.weechat/buflist.conf:: - konfigurační soubor pro _buflist_ plugin - -$HOME/.weechat/charset.conf:: - konfigurační soubor pro _charset_ plugin - -$HOME/.weechat/exec.conf:: - konfigurační soubor pro _exec_ plugin - -$HOME/.weechat/fifo.conf:: - konfigurační soubor pro _fifo_ plugin - -$HOME/.weechat/fset.conf:: - konfigurační soubor pro _fset_ plugin - -$HOME/.weechat/guile.conf:: - konfigurační soubor pro _guile_ plugin - -$HOME/.weechat/irc.conf:: - konfigurační soubor pro _irc_ plugin - -$HOME/.weechat/javascript.conf:: - konfigurační soubor pro _javascript_ plugin - -$HOME/.weechat/logger.conf:: - konfigurační soubor pro _logger_ plugin - -$HOME/.weechat/lua.conf:: - konfigurační soubor pro _lua_ plugin - -$HOME/.weechat/perl.conf:: - konfigurační soubor pro _perl_ plugin - -$HOME/.weechat/php.conf:: - konfigurační soubor pro _php_ plugin - -$HOME/.weechat/python.conf:: - konfigurační soubor pro _python_ plugin - -$HOME/.weechat/relay.conf:: - konfigurační soubor pro _relay_ plugin - -$HOME/.weechat/ruby.conf:: - konfigurační soubor pro _ruby_ plugin - -$HOME/.weechat/script.conf:: - konfigurační soubor pro _script_ plugin - -$HOME/.weechat/spell.conf:: - konfigurační soubor pro _spell_ plugin - -$HOME/.weechat/tcl.conf:: - konfigurační soubor pro _tcl_ plugin - -$HOME/.weechat/trigger.conf:: - konfigurační soubor pro _trigger_ plugin - -$HOME/.weechat/xfer.conf:: - konfigurační soubor pro _xfer_ plugin - -$HOME/.weechat/weechat.log:: - soubor záznamů WeeChatu diff --git a/doc/cs/man_plugin_options.cs.adoc b/doc/cs/man_plugin_options.cs.adoc deleted file mode 100644 index 36f222f9c..000000000 --- a/doc/cs/man_plugin_options.cs.adoc +++ /dev/null @@ -1,14 +0,0 @@ -Pro kompletní dokumentaci nastavení pluginů a jejich volby podívejte se na -https://weechat.org/doc[WeeChat user's guide]. - -S irc pluginem se můžete doččasně připojit na server s URL jako: - - irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] - -K připojení na IRC kanál Weechatu pro podporu s přezdívkou "mynick": - - irc://mynick@chat.freenode.net/#weechat - -IPv6 adresa může být uzavřena do hranatých závorek k přidání portu, například: - - irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/cs/weechat-headless.1.cs.adoc b/doc/cs/weechat-headless.1.cs.adoc index a44cdbc48..08c250b36 100644 --- a/doc/cs/weechat-headless.1.cs.adoc +++ b/doc/cs/weechat-headless.1.cs.adoc @@ -45,11 +45,11 @@ include::cmdline_options.cs.adoc[tag=debug] == VOLBY PLUGINŮ -include::man_plugin_options.cs.adoc[] +include::man.cs.adoc[tag=plugin_options] == SOUBORY -include::man_files.cs.adoc[] +include::man.cs.adoc[tag=files] // TRANSLATION MISSING == SEE ALSO @@ -63,7 +63,7 @@ Tato manuálová stránka byla přeložena Ondřejem Súkupem. == COPYRIGHT -include::man_copyright.cs.adoc[] +include::man.cs.adoc[tag=copyright] == PODPORA / HLÁŠENÍ CHYB diff --git a/doc/cs/weechat.1.cs.adoc b/doc/cs/weechat.1.cs.adoc index 2554b6300..66cb842cd 100644 --- a/doc/cs/weechat.1.cs.adoc +++ b/doc/cs/weechat.1.cs.adoc @@ -40,11 +40,11 @@ include::cmdline_options.cs.adoc[tag=debug] == VOLBY PLUGINŮ -include::man_plugin_options.cs.adoc[] +include::man.cs.adoc[tag=plugin_options] == SOUBORY -include::man_files.cs.adoc[] +include::man.cs.adoc[tag=files] // TRANSLATION MISSING == SEE ALSO @@ -58,7 +58,7 @@ Tato manuálová stránka byla přeložena Ondřejem Súkupem. == COPYRIGHT -include::man_copyright.cs.adoc[] +include::man.cs.adoc[tag=copyright] == PODPORA / HLÁŠENÍ CHYB diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt index 39ce7ee9c..429bd72f0 100644 --- a/doc/de/CMakeLists.txt +++ b/doc/de/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.de.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.de.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.de.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.de.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (de)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.de.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.de.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.de.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.de.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.de.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (de)" ) diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am index 1fa84981d..2013afe35 100644 --- a/doc/de/Makefile.am +++ b/doc/de/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.de.adoc \ weechat-headless.1.de.adoc \ cmdline_options.de.adoc \ + man.de.adoc \ weechat_user.de.adoc \ weechat_scripting.de.adoc \ weechat_faq.de.adoc \ @@ -50,9 +51,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.de.adoc cmdline_options.de.adoc +weechat.1: weechat.1.de.adoc cmdline_options.de.adoc man.de.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.adoc -weechat-headless.1: weechat-headless.1.de.adoc cmdline_options.de.adoc +weechat-headless.1: weechat-headless.1.de.adoc cmdline_options.de.adoc man.de.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/de/weechat-headless.1.de.adoc # user's guide diff --git a/doc/de/man.de.adoc b/doc/de/man.de.adoc new file mode 100644 index 000000000..b74aabcca --- /dev/null +++ b/doc/de/man.de.adoc @@ -0,0 +1,110 @@ +// tag::plugin_options[] +Um eine vollständige Dokumentation der Optionen zu erhalten, siehe +https://weechat.org/doc[WeeChat user's guide]. + +Mittels der IRC Erweiterung kann man sich zu einen temporären Server verbinden lassen, +indem man eine URL verwendet: + + irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] + +Um dem WeeChat IRC Support-Channel, mit dem Nick "mynick", beizutreten: + + irc://mynick@chat.freenode.net/#weechat + +Um eine IPv6 Adresse zu nutzen, muss diese in eckige Klammern gesetzt werden: + + irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + WeeChats Konfigurationsdatei + +$HOME/.weechat/plugins.conf:: + Konfigurationsdatei für Erweiterungen + +$HOME/.weechat/sec.conf:: + Konfigurationsdatei mit schutzwürdigen Daten + +$HOME/.weechat/alias.conf:: + Konfigurationsdatei für _alias_ Erweiterung + +$HOME/.weechat/buflist.conf:: + Konfigurationsdatei für _buflist_ Erweiterung + +$HOME/.weechat/charset.conf:: + Konfigurationsdatei für _charset_ Erweiterung + +$HOME/.weechat/exec.conf:: + Konfigurationsdatei für _exec_ Erweiterung + +$HOME/.weechat/fifo.conf:: + Konfigurationsdatei für _fifo_ Erweiterung + +$HOME/.weechat/fset.conf:: + Konfigurationsdatei für _fset_ Erweiterung + +$HOME/.weechat/guile.conf:: + Konfigurationsdatei für _guile_ Erweiterung + +$HOME/.weechat/irc.conf:: + Konfigurationsdatei für _irc_ Erweiterung + +$HOME/.weechat/javascript.conf:: + Konfigurationsdatei für _javascript_ Erweiterung + +$HOME/.weechat/logger.conf:: + Konfigurationsdatei für _logger_ Erweiterung + +$HOME/.weechat/lua.conf:: + Konfigurationsdatei für _lua_ Erweiterung + +$HOME/.weechat/perl.conf:: + Konfigurationsdatei für _perl_ Erweiterung + +$HOME/.weechat/php.conf:: + Konfigurationsdatei für _php_ Erweiterung + +$HOME/.weechat/python.conf:: + Konfigurationsdatei für _python_ Erweiterung + +$HOME/.weechat/relay.conf:: + Konfigurationsdatei für _relay_ Erweiterung + +$HOME/.weechat/ruby.conf:: + Konfigurationsdatei für _ruby_ Erweiterung + +$HOME/.weechat/script.conf:: + Konfigurationsdatei für _script_ Erweiterung + +$HOME/.weechat/spell.conf:: + Konfigurationsdatei für _spell_ Erweiterung + +$HOME/.weechat/tcl.conf:: + Konfigurationsdatei für _tcl_ Erweiterung + +$HOME/.weechat/trigger.conf:: + Konfigurationsdatei für _trigger_ Erweiterung + +$HOME/.weechat/xfer.conf:: + Konfigurationsdatei für _xfer_ Erweiterung + +$HOME/.weechat/weechat.log:: + WeeChat Protokolldatei +// end::files[] + +// tag::copyright[] +WeeChat wird programmiert von Sébastien Helleu und weiteren Beteiligten (eine vollständige Auflistung +findet man in der AUTHORS.adoc Datei). + +Copyright (C) 2003-2020 {author} + +WeeChat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +Please read the COPYING file for more information. + +Web: https://weechat.org/ +// end::copyright[] diff --git a/doc/de/man_copyright.de.adoc b/doc/de/man_copyright.de.adoc deleted file mode 100644 index c0485f785..000000000 --- a/doc/de/man_copyright.de.adoc +++ /dev/null @@ -1,13 +0,0 @@ -WeeChat wird programmiert von Sébastien Helleu und weiteren Beteiligten (eine vollständige Auflistung -findet man in der AUTHORS.adoc Datei). - -Copyright (C) 2003-2020 {author} - -WeeChat is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -Please read the COPYING file for more information. - -Web: https://weechat.org/ diff --git a/doc/de/man_files.de.adoc b/doc/de/man_files.de.adoc deleted file mode 100644 index cdabbc226..000000000 --- a/doc/de/man_files.de.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - WeeChats Konfigurationsdatei - -$HOME/.weechat/plugins.conf:: - Konfigurationsdatei für Erweiterungen - -$HOME/.weechat/sec.conf:: - Konfigurationsdatei mit schutzwürdigen Daten - -$HOME/.weechat/alias.conf:: - Konfigurationsdatei für _alias_ Erweiterung - -$HOME/.weechat/buflist.conf:: - Konfigurationsdatei für _buflist_ Erweiterung - -$HOME/.weechat/charset.conf:: - Konfigurationsdatei für _charset_ Erweiterung - -$HOME/.weechat/exec.conf:: - Konfigurationsdatei für _exec_ Erweiterung - -$HOME/.weechat/fifo.conf:: - Konfigurationsdatei für _fifo_ Erweiterung - -$HOME/.weechat/fset.conf:: - Konfigurationsdatei für _fset_ Erweiterung - -$HOME/.weechat/guile.conf:: - Konfigurationsdatei für _guile_ Erweiterung - -$HOME/.weechat/irc.conf:: - Konfigurationsdatei für _irc_ Erweiterung - -$HOME/.weechat/javascript.conf:: - Konfigurationsdatei für _javascript_ Erweiterung - -$HOME/.weechat/logger.conf:: - Konfigurationsdatei für _logger_ Erweiterung - -$HOME/.weechat/lua.conf:: - Konfigurationsdatei für _lua_ Erweiterung - -$HOME/.weechat/perl.conf:: - Konfigurationsdatei für _perl_ Erweiterung - -$HOME/.weechat/php.conf:: - Konfigurationsdatei für _php_ Erweiterung - -$HOME/.weechat/python.conf:: - Konfigurationsdatei für _python_ Erweiterung - -$HOME/.weechat/relay.conf:: - Konfigurationsdatei für _relay_ Erweiterung - -$HOME/.weechat/ruby.conf:: - Konfigurationsdatei für _ruby_ Erweiterung - -$HOME/.weechat/script.conf:: - Konfigurationsdatei für _script_ Erweiterung - -$HOME/.weechat/spell.conf:: - Konfigurationsdatei für _spell_ Erweiterung - -$HOME/.weechat/tcl.conf:: - Konfigurationsdatei für _tcl_ Erweiterung - -$HOME/.weechat/trigger.conf:: - Konfigurationsdatei für _trigger_ Erweiterung - -$HOME/.weechat/xfer.conf:: - Konfigurationsdatei für _xfer_ Erweiterung - -$HOME/.weechat/weechat.log:: - WeeChat Protokolldatei diff --git a/doc/de/man_plugin_options.de.adoc b/doc/de/man_plugin_options.de.adoc deleted file mode 100644 index 28bb851ce..000000000 --- a/doc/de/man_plugin_options.de.adoc +++ /dev/null @@ -1,15 +0,0 @@ -Um eine vollständige Dokumentation der Optionen zu erhalten, siehe -https://weechat.org/doc[WeeChat user's guide]. - -Mittels der IRC Erweiterung kann man sich zu einen temporären Server verbinden lassen, -indem man eine URL verwendet: - - irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] - -Um dem WeeChat IRC Support-Channel, mit dem Nick "mynick", beizutreten: - - irc://mynick@chat.freenode.net/#weechat - -Um eine IPv6 Adresse zu nutzen, muss diese in eckige Klammern gesetzt werden: - - irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/de/weechat-headless.1.de.adoc b/doc/de/weechat-headless.1.de.adoc index b6326f0b0..087ac5e47 100644 --- a/doc/de/weechat-headless.1.de.adoc +++ b/doc/de/weechat-headless.1.de.adoc @@ -41,11 +41,11 @@ include::cmdline_options.de.adoc[tag=debug] == OPTIONEN VON ERWEITERUNGEN -include::man_plugin_options.de.adoc[] +include::man.de.adoc[tag=plugin_options] == DATEIEN -include::man_files.de.adoc[] +include::man.de.adoc[tag=files] == SIEHE AUCH @@ -59,7 +59,7 @@ Diese manpage wurde von {author} geschrieben. == COPYRIGHT -include::man_copyright.de.adoc[] +include::man.de.adoc[tag=copyright] == SUPPORT / FEHLER MELDEN diff --git a/doc/de/weechat.1.de.adoc b/doc/de/weechat.1.de.adoc index c90c0492b..982f30d07 100644 --- a/doc/de/weechat.1.de.adoc +++ b/doc/de/weechat.1.de.adoc @@ -37,11 +37,11 @@ include::cmdline_options.de.adoc[tag=debug] == OPTIONEN VON ERWEITERUNGEN -include::man_plugin_options.de.adoc[] +include::man.de.adoc[tag=plugin_options] == DATEIEN -include::man_files.de.adoc[] +include::man.de.adoc[tag=files] == SIEHE AUCH @@ -55,7 +55,7 @@ Diese manpage wurde von {author} geschrieben. == COPYRIGHT -include::man_copyright.de.adoc[] +include::man.de.adoc[tag=copyright] == SUPPORT / FEHLER MELDEN diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index f092ceb1d..9b74bec6c 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.en.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.en.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.en.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.en.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (en)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.en.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.en.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.en.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.en.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.en.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (en)" ) diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index cf71f7f9e..281d4cffb 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.en.adoc \ weechat-headless.1.en.adoc \ cmdline_options.en.adoc \ + man.en.adoc \ weechat_user.en.adoc \ weechat_plugin_api.en.adoc \ weechat_scripting.en.adoc \ @@ -57,9 +58,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.en.adoc cmdline_options.en.adoc +weechat.1: weechat.1.en.adoc cmdline_options.en.adoc man.en.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/en/weechat.1.en.adoc -weechat-headless.1: weechat-headless.1.en.adoc cmdline_options.en.adoc +weechat-headless.1: weechat-headless.1.en.adoc cmdline_options.en.adoc man.en.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/en/weechat-headless.1.en.adoc # user's guide diff --git a/doc/en/man.en.adoc b/doc/en/man.en.adoc new file mode 100644 index 000000000..0e1dfd6b6 --- /dev/null +++ b/doc/en/man.en.adoc @@ -0,0 +1,110 @@ +// tag::plugin_options[] +For complete doc on plugin options, please look at plugins documentation in +https://weechat.org/doc[WeeChat user's guide]. + +With irc plugin, you can connect to temporary server with an URL like: + + irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] + +To join WeeChat IRC channel support with nick "mynick": + + irc://mynick@chat.freenode.net/#weechat + +IPv6 address can be enclosed in brackets to add a port after address, for +example: + + irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + main WeeChat configuration file + +$HOME/.weechat/plugins.conf:: + plugins configuration file + +$HOME/.weechat/sec.conf:: + configuration file with secured data + +$HOME/.weechat/alias.conf:: + configuration file for _alias_ plugin + +$HOME/.weechat/buflist.conf:: + configuration file for _buflist_ plugin + +$HOME/.weechat/charset.conf:: + configuration file for _charset_ plugin + +$HOME/.weechat/exec.conf:: + configuration file for _exec_ plugin + +$HOME/.weechat/fifo.conf:: + configuration file for _fifo_ plugin + +$HOME/.weechat/fset.conf:: + configuration file for _fset_ plugin + +$HOME/.weechat/guile.conf:: + configuration file for _guile_ plugin + +$HOME/.weechat/irc.conf:: + configuration file for _irc_ plugin + +$HOME/.weechat/javascript.conf:: + configuration file for _javascript_ plugin + +$HOME/.weechat/logger.conf:: + configuration file for _logger_ plugin + +$HOME/.weechat/lua.conf:: + configuration file for _lua_ plugin + +$HOME/.weechat/perl.conf:: + configuration file for _perl_ plugin + +$HOME/.weechat/php.conf:: + configuration file for _php_ plugin + +$HOME/.weechat/python.conf:: + configuration file for _python_ plugin + +$HOME/.weechat/relay.conf:: + configuration file for _relay_ plugin + +$HOME/.weechat/ruby.conf:: + configuration file for _ruby_ plugin + +$HOME/.weechat/script.conf:: + configuration file for _script_ plugin + +$HOME/.weechat/spell.conf:: + configuration file for _spell_ plugin + +$HOME/.weechat/tcl.conf:: + configuration file for _tcl_ plugin + +$HOME/.weechat/trigger.conf:: + configuration file for _trigger_ plugin + +$HOME/.weechat/xfer.conf:: + configuration file for _xfer_ plugin + +$HOME/.weechat/weechat.log:: + WeeChat log file +// end::files[] + +// tag::copyright[] +WeeChat is written by Sébastien Helleu and contributors (complete list is in +the AUTHORS.adoc file). + +Copyright (C) 2003-2020 {author} + +WeeChat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +Please read the COPYING file for more information. + +Web: https://weechat.org/ +// end::copyright[] diff --git a/doc/en/man_copyright.en.adoc b/doc/en/man_copyright.en.adoc deleted file mode 100644 index f78bee8da..000000000 --- a/doc/en/man_copyright.en.adoc +++ /dev/null @@ -1,13 +0,0 @@ -WeeChat is written by Sébastien Helleu and contributors (complete list is in -the AUTHORS.adoc file). - -Copyright (C) 2003-2020 {author} - -WeeChat is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -Please read the COPYING file for more information. - -Web: https://weechat.org/ diff --git a/doc/en/man_files.en.adoc b/doc/en/man_files.en.adoc deleted file mode 100644 index c8722550d..000000000 --- a/doc/en/man_files.en.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - main WeeChat configuration file - -$HOME/.weechat/plugins.conf:: - plugins configuration file - -$HOME/.weechat/sec.conf:: - configuration file with secured data - -$HOME/.weechat/alias.conf:: - configuration file for _alias_ plugin - -$HOME/.weechat/buflist.conf:: - configuration file for _buflist_ plugin - -$HOME/.weechat/charset.conf:: - configuration file for _charset_ plugin - -$HOME/.weechat/exec.conf:: - configuration file for _exec_ plugin - -$HOME/.weechat/fifo.conf:: - configuration file for _fifo_ plugin - -$HOME/.weechat/fset.conf:: - configuration file for _fset_ plugin - -$HOME/.weechat/guile.conf:: - configuration file for _guile_ plugin - -$HOME/.weechat/irc.conf:: - configuration file for _irc_ plugin - -$HOME/.weechat/javascript.conf:: - configuration file for _javascript_ plugin - -$HOME/.weechat/logger.conf:: - configuration file for _logger_ plugin - -$HOME/.weechat/lua.conf:: - configuration file for _lua_ plugin - -$HOME/.weechat/perl.conf:: - configuration file for _perl_ plugin - -$HOME/.weechat/php.conf:: - configuration file for _php_ plugin - -$HOME/.weechat/python.conf:: - configuration file for _python_ plugin - -$HOME/.weechat/relay.conf:: - configuration file for _relay_ plugin - -$HOME/.weechat/ruby.conf:: - configuration file for _ruby_ plugin - -$HOME/.weechat/script.conf:: - configuration file for _script_ plugin - -$HOME/.weechat/spell.conf:: - configuration file for _spell_ plugin - -$HOME/.weechat/tcl.conf:: - configuration file for _tcl_ plugin - -$HOME/.weechat/trigger.conf:: - configuration file for _trigger_ plugin - -$HOME/.weechat/xfer.conf:: - configuration file for _xfer_ plugin - -$HOME/.weechat/weechat.log:: - WeeChat log file diff --git a/doc/en/man_plugin_options.en.adoc b/doc/en/man_plugin_options.en.adoc deleted file mode 100644 index 312c49984..000000000 --- a/doc/en/man_plugin_options.en.adoc +++ /dev/null @@ -1,15 +0,0 @@ -For complete doc on plugin options, please look at plugins documentation in -https://weechat.org/doc[WeeChat user's guide]. - -With irc plugin, you can connect to temporary server with an URL like: - - irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] - -To join WeeChat IRC channel support with nick "mynick": - - irc://mynick@chat.freenode.net/#weechat - -IPv6 address can be enclosed in brackets to add a port after address, for -example: - - irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/en/weechat-headless.1.en.adoc b/doc/en/weechat-headless.1.en.adoc index 1c230e324..e232e69d2 100644 --- a/doc/en/weechat-headless.1.en.adoc +++ b/doc/en/weechat-headless.1.en.adoc @@ -40,11 +40,11 @@ include::cmdline_options.en.adoc[tag=debug] == PLUGIN OPTIONS -include::man_plugin_options.en.adoc[] +include::man.en.adoc[tag=plugin_options] == FILES -include::man_files.en.adoc[] +include::man.en.adoc[tag=files] == SEE ALSO @@ -56,7 +56,7 @@ This manpage was written by {author}. == COPYRIGHT -include::man_copyright.en.adoc[] +include::man.en.adoc[tag=copyright] == SUPPORT / REPORTING BUGS diff --git a/doc/en/weechat.1.en.adoc b/doc/en/weechat.1.en.adoc index 1c19edeae..c3be2bed0 100644 --- a/doc/en/weechat.1.en.adoc +++ b/doc/en/weechat.1.en.adoc @@ -37,11 +37,11 @@ include::cmdline_options.en.adoc[tag=debug] == PLUGIN OPTIONS -include::man_plugin_options.en.adoc[] +include::man.en.adoc[tag=plugin_options] == FILES -include::man_files.en.adoc[] +include::man.en.adoc[tag=files] == SEE ALSO @@ -53,7 +53,7 @@ This manpage was written by {author}. == COPYRIGHT -include::man_copyright.en.adoc[] +include::man.en.adoc[tag=copyright] == SUPPORT / REPORTING BUGS diff --git a/doc/en/weechat_dev.en.adoc b/doc/en/weechat_dev.en.adoc index c5581b1b1..a6dcd5143 100644 --- a/doc/en/weechat_dev.en.adoc +++ b/doc/en/weechat_dev.en.adoc @@ -436,6 +436,7 @@ Documentation files: |    docgen.py | Python script to build files in _autogen/_ directory (see below). |    XX/ | Documentation for language XX (languages: en, fr, de, it, ...). |       cmdline_options.XX.adoc | Command-line options (file included in man pages and user's guide). +|       man.XX.adoc | Part of man pages: plugin options, files and copyright. |       weechat.1.XX.adoc | Man page (`man weechat`). |       weechat_dev.XX.adoc | link:weechat_dev.en.html[Developer's guide] (this document). |       weechat_faq.XX.adoc | link:weechat_faq.en.html[FAQ]. diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt index d9c1ea657..a226901e4 100644 --- a/doc/fr/CMakeLists.txt +++ b/doc/fr/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.fr.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.fr.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.fr.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.fr.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (fr)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.fr.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.fr.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.fr.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.fr.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.fr.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (fr)" ) diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am index 39c8a1b4c..e880cd483 100644 --- a/doc/fr/Makefile.am +++ b/doc/fr/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.fr.adoc \ weechat-headless.1.fr.adoc \ cmdline_options.fr.adoc \ + man.fr.adoc \ weechat_user.fr.adoc \ weechat_plugin_api.fr.adoc \ weechat_scripting.fr.adoc \ @@ -57,9 +58,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.fr.adoc cmdline_options.fr.adoc +weechat.1: weechat.1.fr.adoc cmdline_options.fr.adoc man.fr.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/fr/weechat.1.fr.adoc -weechat-headless.1: weechat-headless.1.fr.adoc cmdline_options.fr.adoc +weechat-headless.1: weechat-headless.1.fr.adoc cmdline_options.fr.adoc man.fr.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/fr/weechat-headless.1.fr.adoc # user's guide diff --git a/doc/fr/man.fr.adoc b/doc/fr/man.fr.adoc new file mode 100644 index 000000000..98e32870a --- /dev/null +++ b/doc/fr/man.fr.adoc @@ -0,0 +1,112 @@ +// tag::plugin_options[] +Pour une documentation complète sur les options des extensions, merci de +consulter la documentation des extensions dans le +https://weechat.org/doc[guide utilisateur de WeeChat]. + +Avec l'extension irc, vous pouvez vous connecter à un serveur de manière +temporaire avec une URL, comme ceci : + + irc[6][s]://[[pseudo][:motdepasse]@]serveur[:port][/#canal1[,#canal2...]] + +Pour rejoindre le canal IRC de support WeeChat avec le pseudo "monpseudo" : + + irc://monpseudo@chat.freenode.net/#weechat + +Les adresses IPv6 peuvent être entourées par des crochets pour ajouter un port +après, par exemple : + + irc://monpseudo@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + fichier de configuration principal de WeeChat + +$HOME/.weechat/plugins.conf:: + fichier de configuration des extensions + +$HOME/.weechat/sec.conf:: + fichier de configuration avec les données sécurisées + +$HOME/.weechat/alias.conf:: + fichier de configuration pour l'extension _alias_ + +$HOME/.weechat/buflist.conf:: + fichier de configuration pour l'extension _buflist_ + +$HOME/.weechat/charset.conf:: + fichier de configuration pour l'extension _charset_ + +$HOME/.weechat/exec.conf:: + fichier de configuration pour l'extension _exec_ + +$HOME/.weechat/fifo.conf:: + fichier de configuration pour l'extension _fifo_ + +$HOME/.weechat/fset.conf:: + fichier de configuration pour l'extension _fset_ + +$HOME/.weechat/guile.conf:: + fichier de configuration pour l'extension _guile_ + +$HOME/.weechat/irc.conf:: + fichier de configuration pour l'extension _irc_ + +$HOME/.weechat/javascript.conf:: + fichier de configuration pour l'extension _javascript_ + +$HOME/.weechat/logger.conf:: + fichier de configuration pour l'extension _logger_ + +$HOME/.weechat/lua.conf:: + fichier de configuration pour l'extension _lua_ + +$HOME/.weechat/perl.conf:: + fichier de configuration pour l'extension _perl_ + +$HOME/.weechat/php.conf:: + fichier de configuration pour l'extension _php_ + +$HOME/.weechat/python.conf:: + fichier de configuration pour l'extension _python_ + +$HOME/.weechat/relay.conf:: + fichier de configuration pour l'extension _relay_ + +$HOME/.weechat/ruby.conf:: + fichier de configuration pour l'extension _ruby_ + +$HOME/.weechat/script.conf:: + fichier de configuration pour l'extension _script_ + +$HOME/.weechat/spell.conf:: + fichier de configuration pour l'extension _spell_ + +$HOME/.weechat/tcl.conf:: + fichier de configuration pour l'extension _tcl_ + +$HOME/.weechat/trigger.conf:: + fichier de configuration pour l'extension _trigger_ + +$HOME/.weechat/xfer.conf:: + fichier de configuration pour l'extension _xfer_ + +$HOME/.weechat/weechat.log:: + fichier de log de WeeChat +// end::files[] + +// tag::copyright[] +WeeChat est écrit par Sébastien Helleu et des contributeurs (la liste complète +est dans le fichier AUTHORS.adoc). + +Copyright (C) 2003-2020 {author} + +WeeChat est un logiciel libre; vous pouvez le redistribuer et/ou le modifier +sous les termes de la GNU General Public License telle que publiée par la +Free Software Foundation; soit la version 3 de la licence, ou (selon votre +choix) toute version ultérieure. + +Merci de consulter le fichier COPYING pour plus d'informations. + +Site web : https://weechat.org/ +// end::copyright[] diff --git a/doc/fr/man_copyright.fr.adoc b/doc/fr/man_copyright.fr.adoc deleted file mode 100644 index d330c21cd..000000000 --- a/doc/fr/man_copyright.fr.adoc +++ /dev/null @@ -1,13 +0,0 @@ -WeeChat est écrit par Sébastien Helleu et des contributeurs (la liste complète -est dans le fichier AUTHORS.adoc). - -Copyright (C) 2003-2020 {author} - -WeeChat est un logiciel libre; vous pouvez le redistribuer et/ou le modifier -sous les termes de la GNU General Public License telle que publiée par la -Free Software Foundation; soit la version 3 de la licence, ou (selon votre -choix) toute version ultérieure. - -Merci de consulter le fichier COPYING pour plus d'informations. - -Site web : https://weechat.org/ diff --git a/doc/fr/man_files.fr.adoc b/doc/fr/man_files.fr.adoc deleted file mode 100644 index 7043d8aa0..000000000 --- a/doc/fr/man_files.fr.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - fichier de configuration principal de WeeChat - -$HOME/.weechat/plugins.conf:: - fichier de configuration des extensions - -$HOME/.weechat/sec.conf:: - fichier de configuration avec les données sécurisées - -$HOME/.weechat/alias.conf:: - fichier de configuration pour l'extension _alias_ - -$HOME/.weechat/buflist.conf:: - fichier de configuration pour l'extension _buflist_ - -$HOME/.weechat/charset.conf:: - fichier de configuration pour l'extension _charset_ - -$HOME/.weechat/exec.conf:: - fichier de configuration pour l'extension _exec_ - -$HOME/.weechat/fifo.conf:: - fichier de configuration pour l'extension _fifo_ - -$HOME/.weechat/fset.conf:: - fichier de configuration pour l'extension _fset_ - -$HOME/.weechat/guile.conf:: - fichier de configuration pour l'extension _guile_ - -$HOME/.weechat/irc.conf:: - fichier de configuration pour l'extension _irc_ - -$HOME/.weechat/javascript.conf:: - fichier de configuration pour l'extension _javascript_ - -$HOME/.weechat/logger.conf:: - fichier de configuration pour l'extension _logger_ - -$HOME/.weechat/lua.conf:: - fichier de configuration pour l'extension _lua_ - -$HOME/.weechat/perl.conf:: - fichier de configuration pour l'extension _perl_ - -$HOME/.weechat/php.conf:: - fichier de configuration pour l'extension _php_ - -$HOME/.weechat/python.conf:: - fichier de configuration pour l'extension _python_ - -$HOME/.weechat/relay.conf:: - fichier de configuration pour l'extension _relay_ - -$HOME/.weechat/ruby.conf:: - fichier de configuration pour l'extension _ruby_ - -$HOME/.weechat/script.conf:: - fichier de configuration pour l'extension _script_ - -$HOME/.weechat/spell.conf:: - fichier de configuration pour l'extension _spell_ - -$HOME/.weechat/tcl.conf:: - fichier de configuration pour l'extension _tcl_ - -$HOME/.weechat/trigger.conf:: - fichier de configuration pour l'extension _trigger_ - -$HOME/.weechat/xfer.conf:: - fichier de configuration pour l'extension _xfer_ - -$HOME/.weechat/weechat.log:: - fichier de log de WeeChat diff --git a/doc/fr/man_plugin_options.fr.adoc b/doc/fr/man_plugin_options.fr.adoc deleted file mode 100644 index 899c3a53d..000000000 --- a/doc/fr/man_plugin_options.fr.adoc +++ /dev/null @@ -1,17 +0,0 @@ -Pour une documentation complète sur les options des extensions, merci de -consulter la documentation des extensions dans le -https://weechat.org/doc[guide utilisateur de WeeChat]. - -Avec l'extension irc, vous pouvez vous connecter à un serveur de manière -temporaire avec une URL, comme ceci : - - irc[6][s]://[[pseudo][:motdepasse]@]serveur[:port][/#canal1[,#canal2...]] - -Pour rejoindre le canal IRC de support WeeChat avec le pseudo "monpseudo" : - - irc://monpseudo@chat.freenode.net/#weechat - -Les adresses IPv6 peuvent être entourées par des crochets pour ajouter un port -après, par exemple : - - irc://monpseudo@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/fr/weechat-headless.1.fr.adoc b/doc/fr/weechat-headless.1.fr.adoc index 1e2238619..fc697b738 100644 --- a/doc/fr/weechat-headless.1.fr.adoc +++ b/doc/fr/weechat-headless.1.fr.adoc @@ -42,11 +42,11 @@ include::cmdline_options.fr.adoc[tag=debug] == OPTIONS D'EXTENSION -include::man_plugin_options.fr.adoc[] +include::man.fr.adoc[tag=plugin_options] == FICHIERS -include::man_files.fr.adoc[] +include::man.fr.adoc[tag=files] == VOIR AUSSI @@ -58,7 +58,7 @@ Cette page de manuel a été écrite par {author}. == COPYRIGHT -include::man_copyright.fr.adoc[] +include::man.fr.adoc[tag=copyright] == SUPPORT / SIGNALER DES BUGS diff --git a/doc/fr/weechat.1.fr.adoc b/doc/fr/weechat.1.fr.adoc index ef60d38c2..002bf16f3 100644 --- a/doc/fr/weechat.1.fr.adoc +++ b/doc/fr/weechat.1.fr.adoc @@ -38,11 +38,11 @@ include::cmdline_options.fr.adoc[tag=debug] == OPTIONS D'EXTENSION -include::man_plugin_options.fr.adoc[] +include::man.fr.adoc[tag=plugin_options] == FICHIERS -include::man_files.fr.adoc[] +include::man.fr.adoc[tag=files] == VOIR AUSSI @@ -54,7 +54,7 @@ Cette page de manuel a été écrite par {author}. == COPYRIGHT -include::man_copyright.fr.adoc[] +include::man.fr.adoc[tag=copyright] == SUPPORT / SIGNALER DES BUGS diff --git a/doc/fr/weechat_dev.fr.adoc b/doc/fr/weechat_dev.fr.adoc index 829f1a3eb..f8abc0be8 100644 --- a/doc/fr/weechat_dev.fr.adoc +++ b/doc/fr/weechat_dev.fr.adoc @@ -437,6 +437,7 @@ Fichiers de documentation : |    docgen.py | Script Python pour construire les fichiers dans le répertoire _autogen/_ (voir ci-dessous). |    XX/ | Documentation pour la langue XX (langues : en, fr, de, it, ...). |       cmdline_options.XX.adoc | Options de ligne de commande (fichier inclus dans les pages de manuel et le guide utilisateur). +|       man.XX.adoc | Parties des pages de manuel : options d'extension, fichiers et copyright. |       weechat.1.XX.adoc | Page de manuel (`man weechat`). |       weechat_dev.XX.adoc | link:weechat_dev.fr.html[Guide du développeur] (ce document). |       weechat_faq.XX.adoc | link:weechat_faq.fr.html[FAQ] (questions fréquemment posées). diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt index 3a493bc13..044f93675 100644 --- a/doc/it/CMakeLists.txt +++ b/doc/it/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.it.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.it.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.it.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.it.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (it)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.it.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.it.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.it.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.it.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.it.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (it)" ) diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am index 88ef05f3d..11a86b4b9 100644 --- a/doc/it/Makefile.am +++ b/doc/it/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.it.adoc \ weechat-headless.1.it.adoc \ cmdline_options.it.adoc \ + man.it.adoc \ weechat_user.it.adoc \ weechat_plugin_api.it.adoc \ weechat_scripting.it.adoc \ @@ -52,9 +53,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.it.adoc cmdline_options.it.adoc +weechat.1: weechat.1.it.adoc cmdline_options.it.adoc man.it.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/it/weechat.1.it.adoc -weechat-headless.1: weechat-headless.1.it.adoc cmdline_options.it.adoc +weechat-headless.1: weechat-headless.1.it.adoc cmdline_options.it.adoc man.it.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/it/weechat-headless.1.it.adoc # user's guide diff --git a/doc/it/man.it.adoc b/doc/it/man.it.adoc new file mode 100644 index 000000000..44f8f1929 --- /dev/null +++ b/doc/it/man.it.adoc @@ -0,0 +1,113 @@ +// tag::plugin_options[] +// TRANSLATION MISSING +For complete doc on plugin options, please look at plugins documentation in +https://weechat.org/doc[WeeChat user's guide]. + +With irc plugin, you can connect to temporary server with an URL like: + + irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] + +To join WeeChat IRC channel support with nick "mynick": + + irc://mynick@chat.freenode.net/#weechat + +IPv6 address can be enclosed in brackets to add a port after address, for +example: + + irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +// TRANSLATION MISSING +$HOME/.weechat/weechat.conf:: + main WeeChat configuration file + +$HOME/.weechat/plugins.conf:: + plugins configuration file + +$HOME/.weechat/sec.conf:: + configuration file with secured data + +$HOME/.weechat/alias.conf:: + configuration file for _alias_ plugin + +$HOME/.weechat/buflist.conf:: + configuration file for _buflist_ plugin + +$HOME/.weechat/charset.conf:: + configuration file for _charset_ plugin + +$HOME/.weechat/exec.conf:: + configuration file for _exec_ plugin + +$HOME/.weechat/fifo.conf:: + configuration file for _fifo_ plugin + +$HOME/.weechat/fset.conf:: + configuration file for _fset_ plugin + +$HOME/.weechat/guile.conf:: + configuration file for _guile_ plugin + +$HOME/.weechat/irc.conf:: + configuration file for _irc_ plugin + +$HOME/.weechat/javascript.conf:: + configuration file for _javascript_ plugin + +$HOME/.weechat/logger.conf:: + configuration file for _logger_ plugin + +$HOME/.weechat/lua.conf:: + configuration file for _lua_ plugin + +$HOME/.weechat/perl.conf:: + configuration file for _perl_ plugin + +$HOME/.weechat/php.conf:: + configuration file for _php_ plugin + +$HOME/.weechat/python.conf:: + configuration file for _python_ plugin + +$HOME/.weechat/relay.conf:: + configuration file for _relay_ plugin + +$HOME/.weechat/ruby.conf:: + configuration file for _ruby_ plugin + +$HOME/.weechat/script.conf:: + configuration file for _script_ plugin + +$HOME/.weechat/spell.conf:: + configuration file for _spell_ plugin + +$HOME/.weechat/tcl.conf:: + configuration file for _tcl_ plugin + +$HOME/.weechat/trigger.conf:: + configuration file for _trigger_ plugin + +$HOME/.weechat/xfer.conf:: + configuration file for _xfer_ plugin + +$HOME/.weechat/weechat.log:: + WeeChat log file +// end::files[] + +// tag::copyright[] +// TRANSLATION MISSING +WeeChat is written by Sébastien Helleu and contributors (complete list is in +the AUTHORS.adoc file). + +Copyright (C) 2003-2020 {author} + +WeeChat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +Please read the COPYING file for more information. + +Web: https://weechat.org/ +// end::copyright[] diff --git a/doc/it/man_copyright.it.adoc b/doc/it/man_copyright.it.adoc deleted file mode 100644 index 0a0e0ed99..000000000 --- a/doc/it/man_copyright.it.adoc +++ /dev/null @@ -1,14 +0,0 @@ -// TRANSLATION MISSING -WeeChat is written by Sébastien Helleu and contributors (complete list is in -the AUTHORS.adoc file). - -Copyright (C) 2003-2020 {author} - -WeeChat is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -Please read the COPYING file for more information. - -Web: https://weechat.org/ diff --git a/doc/it/man_files.it.adoc b/doc/it/man_files.it.adoc deleted file mode 100644 index 390f9abd3..000000000 --- a/doc/it/man_files.it.adoc +++ /dev/null @@ -1,75 +0,0 @@ -// TRANSLATION MISSING -$HOME/.weechat/weechat.conf:: - main WeeChat configuration file - -$HOME/.weechat/plugins.conf:: - plugins configuration file - -$HOME/.weechat/sec.conf:: - configuration file with secured data - -$HOME/.weechat/alias.conf:: - configuration file for _alias_ plugin - -$HOME/.weechat/buflist.conf:: - configuration file for _buflist_ plugin - -$HOME/.weechat/charset.conf:: - configuration file for _charset_ plugin - -$HOME/.weechat/exec.conf:: - configuration file for _exec_ plugin - -$HOME/.weechat/fifo.conf:: - configuration file for _fifo_ plugin - -$HOME/.weechat/fset.conf:: - configuration file for _fset_ plugin - -$HOME/.weechat/guile.conf:: - configuration file for _guile_ plugin - -$HOME/.weechat/irc.conf:: - configuration file for _irc_ plugin - -$HOME/.weechat/javascript.conf:: - configuration file for _javascript_ plugin - -$HOME/.weechat/logger.conf:: - configuration file for _logger_ plugin - -$HOME/.weechat/lua.conf:: - configuration file for _lua_ plugin - -$HOME/.weechat/perl.conf:: - configuration file for _perl_ plugin - -$HOME/.weechat/php.conf:: - configuration file for _php_ plugin - -$HOME/.weechat/python.conf:: - configuration file for _python_ plugin - -$HOME/.weechat/relay.conf:: - configuration file for _relay_ plugin - -$HOME/.weechat/ruby.conf:: - configuration file for _ruby_ plugin - -$HOME/.weechat/script.conf:: - configuration file for _script_ plugin - -$HOME/.weechat/spell.conf:: - configuration file for _spell_ plugin - -$HOME/.weechat/tcl.conf:: - configuration file for _tcl_ plugin - -$HOME/.weechat/trigger.conf:: - configuration file for _trigger_ plugin - -$HOME/.weechat/xfer.conf:: - configuration file for _xfer_ plugin - -$HOME/.weechat/weechat.log:: - WeeChat log file diff --git a/doc/it/man_plugin_options.it.adoc b/doc/it/man_plugin_options.it.adoc deleted file mode 100644 index 302500b9e..000000000 --- a/doc/it/man_plugin_options.it.adoc +++ /dev/null @@ -1,16 +0,0 @@ -// TRANSLATION MISSING -For complete doc on plugin options, please look at plugins documentation in -https://weechat.org/doc[WeeChat user's guide]. - -With irc plugin, you can connect to temporary server with an URL like: - - irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] - -To join WeeChat IRC channel support with nick "mynick": - - irc://mynick@chat.freenode.net/#weechat - -IPv6 address can be enclosed in brackets to add a port after address, for -example: - - irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/it/weechat-headless.1.it.adoc b/doc/it/weechat-headless.1.it.adoc index a07f2d99d..6d08d0564 100644 --- a/doc/it/weechat-headless.1.it.adoc +++ b/doc/it/weechat-headless.1.it.adoc @@ -46,12 +46,12 @@ include::cmdline_options.it.adoc[tag=debug] == PLUGIN OPTIONS -include::man_plugin_options.it.adoc[] +include::man.it.adoc[tag=plugin_options] // TRANSLATION MISSING == FILES -include::man_files.it.adoc[] +include::man.it.adoc[tag=files] // TRANSLATION MISSING == SEE ALSO @@ -67,7 +67,7 @@ This manpage was written by {author}. == COPYRIGHT -include::man_copyright.it.adoc[] +include::man.it.adoc[tag=copyright] // TRANSLATION MISSING == SUPPORT / REPORTING BUGS diff --git a/doc/it/weechat.1.it.adoc b/doc/it/weechat.1.it.adoc index 65992ff30..391e0057c 100644 --- a/doc/it/weechat.1.it.adoc +++ b/doc/it/weechat.1.it.adoc @@ -42,12 +42,12 @@ include::cmdline_options.it.adoc[tag=debug] == PLUGIN OPTIONS -include::man_plugin_options.it.adoc[] +include::man.it.adoc[tag=plugin_options] // TRANSLATION MISSING == FILES -include::man_files.it.adoc[] +include::man.it.adoc[tag=files] // TRANSLATION MISSING == SEE ALSO @@ -63,7 +63,7 @@ This manpage was written by {author}. == COPYRIGHT -include::man_copyright.it.adoc[] +include::man.it.adoc[tag=copyright] // TRANSLATION MISSING == SUPPORT / REPORTING BUGS diff --git a/doc/ja/CMakeLists.txt b/doc/ja/CMakeLists.txt index 5b0b71691..3cd1e1197 100644 --- a/doc/ja/CMakeLists.txt +++ b/doc/ja/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.ja.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.ja.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.ja.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.ja.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (ja)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.ja.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.ja.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.ja.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.ja.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.ja.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (ja)" ) diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am index 88174c2f7..aadab903f 100644 --- a/doc/ja/Makefile.am +++ b/doc/ja/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.ja.adoc \ weechat-headless.1.ja.adoc \ cmdline_options.ja.adoc \ + man.ja.adoc \ weechat_user.ja.adoc \ weechat_plugin_api.ja.adoc \ weechat_scripting.ja.adoc \ @@ -56,9 +57,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.ja.adoc cmdline_options.ja.adoc +weechat.1: weechat.1.ja.adoc cmdline_options.ja.adoc man.ja.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ja/weechat.1.ja.adoc -weechat-headless.1: weechat-headless.1.ja.adoc cmdline_options.ja.adoc +weechat-headless.1: weechat-headless.1.ja.adoc cmdline_options.ja.adoc man.ja.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/ja/weechat-headless.1.ja.adoc # user's guide diff --git a/doc/ja/man.ja.adoc b/doc/ja/man.ja.adoc new file mode 100644 index 000000000..d165448d4 --- /dev/null +++ b/doc/ja/man.ja.adoc @@ -0,0 +1,109 @@ +// tag::plugin_options[] +プラグインオプションに関する完全な文書は +https://weechat.org/doc[WeeChat ユーザーズガイド] のプラグインの章を参照してください。 + +irc プラグインでは以下の様な URL で一時的なサーバに接続することができます: + + irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] + +"mynick" というニックネームで WeeChat IRC チャンネルサポートに参加するには: + + irc://mynick@chat.freenode.net/#weechat + +IPv6 アドレスの後にポートを指定するには IPv6 +アドレスを括弧に入れてください、例えば: + + irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + WeeChat の主要設定ファイル + +$HOME/.weechat/plugins.conf:: + プラグイン設定ファイル + +$HOME/.weechat/sec.conf:: + 保護されたデータを含む設定ファイル + +$HOME/.weechat/alias.conf:: + _alias_ プラグイン用の設定ファイル + +$HOME/.weechat/buflist.conf:: + _buflist_ プラグイン用の設定ファイル + +$HOME/.weechat/charset.conf:: + _charset_ プラグイン用の設定ファイル + +$HOME/.weechat/exec.conf:: + _exec_ プラグイン用の設定ファイル + +$HOME/.weechat/fifo.conf:: + _fifo_ プラグイン用の設定ファイル + +$HOME/.weechat/fset.conf:: + _fset_ プラグイン用の設定ファイル + +$HOME/.weechat/guile.conf:: + _guile_ プラグイン用の設定ファイル + +$HOME/.weechat/irc.conf:: + _irc_ プラグイン用の設定ファイル + +$HOME/.weechat/javascript.conf:: + _javascript_ プラグイン用の設定ファイル + +$HOME/.weechat/logger.conf:: + _logger_ プラグイン用の設定ファイル + +$HOME/.weechat/lua.conf:: + _lua_ プラグイン用の設定ファイル + +$HOME/.weechat/perl.conf:: + _perl_ プラグイン用の設定ファイル + +$HOME/.weechat/php.conf:: + _php_ プラグイン用の設定ファイル + +$HOME/.weechat/python.conf:: + _python_ プラグイン用の設定ファイル + +$HOME/.weechat/relay.conf:: + _relay_ プラグイン用の設定ファイル + +$HOME/.weechat/ruby.conf:: + _ruby_ プラグイン用の設定ファイル + +$HOME/.weechat/script.conf:: + _script_ プラグイン用の設定ファイル + +$HOME/.weechat/spell.conf:: + _spell_ プラグイン用の設定ファイル + +$HOME/.weechat/tcl.conf:: + _tcl_ プラグイン用の設定ファイル + +$HOME/.weechat/trigger.conf:: + _trigger_ プラグイン用の設定ファイル + +$HOME/.weechat/xfer.conf:: + _xfer_ プラグイン用の設定ファイル + +$HOME/.weechat/weechat.log:: + WeeChat ログファイル +// end::files[] + +// tag::copyright[] +WeeChat は Sébastien Helleu さんと貢献者によって作成されています +(完全なリストは AUTHORS.adoc ファイルを参照してください)。 + +著作権 (C) 2003-2020 {author} + +WeeChat はフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された +GNU 一般公衆利用許諾契約書 (バージョン 2 か、希望によってはそれ以降のバージョンのうちどれか) +の定める条件の下で再頒布または改変することができます。 + +より詳しい情報は COPYING ファイルを読んでください。 + +Web: https://weechat.org/ +// end::copyright[] diff --git a/doc/ja/man_copyright.ja.adoc b/doc/ja/man_copyright.ja.adoc deleted file mode 100644 index b4c6376d2..000000000 --- a/doc/ja/man_copyright.ja.adoc +++ /dev/null @@ -1,12 +0,0 @@ -WeeChat は Sébastien Helleu さんと貢献者によって作成されています -(完全なリストは AUTHORS.adoc ファイルを参照してください)。 - -著作権 (C) 2003-2020 {author} - -WeeChat はフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された -GNU 一般公衆利用許諾契約書 (バージョン 2 か、希望によってはそれ以降のバージョンのうちどれか) -の定める条件の下で再頒布または改変することができます。 - -より詳しい情報は COPYING ファイルを読んでください。 - -Web: https://weechat.org/ diff --git a/doc/ja/man_files.ja.adoc b/doc/ja/man_files.ja.adoc deleted file mode 100644 index 50c268377..000000000 --- a/doc/ja/man_files.ja.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - WeeChat の主要設定ファイル - -$HOME/.weechat/plugins.conf:: - プラグイン設定ファイル - -$HOME/.weechat/sec.conf:: - 保護されたデータを含む設定ファイル - -$HOME/.weechat/alias.conf:: - _alias_ プラグイン用の設定ファイル - -$HOME/.weechat/buflist.conf:: - _buflist_ プラグイン用の設定ファイル - -$HOME/.weechat/charset.conf:: - _charset_ プラグイン用の設定ファイル - -$HOME/.weechat/exec.conf:: - _exec_ プラグイン用の設定ファイル - -$HOME/.weechat/fifo.conf:: - _fifo_ プラグイン用の設定ファイル - -$HOME/.weechat/fset.conf:: - _fset_ プラグイン用の設定ファイル - -$HOME/.weechat/guile.conf:: - _guile_ プラグイン用の設定ファイル - -$HOME/.weechat/irc.conf:: - _irc_ プラグイン用の設定ファイル - -$HOME/.weechat/javascript.conf:: - _javascript_ プラグイン用の設定ファイル - -$HOME/.weechat/logger.conf:: - _logger_ プラグイン用の設定ファイル - -$HOME/.weechat/lua.conf:: - _lua_ プラグイン用の設定ファイル - -$HOME/.weechat/perl.conf:: - _perl_ プラグイン用の設定ファイル - -$HOME/.weechat/php.conf:: - _php_ プラグイン用の設定ファイル - -$HOME/.weechat/python.conf:: - _python_ プラグイン用の設定ファイル - -$HOME/.weechat/relay.conf:: - _relay_ プラグイン用の設定ファイル - -$HOME/.weechat/ruby.conf:: - _ruby_ プラグイン用の設定ファイル - -$HOME/.weechat/script.conf:: - _script_ プラグイン用の設定ファイル - -$HOME/.weechat/spell.conf:: - _spell_ プラグイン用の設定ファイル - -$HOME/.weechat/tcl.conf:: - _tcl_ プラグイン用の設定ファイル - -$HOME/.weechat/trigger.conf:: - _trigger_ プラグイン用の設定ファイル - -$HOME/.weechat/xfer.conf:: - _xfer_ プラグイン用の設定ファイル - -$HOME/.weechat/weechat.log:: - WeeChat ログファイル diff --git a/doc/ja/man_plugin_options.ja.adoc b/doc/ja/man_plugin_options.ja.adoc deleted file mode 100644 index cf43fe30d..000000000 --- a/doc/ja/man_plugin_options.ja.adoc +++ /dev/null @@ -1,15 +0,0 @@ -プラグインオプションに関する完全な文書は -https://weechat.org/doc[WeeChat ユーザーズガイド] のプラグインの章を参照してください。 - -irc プラグインでは以下の様な URL で一時的なサーバに接続することができます: - - irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] - -"mynick" というニックネームで WeeChat IRC チャンネルサポートに参加するには: - - irc://mynick@chat.freenode.net/#weechat - -IPv6 アドレスの後にポートを指定するには IPv6 -アドレスを括弧に入れてください、例えば: - - irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/ja/weechat-headless.1.ja.adoc b/doc/ja/weechat-headless.1.ja.adoc index 569558677..ea6e1ea9d 100644 --- a/doc/ja/weechat-headless.1.ja.adoc +++ b/doc/ja/weechat-headless.1.ja.adoc @@ -40,11 +40,11 @@ include::cmdline_options.ja.adoc[tag=debug] == プラグインオプション -include::man_plugin_options.ja.adoc[] +include::man.ja.adoc[tag=plugin_options] == ファイル -include::man_files.ja.adoc[] +include::man.ja.adoc[tag=files] == 関連項目 @@ -58,7 +58,7 @@ include::man_files.ja.adoc[] == 著作権 -include::man_copyright.ja.adoc[] +include::man.ja.adoc[tag=copyright] == サポート / バグ報告 diff --git a/doc/ja/weechat.1.ja.adoc b/doc/ja/weechat.1.ja.adoc index 15c2acce8..08116deaf 100644 --- a/doc/ja/weechat.1.ja.adoc +++ b/doc/ja/weechat.1.ja.adoc @@ -37,11 +37,11 @@ include::cmdline_options.ja.adoc[tag=debug] == プラグインオプション -include::man_plugin_options.ja.adoc[] +include::man.ja.adoc[tag=plugin_options] == ファイル -include::man_files.ja.adoc[] +include::man.ja.adoc[tag=files] == 関連項目 @@ -55,7 +55,7 @@ include::man_files.ja.adoc[] == 著作権 -include::man_copyright.ja.adoc[] +include::man.ja.adoc[tag=copyright] == サポート / バグ報告 diff --git a/doc/ja/weechat_dev.ja.adoc b/doc/ja/weechat_dev.ja.adoc index 7c3b687b6..232731fcd 100644 --- a/doc/ja/weechat_dev.ja.adoc +++ b/doc/ja/weechat_dev.ja.adoc @@ -457,6 +457,8 @@ WeeChat "core" は以下のディレクトリに配置されています: |    XX/ | 言語コード XX (言語コード: en、fr、de、it、...) 用のディレクトリ // TRANSLATION MISSING |       cmdline_options.XX.adoc | Command-line options (file included in man pages and user's guide). +// TRANSLATION MISSING +|       man.XX.adoc | Part of man pages: plugin options, files and copyright. |       weechat.1.XX.adoc | man ページ (`man weechat`) |       weechat_dev.XX.adoc | link:weechat_dev.ja.html[開発者リファレンス] (この文書) |       weechat_faq.XX.adoc | link:weechat_faq.ja.html[FAQ] diff --git a/doc/pl/CMakeLists.txt b/doc/pl/CMakeLists.txt index c2541fcbb..c248d428e 100644 --- a/doc/pl/CMakeLists.txt +++ b/doc/pl/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.pl.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.pl.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.pl.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.pl.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (pl)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.pl.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.pl.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.pl.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.pl.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.pl.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (pl)" ) diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am index 981d36077..ad921dd39 100644 --- a/doc/pl/Makefile.am +++ b/doc/pl/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.pl.adoc \ weechat-headless.1.pl.adoc \ cmdline_options.pl.adoc \ + man.pl.adoc \ weechat_user.pl.adoc \ weechat_scripting.pl.adoc \ weechat_faq.pl.adoc \ @@ -50,9 +51,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.pl.adoc cmdline_options.pl.adoc +weechat.1: weechat.1.pl.adoc cmdline_options.pl.adoc man.pl.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/pl/weechat.1.pl.adoc -weechat-headless.1: weechat-headless.1.pl.adoc cmdline_options.pl.adoc +weechat-headless.1: weechat-headless.1.pl.adoc cmdline_options.pl.adoc man.pl.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/pl/weechat-headless.1.pl.adoc # user's guide diff --git a/doc/pl/man.pl.adoc b/doc/pl/man.pl.adoc new file mode 100644 index 000000000..8702a2eed --- /dev/null +++ b/doc/pl/man.pl.adoc @@ -0,0 +1,111 @@ +// tag::plugin_options[] +Kompletna dokumentacja na temat opcji wtyczek dostępna jest +w https://weechat.org/doc[WeeChat user's guide]. + +Dzięki wtyczce irc możliwe jest połączenie z serwerami tymczasowymi za pomocą +URLi jak: + + irc[6][s]://[[nick][:hasło]@]serwer[:port][/#kanał1[,#kanał2...]] + +Aby wejść na kanał IRC poświęcony WeeChat pod nickiem "mójnick": + + irc://mójnick@chat.freenode.net/#weechat + +Adresy IPv6 mogą być otoczone nawiasami kwadratowymi, aby możliwe było podanie +numeru potyu po adresie, na przykład: + + irc://mójnick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + główny plik konfiguracyjny WeeChat + +$HOME/.weechat/plugins.conf:: + plik konfiguracyjny wtyczek + +$HOME/.weechat/sec.conf:: + plik konfiguracyjny z zabezpieczonymi danymi + +$HOME/.weechat/alias.conf:: + plik konfiguracyjny wtyczki _alias_ + +$HOME/.weechat/buflist.conf:: + plik konfiguracyjny wtyczki _buflist_ + +$HOME/.weechat/charset.conf:: + plik konfiguracyjny wtyczki _charset_ + +$HOME/.weechat/exec.conf:: + plik konfiguracyjny wtyczki _exec_ + +$HOME/.weechat/fifo.conf:: + plik konfiguracyjny wtyczki _fifo_ + +$HOME/.weechat/fset.conf:: + plik konfiguracyjny wtyczki _fset_ + +$HOME/.weechat/guile.conf:: + plik konfiguracyjny wtyczki _guile_ + +$HOME/.weechat/irc.conf:: + plik konfiguracyjny wtyczki _irc_ + +$HOME/.weechat/javascript.conf:: + plik konfiguracyjny wtyczki _javascript_ + +$HOME/.weechat/logger.conf:: + plik konfiguracyjny wtyczki _logger_ + +$HOME/.weechat/lua.conf:: + plik konfiguracyjny wtyczki _lua_ + +$HOME/.weechat/perl.conf:: + plik konfiguracyjny wtyczki _perl_ + +$HOME/.weechat/php.conf:: + plik konfiguracyjny wtyczki _php_ + +$HOME/.weechat/python.conf:: + plik konfiguracyjny wtyczki _python_ + +$HOME/.weechat/relay.conf:: + plik konfiguracyjny wtyczki _relay_ + +$HOME/.weechat/ruby.conf:: + plik konfiguracyjny wtyczki _ruby_ + +$HOME/.weechat/script.conf:: + plik konfiguracyjny wtyczki _script_ + +$HOME/.weechat/spell.conf:: + plik konfiguracyjny wtyczki _spell_ + +$HOME/.weechat/tcl.conf:: + plik konfiguracyjny wtyczki _tcl_ + +$HOME/.weechat/trigger.conf:: + plik konfiguracyjny wtyczki _trigger_ + +$HOME/.weechat/xfer.conf:: + plik konfiguracyjny wtyczki _xfer_ + +$HOME/.weechat/weechat.log:: + plik z logami WeeChat +// end::files[] + +// tag::copyright[] +WeeChat jest tworzony przez Sébastien Helleu i społeczność (pełna lista dostępna +jest w pliku AUTHORS.adoc). + +Copyright (C) 2003-2020 {author} + +WeeChat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +Pełna licencja znajduje się w pliku COPYING. + +Strona www: https://weechat.org/ +// end::copyright[] diff --git a/doc/pl/man_copyright.pl.adoc b/doc/pl/man_copyright.pl.adoc deleted file mode 100644 index d55563760..000000000 --- a/doc/pl/man_copyright.pl.adoc +++ /dev/null @@ -1,13 +0,0 @@ -WeeChat jest tworzony przez Sébastien Helleu i społeczność (pełna lista dostępna -jest w pliku AUTHORS.adoc). - -Copyright (C) 2003-2020 {author} - -WeeChat is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -Pełna licencja znajduje się w pliku COPYING. - -Strona www: https://weechat.org/ diff --git a/doc/pl/man_files.pl.adoc b/doc/pl/man_files.pl.adoc deleted file mode 100644 index 1fd8c8cdf..000000000 --- a/doc/pl/man_files.pl.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - główny plik konfiguracyjny WeeChat - -$HOME/.weechat/plugins.conf:: - plik konfiguracyjny wtyczek - -$HOME/.weechat/sec.conf:: - plik konfiguracyjny z zabezpieczonymi danymi - -$HOME/.weechat/alias.conf:: - plik konfiguracyjny wtyczki _alias_ - -$HOME/.weechat/buflist.conf:: - plik konfiguracyjny wtyczki _buflist_ - -$HOME/.weechat/charset.conf:: - plik konfiguracyjny wtyczki _charset_ - -$HOME/.weechat/exec.conf:: - plik konfiguracyjny wtyczki _exec_ - -$HOME/.weechat/fifo.conf:: - plik konfiguracyjny wtyczki _fifo_ - -$HOME/.weechat/fset.conf:: - plik konfiguracyjny wtyczki _fset_ - -$HOME/.weechat/guile.conf:: - plik konfiguracyjny wtyczki _guile_ - -$HOME/.weechat/irc.conf:: - plik konfiguracyjny wtyczki _irc_ - -$HOME/.weechat/javascript.conf:: - plik konfiguracyjny wtyczki _javascript_ - -$HOME/.weechat/logger.conf:: - plik konfiguracyjny wtyczki _logger_ - -$HOME/.weechat/lua.conf:: - plik konfiguracyjny wtyczki _lua_ - -$HOME/.weechat/perl.conf:: - plik konfiguracyjny wtyczki _perl_ - -$HOME/.weechat/php.conf:: - plik konfiguracyjny wtyczki _php_ - -$HOME/.weechat/python.conf:: - plik konfiguracyjny wtyczki _python_ - -$HOME/.weechat/relay.conf:: - plik konfiguracyjny wtyczki _relay_ - -$HOME/.weechat/ruby.conf:: - plik konfiguracyjny wtyczki _ruby_ - -$HOME/.weechat/script.conf:: - plik konfiguracyjny wtyczki _script_ - -$HOME/.weechat/spell.conf:: - plik konfiguracyjny wtyczki _spell_ - -$HOME/.weechat/tcl.conf:: - plik konfiguracyjny wtyczki _tcl_ - -$HOME/.weechat/trigger.conf:: - plik konfiguracyjny wtyczki _trigger_ - -$HOME/.weechat/xfer.conf:: - plik konfiguracyjny wtyczki _xfer_ - -$HOME/.weechat/weechat.log:: - plik z logami WeeChat diff --git a/doc/pl/man_plugin_options.pl.adoc b/doc/pl/man_plugin_options.pl.adoc deleted file mode 100644 index 52be92ecf..000000000 --- a/doc/pl/man_plugin_options.pl.adoc +++ /dev/null @@ -1,16 +0,0 @@ -Kompletna dokumentacja na temat opcji wtyczek dostępna jest -w https://weechat.org/doc[WeeChat user's guide]. - -Dzięki wtyczce irc możliwe jest połączenie z serwerami tymczasowymi za pomocą -URLi jak: - - irc[6][s]://[[nick][:hasło]@]serwer[:port][/#kanał1[,#kanał2...]] - -Aby wejść na kanał IRC poświęcony WeeChat pod nickiem "mójnick": - - irc://mójnick@chat.freenode.net/#weechat - -Adresy IPv6 mogą być otoczone nawiasami kwadratowymi, aby możliwe było podanie -numeru potyu po adresie, na przykład: - - irc://mójnick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/pl/weechat-headless.1.pl.adoc b/doc/pl/weechat-headless.1.pl.adoc index d4cd6ad5b..07b83049a 100644 --- a/doc/pl/weechat-headless.1.pl.adoc +++ b/doc/pl/weechat-headless.1.pl.adoc @@ -41,11 +41,11 @@ include::cmdline_options.pl.adoc[tag=debug] == OPCJE WTYCZEK -include::man_plugin_options.pl.adoc[] +include::man.pl.adoc[tag=plugin_options] == PLIKI -include::man_files.pl.adoc[] +include::man.pl.adoc[tag=files] == Zobacz również @@ -59,7 +59,7 @@ Tłumaczenie Krzysztof Korościk. == PRAWA AUTORSKIE -include::man_copyright.pl.adoc[] +include::man.pl.adoc[tag=copyright] == WSPARCIE / ZGŁASZANIE BŁĘDÓW diff --git a/doc/pl/weechat.1.pl.adoc b/doc/pl/weechat.1.pl.adoc index 838e6930a..f44527935 100644 --- a/doc/pl/weechat.1.pl.adoc +++ b/doc/pl/weechat.1.pl.adoc @@ -37,11 +37,11 @@ include::cmdline_options.pl.adoc[tag=debug] == OPCJE WTYCZEK -include::man_plugin_options.pl.adoc[] +include::man.pl.adoc[tag=plugin_options] == PLIKI -include::man_files.pl.adoc[] +include::man.pl.adoc[tag=files] == Zobacz również @@ -55,7 +55,7 @@ Tłumaczenie Krzysztof Korościk. == PRAWA AUTORSKIE -include::man_copyright.pl.adoc[] +include::man.pl.adoc[tag=copyright] == WSPARCIE / ZGŁASZANIE BŁĘDÓW diff --git a/doc/ru/CMakeLists.txt b/doc/ru/CMakeLists.txt index 12c93b4b4..d30b752b8 100644 --- a/doc/ru/CMakeLists.txt +++ b/doc/ru/CMakeLists.txt @@ -25,9 +25,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ru.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.ru.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.ru.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.ru.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.ru.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat.1 (ru)" ) @@ -41,9 +39,7 @@ if(ENABLE_MAN) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.ru.adoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ru.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_plugin_options.ru.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_files.ru.adoc - ${CMAKE_CURRENT_SOURCE_DIR}/man_copyright.ru.adoc + ${CMAKE_CURRENT_SOURCE_DIR}/man.ru.adoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat-headless.1 (ru)" ) diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am index 71cbde816..c85444f9f 100644 --- a/doc/ru/Makefile.am +++ b/doc/ru/Makefile.am @@ -24,6 +24,7 @@ EXTRA_DIST = CMakeLists.txt \ weechat.1.ru.adoc \ weechat-headless.1.ru.adoc \ cmdline_options.ru.adoc \ + man.ru.adoc \ weechat_quickstart.ru.adoc if MAN @@ -40,9 +41,9 @@ endif all-local: $(man_targets) $(doc_targets) # man pages -weechat.1: weechat.1.ru.adoc cmdline_options.ru.adoc +weechat.1: weechat.1.ru.adoc cmdline_options.ru.adoc man.ru.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ru/weechat.1.ru.adoc -weechat-headless.1: weechat-headless.1.ru.adoc cmdline_options.ru.adoc +weechat-headless.1: weechat-headless.1.ru.adoc cmdline_options.ru.adoc man.ru.adoc $(ASCIIDOCTOR) $(ASCIIDOCTOR_ARGS) -a revnumber="$(VERSION)" -b manpage -o weechat-headless.1 $(abs_top_srcdir)/doc/ru/weechat-headless.1.ru.adoc # quickstart diff --git a/doc/ru/man.ru.adoc b/doc/ru/man.ru.adoc new file mode 100644 index 000000000..5803e717d --- /dev/null +++ b/doc/ru/man.ru.adoc @@ -0,0 +1,109 @@ +// tag::plugin_options[] +Полное описание параметров плагинов доступно в документации по плагинам в +https://weechat.org/doc[Руководстве пользователя WeeChat]. + +С помощью плагина irc можно присоединиться ко временному серверу, используя URL вроде: + + irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] + +Присоединиться к IRC-каналу поддержки пользователей WeeChat с псевдонимом "mynick": + + irc://mynick@chat.freenode.net/#weechat + +IPv6-адрес можно заключить в квадратные скобки, чтобы указать порт. Например: + + irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test +// end::plugin_options[] + +// tag::files[] +$HOME/.weechat/weechat.conf:: + главный файл конфигурации WeeChat + +$HOME/.weechat/plugins.conf:: + файл конфигурации плагинов + +$HOME/.weechat/sec.conf:: + файл конфигурации с защищаемыми данными + +$HOME/.weechat/alias.conf:: + файл конфигурации для плагина _alias_ + +$HOME/.weechat/buflist.conf:: + файл конфигурации для плагина _buflist_ + +$HOME/.weechat/charset.conf:: + файл конфигурации для плагина _charset_ + +$HOME/.weechat/exec.conf:: + файл конфигурации для плагина _exec_ + +$HOME/.weechat/fifo.conf:: + файл конфигурации для плагина _fifo_ + +$HOME/.weechat/fset.conf:: + файл конфигурации для плагина _fset_ + +$HOME/.weechat/guile.conf:: + файл конфигурации для плагина _guile_ + +$HOME/.weechat/irc.conf:: + файл конфигурации для плагина _irc_ + +$HOME/.weechat/javascript.conf:: + файл конфигурации для плагина _javascript_ + +$HOME/.weechat/logger.conf:: + файл конфигурации для плагина _logger_ + +$HOME/.weechat/lua.conf:: + файл конфигурации для плагина _lua_ + +$HOME/.weechat/perl.conf:: + файл конфигурации для плагина _perl_ + +$HOME/.weechat/php.conf:: + файл конфигурации для плагина _php_ + +$HOME/.weechat/python.conf:: + файл конфигурации для плагина _python_ + +$HOME/.weechat/relay.conf:: + файл конфигурации для плагина _relay_ + +$HOME/.weechat/ruby.conf:: + файл конфигурации для плагина _ruby_ + +$HOME/.weechat/script.conf:: + файл конфигурации для плагина _script_ + +$HOME/.weechat/spell.conf:: + файл конфигурации для плагина _spell_ + +$HOME/.weechat/tcl.conf:: + файл конфигурации для плагина _tcl_ + +$HOME/.weechat/trigger.conf:: + файл конфигурации для плагина _trigger_ + +$HOME/.weechat/xfer.conf:: + файл конфигурации для плагина _xref_ + +$HOME/.weechat/weechat.log:: + лог-файл WeeChat +// end::files[] + +// tag::copyright[] +WeeChat написан Sébastien Helleu и другими участниками (полный список находится +в файле AUTHORS.adoc). + +Copyright (C) 2003-2020 {author} + +WeeChat is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +Подробную информацию можно найти в файле COPYING. + +Веб: https://weechat.org/ +// end::copyright[] diff --git a/doc/ru/man_copyright.ru.adoc b/doc/ru/man_copyright.ru.adoc deleted file mode 100644 index 5d5f0bccd..000000000 --- a/doc/ru/man_copyright.ru.adoc +++ /dev/null @@ -1,13 +0,0 @@ -WeeChat написан Sébastien Helleu и другими участниками (полный список находится -в файле AUTHORS.adoc). - -Copyright (C) 2003-2020 {author} - -WeeChat is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 3 of the License, or -(at your option) any later version. - -Подробную информацию можно найти в файле COPYING. - -Веб: https://weechat.org/ diff --git a/doc/ru/man_files.ru.adoc b/doc/ru/man_files.ru.adoc deleted file mode 100644 index 78613684b..000000000 --- a/doc/ru/man_files.ru.adoc +++ /dev/null @@ -1,74 +0,0 @@ -$HOME/.weechat/weechat.conf:: - главный файл конфигурации WeeChat - -$HOME/.weechat/plugins.conf:: - файл конфигурации плагинов - -$HOME/.weechat/sec.conf:: - файл конфигурации с защищаемыми данными - -$HOME/.weechat/alias.conf:: - файл конфигурации для плагина _alias_ - -$HOME/.weechat/buflist.conf:: - файл конфигурации для плагина _buflist_ - -$HOME/.weechat/charset.conf:: - файл конфигурации для плагина _charset_ - -$HOME/.weechat/exec.conf:: - файл конфигурации для плагина _exec_ - -$HOME/.weechat/fifo.conf:: - файл конфигурации для плагина _fifo_ - -$HOME/.weechat/fset.conf:: - файл конфигурации для плагина _fset_ - -$HOME/.weechat/guile.conf:: - файл конфигурации для плагина _guile_ - -$HOME/.weechat/irc.conf:: - файл конфигурации для плагина _irc_ - -$HOME/.weechat/javascript.conf:: - файл конфигурации для плагина _javascript_ - -$HOME/.weechat/logger.conf:: - файл конфигурации для плагина _logger_ - -$HOME/.weechat/lua.conf:: - файл конфигурации для плагина _lua_ - -$HOME/.weechat/perl.conf:: - файл конфигурации для плагина _perl_ - -$HOME/.weechat/php.conf:: - файл конфигурации для плагина _php_ - -$HOME/.weechat/python.conf:: - файл конфигурации для плагина _python_ - -$HOME/.weechat/relay.conf:: - файл конфигурации для плагина _relay_ - -$HOME/.weechat/ruby.conf:: - файл конфигурации для плагина _ruby_ - -$HOME/.weechat/script.conf:: - файл конфигурации для плагина _script_ - -$HOME/.weechat/spell.conf:: - файл конфигурации для плагина _spell_ - -$HOME/.weechat/tcl.conf:: - файл конфигурации для плагина _tcl_ - -$HOME/.weechat/trigger.conf:: - файл конфигурации для плагина _trigger_ - -$HOME/.weechat/xfer.conf:: - файл конфигурации для плагина _xref_ - -$HOME/.weechat/weechat.log:: - лог-файл WeeChat diff --git a/doc/ru/man_plugin_options.ru.adoc b/doc/ru/man_plugin_options.ru.adoc deleted file mode 100644 index 37d92d400..000000000 --- a/doc/ru/man_plugin_options.ru.adoc +++ /dev/null @@ -1,14 +0,0 @@ -Полное описание параметров плагинов доступно в документации по плагинам в -https://weechat.org/doc[Руководстве пользователя WeeChat]. - -С помощью плагина irc можно присоединиться ко временному серверу, используя URL вроде: - - irc[6][s]://[[nickname][:password]@]server[:port][/#channel1[,#channel2...]] - -Присоединиться к IRC-каналу поддержки пользователей WeeChat с псевдонимом "mynick": - - irc://mynick@chat.freenode.net/#weechat - -IPv6-адрес можно заключить в квадратные скобки, чтобы указать порт. Например: - - irc://mynick@[2001:db8:0:85a3::ac1f:8001]:6668/#test diff --git a/doc/ru/weechat-headless.1.ru.adoc b/doc/ru/weechat-headless.1.ru.adoc index 460b99794..a39128f9d 100644 --- a/doc/ru/weechat-headless.1.ru.adoc +++ b/doc/ru/weechat-headless.1.ru.adoc @@ -45,11 +45,11 @@ include::cmdline_options.ru.adoc[tag=debug] == ПАРАМЕТРЫ ПЛАГИНОВ -include::man_plugin_options.ru.adoc[] +include::man.ru.adoc[tag=plugin_options] == ФАЙЛЫ -include::man_files.ru.adoc[] +include::man.ru.adoc[tag=files] // TRANSLATION MISSING == SEE ALSO @@ -64,7 +64,7 @@ include::man_files.ru.adoc[] == КОПИРАЙТ -include::man_copyright.ru.adoc[] +include::man.ru.adoc[tag=copyright] == ПОДДЕРЖКА / СООБЩЕНИЯ ОБ ОШИБКАХ diff --git a/doc/ru/weechat.1.ru.adoc b/doc/ru/weechat.1.ru.adoc index 32af1dd7d..f7737ba72 100644 --- a/doc/ru/weechat.1.ru.adoc +++ b/doc/ru/weechat.1.ru.adoc @@ -40,11 +40,11 @@ include::cmdline_options.ru.adoc[tag=debug] == ПАРАМЕТРЫ ПЛАГИНОВ -include::man_plugin_options.ru.adoc[] +include::man.ru.adoc[tag=plugin_options] == ФАЙЛЫ -include::man_files.ru.adoc[] +include::man.ru.adoc[tag=files] // TRANSLATION MISSING == SEE ALSO @@ -59,7 +59,7 @@ include::man_files.ru.adoc[] == КОПИРАЙТ -include::man_copyright.ru.adoc[] +include::man.ru.adoc[tag=copyright] == ПОДДЕРЖКА / СООБЩЕНИЯ ОБ ОШИБКАХ -- cgit v1.2.3