318 files changed, 614 insertions, 614 deletions

diff --git a/AUTHORS.asciidoc b/AUTHORS.adoc
index ef6794523..ef6794523 100644
--- a/AUTHORS.asciidoc
+++ b/AUTHORS.adoc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cf9b3117..4b57f3fe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,11 +255,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BI
 # install some files (only on Cygwin)
 if(CYGWIN)
   install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
     DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 endif()
 
@@ -269,7 +269,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/ic
 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
 set(CPACK_PACKAGE_VENDOR "Sébastien Helleu")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
diff --git a/ChangeLog.asciidoc b/ChangeLog.adoc
index 14f232155..d73d6d869 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.adoc
@@ -12,7 +12,7 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[here]).
 
 For a list of important changes that require manual action, please look at
 https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
-(file _ReleaseNotes.asciidoc_ in sources).
+(file _ReleaseNotes.adoc_ in sources).
 
 
 [[v1.6]]
diff --git a/Contributing.asciidoc b/Contributing.adoc
index a7d597ead..a7d597ead 100644
--- a/Contributing.asciidoc
+++ b/Contributing.adoc
diff --git a/Makefile.am b/Makefile.am
index 1ecade6cd..1bae263b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,11 @@ endif
 
 SUBDIRS = po doc intl src $(tests_dir)
 
-EXTRA_DIST = AUTHORS.asciidoc \
-             ChangeLog.asciidoc \
-             Contributing.asciidoc \
-             README.asciidoc \
-             ReleaseNotes.asciidoc \
+EXTRA_DIST = AUTHORS.adoc \
+             ChangeLog.adoc \
+             Contributing.adoc \
+             README.adoc \
+             ReleaseNotes.adoc \
              CMakeLists.txt \
              config.rpath \
              config.h.cmake \
diff --git a/README.asciidoc b/README.adoc
index 5eaf2da67..5eaf2da67 100644
--- a/README.asciidoc
+++ b/README.adoc
diff --git a/ReleaseNotes.asciidoc b/ReleaseNotes.adoc
index 4c3272c51..6389b3e63 100644
--- a/ReleaseNotes.asciidoc
+++ b/ReleaseNotes.adoc
@@ -14,7 +14,7 @@ version.
 
 For a complete list of changes, please look at
 https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
-(file _ChangeLog.asciidoc_ in sources).
+(file _ChangeLog.adoc_ in sources).
 
 
 [[v1.5]]
diff --git a/debian-devel/rules b/debian-devel/rules
index 0fb3b21cb..d1603c163 100755
--- a/debian-devel/rules
+++ b/debian-devel/rules
@@ -24,7 +24,7 @@ override_dh_auto_configure:
 	echo
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.asciidoc
+	dh_installchangelogs ChangeLog.adoc
 
 override_dh_strip:
 	dh_strip --dbg-package=weechat-devel-dbg
diff --git a/debian-stable/rules b/debian-stable/rules
index b92991d82..a4e1e3d3a 100755
--- a/debian-stable/rules
+++ b/debian-stable/rules
@@ -24,7 +24,7 @@ override_dh_auto_configure:
 	echo
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.asciidoc
+	dh_installchangelogs ChangeLog.adoc
 
 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg
diff --git a/debian-stable/weechat-core.docs b/debian-stable/weechat-core.docs
index 8db963536..6363afd62 100644
--- a/debian-stable/weechat-core.docs
+++ b/debian-stable/weechat-core.docs
@@ -1,4 +1,4 @@
-AUTHORS.asciidoc
-Contributing.asciidoc
-README.asciidoc
-ReleaseNotes.asciidoc
+AUTHORS.adoc
+Contributing.adoc
+README.adoc
+ReleaseNotes.adoc
diff --git a/doc/cs/CMakeLists.txt b/doc/cs/CMakeLists.txt
index 83c3cfddb..f6d2adab4 100644
--- a/doc/cs/CMakeLists.txt
+++ b/doc/cs/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (cs)"
   )
@@ -37,10 +37,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.cs.html"
   )
diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am
index 9d21f94e9..6e14ce815 100644
--- a/doc/cs/Makefile.am
+++ b/doc/cs/Makefile.am
@@ -20,11 +20,11 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.cs.asciidoc \
-             cmdline_options.cs.asciidoc \
-             weechat_quickstart.cs.asciidoc \
-             $(wildcard autogen/user/*.asciidoc) \
-             $(wildcard autogen/plugin_api/*.asciidoc)
+             weechat.1.cs.adoc \
+             cmdline_options.cs.adoc \
+             weechat_quickstart.cs.adoc \
+             $(wildcard autogen/user/*.adoc) \
+             $(wildcard autogen/plugin_api/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -39,12 +39,12 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.cs.asciidoc cmdline_options.cs.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.asciidoc
+weechat.1: weechat.1.cs.adoc cmdline_options.cs.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.adoc
 
 # quickstart
-weechat_quickstart.cs.html: weechat_quickstart.cs.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.asciidoc
+weechat_quickstart.cs.html: weechat_quickstart.cs.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.adoc
 
 # install man/docs
 
diff --git a/doc/cs/cmdline_options.cs.asciidoc b/doc/cs/cmdline_options.cs.adoc
index 286b8738b..286b8738b 100644
--- a/doc/cs/cmdline_options.cs.asciidoc
+++ b/doc/cs/cmdline_options.cs.adoc
diff --git a/doc/cs/weechat.1.cs.asciidoc b/doc/cs/weechat.1.cs.adoc
index 648e20f75..9e2152b8a 100644
--- a/doc/cs/weechat.1.cs.asciidoc
+++ b/doc/cs/weechat.1.cs.adoc
@@ -28,7 +28,7 @@ Je velmi připůsobitelný a rozšiřitelný s skripty.
 
 == VOLBY
 
-include::cmdline_options.cs.asciidoc[]
+include::cmdline_options.cs.adoc[]
 
 == VOLBY PLUGINŮ
 
@@ -99,7 +99,7 @@ Tato manuálová stránka byla přeložena Ondřejem Súkupem.
 == COPYRIGHT
 
 WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v
-souboru AUTHORS.asciidoc).
+souboru AUTHORS.adoc).
 
 Copyright (C) 2003-2016 {author}
 
diff --git a/doc/cs/weechat_quickstart.cs.asciidoc b/doc/cs/weechat_quickstart.cs.adoc
index 4be51bd62..4be51bd62 100644
--- a/doc/cs/weechat_quickstart.cs.asciidoc
+++ b/doc/cs/weechat_quickstart.cs.adoc
diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt
index b7c201665..8263e0957 100644
--- a/doc/de/CMakeLists.txt
+++ b/doc/de/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (de)"
   )
@@ -37,12 +37,12 @@ if(ENABLE_DOC)
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.de.html"
   )
@@ -52,10 +52,10 @@ if(ENABLE_DOC)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.de.html"
   )
@@ -65,10 +65,10 @@ if(ENABLE_DOC)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.de.html"
   )
@@ -78,10 +78,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.de.html"
   )
@@ -91,10 +91,10 @@ if(ENABLE_DOC)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.de.html"
   )
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
index 29490f77c..3515a80aa 100644
--- a/doc/de/Makefile.am
+++ b/doc/de/Makefile.am
@@ -21,14 +21,14 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.de.asciidoc \
-             cmdline_options.de.asciidoc \
-             weechat_user.de.asciidoc \
-             weechat_scripting.de.asciidoc \
-             weechat_faq.de.asciidoc \
-             weechat_quickstart.de.asciidoc \
-             weechat_tester.de.asciidoc \
-             $(wildcard autogen/user/*.asciidoc)
+             weechat.1.de.adoc \
+             cmdline_options.de.adoc \
+             weechat_user.de.adoc \
+             weechat_scripting.de.adoc \
+             weechat_faq.de.adoc \
+             weechat_quickstart.de.adoc \
+             weechat_tester.de.adoc \
+             $(wildcard autogen/user/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -47,28 +47,28 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.de.asciidoc cmdline_options.de.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.asciidoc
+weechat.1: weechat.1.de.adoc cmdline_options.de.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.adoc
 
 # user's guide
-weechat_user.de.html: weechat_user.de.asciidoc cmdline_options.de.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.asciidoc
+weechat_user.de.html: weechat_user.de.adoc cmdline_options.de.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.adoc
 
 # scripting guide
-weechat_scripting.de.html: weechat_scripting.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.asciidoc
+weechat_scripting.de.html: weechat_scripting.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.adoc
 
 # FAQ
-weechat_faq.de.html: weechat_faq.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.asciidoc
+weechat_faq.de.html: weechat_faq.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.adoc
 
 # quickstart
-weechat_quickstart.de.html: weechat_quickstart.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.asciidoc
+weechat_quickstart.de.html: weechat_quickstart.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.adoc
 
 # tester's guide
-weechat_tester.de.html: weechat_tester.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.asciidoc
+weechat_tester.de.html: weechat_tester.de.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.adoc
 
 # install man/docs
 
diff --git a/doc/de/autogen/plugin_api/completions.asciidoc b/doc/de/autogen/plugin_api/completions.adoc
index c0e20e33d..c0e20e33d 100644
--- a/doc/de/autogen/plugin_api/completions.asciidoc
+++ b/doc/de/autogen/plugin_api/completions.adoc
diff --git a/doc/de/autogen/plugin_api/hdata.asciidoc b/doc/de/autogen/plugin_api/hdata.adoc
index f6aa461cc..f6aa461cc 100644
--- a/doc/de/autogen/plugin_api/hdata.asciidoc
+++ b/doc/de/autogen/plugin_api/hdata.adoc
diff --git a/doc/de/autogen/plugin_api/infolists.asciidoc b/doc/de/autogen/plugin_api/infolists.adoc
index 9ec065af1..9ec065af1 100644
--- a/doc/de/autogen/plugin_api/infolists.asciidoc
+++ b/doc/de/autogen/plugin_api/infolists.adoc
diff --git a/doc/de/autogen/plugin_api/infos.asciidoc b/doc/de/autogen/plugin_api/infos.adoc
index ee0f71f49..ee0f71f49 100644
--- a/doc/de/autogen/plugin_api/infos.asciidoc
+++ b/doc/de/autogen/plugin_api/infos.adoc
diff --git a/doc/de/autogen/plugin_api/infos_hashtable.asciidoc b/doc/de/autogen/plugin_api/infos_hashtable.adoc
index f58d66a4e..f58d66a4e 100644
--- a/doc/de/autogen/plugin_api/infos_hashtable.asciidoc
+++ b/doc/de/autogen/plugin_api/infos_hashtable.adoc
diff --git a/doc/de/autogen/plugin_api/plugins_priority.asciidoc b/doc/de/autogen/plugin_api/plugins_priority.adoc
index 3caae876d..3caae876d 100644
--- a/doc/de/autogen/plugin_api/plugins_priority.asciidoc
+++ b/doc/de/autogen/plugin_api/plugins_priority.adoc
diff --git a/doc/de/autogen/plugin_api/url_options.asciidoc b/doc/de/autogen/plugin_api/url_options.adoc
index 12f6666ac..12f6666ac 100644
--- a/doc/de/autogen/plugin_api/url_options.asciidoc
+++ b/doc/de/autogen/plugin_api/url_options.adoc
diff --git a/doc/de/autogen/user/alias_commands.asciidoc b/doc/de/autogen/user/alias_commands.adoc
index 365c5f890..365c5f890 100644
--- a/doc/de/autogen/user/alias_commands.asciidoc
+++ b/doc/de/autogen/user/alias_commands.adoc
diff --git a/doc/de/autogen/user/aspell_commands.asciidoc b/doc/de/autogen/user/aspell_commands.adoc
index 6a57903c9..6a57903c9 100644
--- a/doc/de/autogen/user/aspell_commands.asciidoc
+++ b/doc/de/autogen/user/aspell_commands.adoc
diff --git a/doc/de/autogen/user/aspell_options.asciidoc b/doc/de/autogen/user/aspell_options.adoc
index 4af865111..4af865111 100644
--- a/doc/de/autogen/user/aspell_options.asciidoc
+++ b/doc/de/autogen/user/aspell_options.adoc
diff --git a/doc/de/autogen/user/charset_commands.asciidoc b/doc/de/autogen/user/charset_commands.adoc
index e29296eaa..e29296eaa 100644
--- a/doc/de/autogen/user/charset_commands.asciidoc
+++ b/doc/de/autogen/user/charset_commands.adoc
diff --git a/doc/de/autogen/user/charset_options.asciidoc b/doc/de/autogen/user/charset_options.adoc
index fd59c19b6..fd59c19b6 100644
--- a/doc/de/autogen/user/charset_options.asciidoc
+++ b/doc/de/autogen/user/charset_options.adoc
diff --git a/doc/de/autogen/user/exec_commands.asciidoc b/doc/de/autogen/user/exec_commands.adoc
index b2c06eba5..b2c06eba5 100644
--- a/doc/de/autogen/user/exec_commands.asciidoc
+++ b/doc/de/autogen/user/exec_commands.adoc
diff --git a/doc/de/autogen/user/exec_options.asciidoc b/doc/de/autogen/user/exec_options.adoc
index 495aa863d..495aa863d 100644
--- a/doc/de/autogen/user/exec_options.asciidoc
+++ b/doc/de/autogen/user/exec_options.adoc
diff --git a/doc/de/autogen/user/fifo_commands.asciidoc b/doc/de/autogen/user/fifo_commands.adoc
index 819f8219f..819f8219f 100644
--- a/doc/de/autogen/user/fifo_commands.asciidoc
+++ b/doc/de/autogen/user/fifo_commands.adoc
diff --git a/doc/de/autogen/user/guile_commands.asciidoc b/doc/de/autogen/user/guile_commands.adoc
index f8547daf0..f8547daf0 100644
--- a/doc/de/autogen/user/guile_commands.asciidoc
+++ b/doc/de/autogen/user/guile_commands.adoc
diff --git a/doc/de/autogen/user/irc_colors.asciidoc b/doc/de/autogen/user/irc_colors.adoc
index 8c86077c9..8c86077c9 100644
--- a/doc/de/autogen/user/irc_colors.asciidoc
+++ b/doc/de/autogen/user/irc_colors.adoc
diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.adoc
index a33171618..a33171618 100644
--- a/doc/de/autogen/user/irc_commands.asciidoc
+++ b/doc/de/autogen/user/irc_commands.adoc
diff --git a/doc/de/autogen/user/irc_options.asciidoc b/doc/de/autogen/user/irc_options.adoc
index 197230c89..197230c89 100644
--- a/doc/de/autogen/user/irc_options.asciidoc
+++ b/doc/de/autogen/user/irc_options.adoc
diff --git a/doc/de/autogen/user/javascript_commands.asciidoc b/doc/de/autogen/user/javascript_commands.adoc
index 4597d75a5..4597d75a5 100644
--- a/doc/de/autogen/user/javascript_commands.asciidoc
+++ b/doc/de/autogen/user/javascript_commands.adoc
diff --git a/doc/de/autogen/user/logger_commands.asciidoc b/doc/de/autogen/user/logger_commands.adoc
index 8b3e00fa1..8b3e00fa1 100644
--- a/doc/de/autogen/user/logger_commands.asciidoc
+++ b/doc/de/autogen/user/logger_commands.adoc
diff --git a/doc/de/autogen/user/logger_options.asciidoc b/doc/de/autogen/user/logger_options.adoc
index 413753cb6..413753cb6 100644
--- a/doc/de/autogen/user/logger_options.asciidoc
+++ b/doc/de/autogen/user/logger_options.adoc
diff --git a/doc/de/autogen/user/lua_commands.asciidoc b/doc/de/autogen/user/lua_commands.adoc
index 5c76f6d8d..5c76f6d8d 100644
--- a/doc/de/autogen/user/lua_commands.asciidoc
+++ b/doc/de/autogen/user/lua_commands.adoc
diff --git a/doc/de/autogen/user/perl_commands.asciidoc b/doc/de/autogen/user/perl_commands.adoc
index 3691520b3..3691520b3 100644
--- a/doc/de/autogen/user/perl_commands.asciidoc
+++ b/doc/de/autogen/user/perl_commands.adoc
diff --git a/doc/de/autogen/user/python_commands.asciidoc b/doc/de/autogen/user/python_commands.adoc
index 3e00606d9..3e00606d9 100644
--- a/doc/de/autogen/user/python_commands.asciidoc
+++ b/doc/de/autogen/user/python_commands.adoc
diff --git a/doc/de/autogen/user/relay_commands.asciidoc b/doc/de/autogen/user/relay_commands.adoc
index 597750160..597750160 100644
--- a/doc/de/autogen/user/relay_commands.asciidoc
+++ b/doc/de/autogen/user/relay_commands.adoc
diff --git a/doc/de/autogen/user/relay_options.asciidoc b/doc/de/autogen/user/relay_options.adoc
index 57b7ae336..57b7ae336 100644
--- a/doc/de/autogen/user/relay_options.asciidoc
+++ b/doc/de/autogen/user/relay_options.adoc
diff --git a/doc/de/autogen/user/ruby_commands.asciidoc b/doc/de/autogen/user/ruby_commands.adoc
index cd4c5f5f3..cd4c5f5f3 100644
--- a/doc/de/autogen/user/ruby_commands.asciidoc
+++ b/doc/de/autogen/user/ruby_commands.adoc
diff --git a/doc/de/autogen/user/script_commands.asciidoc b/doc/de/autogen/user/script_commands.adoc
index 7af8a536d..7af8a536d 100644
--- a/doc/de/autogen/user/script_commands.asciidoc
+++ b/doc/de/autogen/user/script_commands.adoc
diff --git a/doc/de/autogen/user/script_options.asciidoc b/doc/de/autogen/user/script_options.adoc
index 12942ae0e..12942ae0e 100644
--- a/doc/de/autogen/user/script_options.asciidoc
+++ b/doc/de/autogen/user/script_options.adoc
diff --git a/doc/de/autogen/user/sec_options.asciidoc b/doc/de/autogen/user/sec_options.adoc
index e6403a53e..e6403a53e 100644
--- a/doc/de/autogen/user/sec_options.asciidoc
+++ b/doc/de/autogen/user/sec_options.adoc
diff --git a/doc/de/autogen/user/tcl_commands.asciidoc b/doc/de/autogen/user/tcl_commands.adoc
index 1178a0ac8..1178a0ac8 100644
--- a/doc/de/autogen/user/tcl_commands.asciidoc
+++ b/doc/de/autogen/user/tcl_commands.adoc
diff --git a/doc/de/autogen/user/trigger_commands.asciidoc b/doc/de/autogen/user/trigger_commands.adoc
index a668f68cf..a668f68cf 100644
--- a/doc/de/autogen/user/trigger_commands.asciidoc
+++ b/doc/de/autogen/user/trigger_commands.adoc
diff --git a/doc/de/autogen/user/trigger_options.asciidoc b/doc/de/autogen/user/trigger_options.adoc
index 537c66740..537c66740 100644
--- a/doc/de/autogen/user/trigger_options.asciidoc
+++ b/doc/de/autogen/user/trigger_options.adoc
diff --git a/doc/de/autogen/user/weechat_commands.asciidoc b/doc/de/autogen/user/weechat_commands.adoc
index 653a4b759..653a4b759 100644
--- a/doc/de/autogen/user/weechat_commands.asciidoc
+++ b/doc/de/autogen/user/weechat_commands.adoc
diff --git a/doc/de/autogen/user/weechat_options.asciidoc b/doc/de/autogen/user/weechat_options.adoc
index bf0864ab7..bf0864ab7 100644
--- a/doc/de/autogen/user/weechat_options.asciidoc
+++ b/doc/de/autogen/user/weechat_options.adoc
diff --git a/doc/de/autogen/user/xfer_commands.asciidoc b/doc/de/autogen/user/xfer_commands.adoc
index 03bd5b443..03bd5b443 100644
--- a/doc/de/autogen/user/xfer_commands.asciidoc
+++ b/doc/de/autogen/user/xfer_commands.adoc
diff --git a/doc/de/autogen/user/xfer_options.asciidoc b/doc/de/autogen/user/xfer_options.adoc
index 2e880911d..2e880911d 100644
--- a/doc/de/autogen/user/xfer_options.asciidoc
+++ b/doc/de/autogen/user/xfer_options.adoc
diff --git a/doc/de/cmdline_options.de.asciidoc b/doc/de/cmdline_options.de.adoc
index 447e5d9bb..447e5d9bb 100644
--- a/doc/de/cmdline_options.de.asciidoc
+++ b/doc/de/cmdline_options.de.adoc
diff --git a/doc/de/weechat.1.de.asciidoc b/doc/de/weechat.1.de.adoc
index 99af7d6a7..d0ab8956c 100644
--- a/doc/de/weechat.1.de.asciidoc
+++ b/doc/de/weechat.1.de.adoc
@@ -28,7 +28,7 @@ Durch Skripten ist das Hauptprogramm äußerst flexibel und erweiterbar.
 
 == OPTIONEN
 
-include::cmdline_options.de.asciidoc[]
+include::cmdline_options.de.adoc[]
 
 == OPTIONEN von ERWEITERUNGEN
 
@@ -101,7 +101,7 @@ Diese manpage wurde von {author} geschrieben.
 == COPYRIGHT
 
 WeeChat wird programmiert von Sébastien Helleu und weiteren Beitragenden (eine vollständige Auflistung
-findet man in der AUTHORS.asciidoc Datei).
+findet man in der AUTHORS.adoc Datei).
 
 Copyright (C) 2003-2016 {author}
 
diff --git a/doc/de/weechat_faq.de.asciidoc b/doc/de/weechat_faq.de.adoc
index 28da07b2c..28da07b2c 100644
--- a/doc/de/weechat_faq.de.asciidoc
+++ b/doc/de/weechat_faq.de.adoc
diff --git a/doc/de/weechat_quickstart.de.asciidoc b/doc/de/weechat_quickstart.de.adoc
index ae5e15bf2..ae5e15bf2 100644
--- a/doc/de/weechat_quickstart.de.asciidoc
+++ b/doc/de/weechat_quickstart.de.adoc
diff --git a/doc/de/weechat_scripting.de.asciidoc b/doc/de/weechat_scripting.de.adoc
index d1d675cb1..d1d675cb1 100644
--- a/doc/de/weechat_scripting.de.asciidoc
+++ b/doc/de/weechat_scripting.de.adoc
diff --git a/doc/de/weechat_tester.de.asciidoc b/doc/de/weechat_tester.de.adoc
index 28c866a68..28c866a68 100644
--- a/doc/de/weechat_tester.de.asciidoc
+++ b/doc/de/weechat_tester.de.adoc
diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.adoc
index fca268a0b..dcd34f904 100644
--- a/doc/de/weechat_user.de.asciidoc
+++ b/doc/de/weechat_user.de.adoc
@@ -458,7 +458,7 @@ Sollte WeeChat abgestürzt sein, muss der Befehl `bt full` genutzt werden:
 
 Befehlszeile:
 
-include::cmdline_options.de.asciidoc[]
+include::cmdline_options.de.adoc[]
 
 Um WeeChat zu starten muss folgender Befehl ausgeführt werden:
 
@@ -1444,7 +1444,7 @@ um die Farbkodierungen bzw. Attribute zu deaktivieren.
 
 Farbtabelle für kbd:[Ctrl+c], kbd:[c]:
 
-include::autogen/user/irc_colors.asciidoc[]
+include::autogen/user/irc_colors.adoc[]
 
 [NOTE]
 Um sich alle verfügbaren Farben anzeigen zu lassen, die der Terminal
@@ -1721,7 +1721,7 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/sec_options.asciidoc[]
+include::autogen/user/sec_options.adoc[]
 
 [[weechat_options]]
 ==== WeeChat Optionen (weechat.conf)
@@ -1756,12 +1756,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/weechat_options.asciidoc[]
+include::autogen/user/weechat_options.adoc[]
 
 [[weechat_commands]]
 ==== WeeChat Befehle
 
-include::autogen/user/weechat_commands.asciidoc[]
+include::autogen/user/weechat_commands.adoc[]
 
 [[plugins]]
 == Erweiterungen
@@ -1828,7 +1828,7 @@ Die Alias-Erweiterung erlaubt es, für Befehle, sogenannte Kurzbefehle (einen Al
 [[alias_commands]]
 ==== Befehle
 
-include::autogen/user/alias_commands.asciidoc[]
+include::autogen/user/alias_commands.adoc[]
 
 [[aspell_plugin]]
 === Aspell Erweiterung
@@ -1853,12 +1853,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/aspell_options.asciidoc[]
+include::autogen/user/aspell_options.adoc[]
 
 [[aspell_commands]]
 ==== Befehle
 
-include::autogen/user/aspell_commands.asciidoc[]
+include::autogen/user/aspell_commands.adoc[]
 
 [[aspell_speller_options]]
 ==== Optionen für Rechtschreibprüfung
@@ -1961,12 +1961,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/charset_options.asciidoc[]
+include::autogen/user/charset_options.adoc[]
 
 [[charset_commands]]
 ==== Befehle
 
-include::autogen/user/charset_commands.asciidoc[]
+include::autogen/user/charset_commands.adoc[]
 
 [[charset_set]]
 ==== Zeichensatz auswählen
@@ -2047,12 +2047,12 @@ Sections:
 
 Options:
 
-include::autogen/user/exec_options.asciidoc[]
+include::autogen/user/exec_options.adoc[]
 
 [[exec_commands]]
 ==== Commands
 
-include::autogen/user/exec_commands.asciidoc[]
+include::autogen/user/exec_commands.adoc[]
 
 [[fifo_plugin]]
 === Fifo Erweiterung
@@ -2120,7 +2120,7 @@ $ ./auto_weechat_command 'irc.freenode.#weechat *Hallo'
 [[fifo_commands]]
 ==== Befehle
 
-include::autogen/user/fifo_commands.asciidoc[]
+include::autogen/user/fifo_commands.adoc[]
 
 [[irc_plugin]]
 === IRC Erweiterung
@@ -2167,12 +2167,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/irc_options.asciidoc[]
+include::autogen/user/irc_options.adoc[]
 
 [[irc_commands]]
 ==== Befehle
 
-include::autogen/user/irc_commands.asciidoc[]
+include::autogen/user/irc_commands.adoc[]
 
 [[irc_ssl_certificates]]
 ==== SSL Zertifikate
@@ -2631,12 +2631,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/logger_options.asciidoc[]
+include::autogen/user/logger_options.adoc[]
 
 [[logger_commands]]
 ==== Befehle
 
-include::autogen/user/logger_commands.asciidoc[]
+include::autogen/user/logger_commands.adoc[]
 
 [[logger_log_levels]]
 ==== Log Levels
@@ -2792,12 +2792,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/relay_options.asciidoc[]
+include::autogen/user/relay_options.adoc[]
 
 [[relay_commands]]
 ==== Befehle
 
-include::autogen/user/relay_commands.asciidoc[]
+include::autogen/user/relay_commands.adoc[]
 
 [[relay_password]]
 ==== Passwort
@@ -2944,47 +2944,47 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/script_options.asciidoc[]
+include::autogen/user/script_options.adoc[]
 
 [[script_commands]]
 ==== Skript Befehle
 
-include::autogen/user/script_commands.asciidoc[]
+include::autogen/user/script_commands.adoc[]
 
 [[python_commands]]
 ==== Python Befehle
 
-include::autogen/user/python_commands.asciidoc[]
+include::autogen/user/python_commands.adoc[]
 
 [[perl_commands]]
 ==== Perl Befehle
 
-include::autogen/user/perl_commands.asciidoc[]
+include::autogen/user/perl_commands.adoc[]
 
 [[ruby_commands]]
 ==== Ruby Befehle
 
-include::autogen/user/ruby_commands.asciidoc[]
+include::autogen/user/ruby_commands.adoc[]
 
 [[lua_commands]]
 ==== Lua Befehle
 
-include::autogen/user/lua_commands.asciidoc[]
+include::autogen/user/lua_commands.adoc[]
 
 [[tcl_commands]]
 ==== Tcl Befehle
 
-include::autogen/user/tcl_commands.asciidoc[]
+include::autogen/user/tcl_commands.adoc[]
 
 [[guile_commands]]
 ==== Guile Befehle
 
-include::autogen/user/guile_commands.asciidoc[]
+include::autogen/user/guile_commands.adoc[]
 
 [[javascript_commands]]
 ==== Javascript Befehle
 
-include::autogen/user/javascript_commands.asciidoc[]
+include::autogen/user/javascript_commands.adoc[]
 
 [[trigger_plugin]]
 === Trigger Erweiterung
@@ -3016,12 +3016,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/trigger_options.asciidoc[]
+include::autogen/user/trigger_options.adoc[]
 
 [[trigger_commands]]
 ==== Befehle
 
-include::autogen/user/trigger_commands.asciidoc[]
+include::autogen/user/trigger_commands.adoc[]
 
 [[trigger_anatomy]]
 ==== Aufbau eines Triggers
@@ -3549,12 +3549,12 @@ Sektionen:
 
 Optionen:
 
-include::autogen/user/xfer_options.asciidoc[]
+include::autogen/user/xfer_options.adoc[]
 
 [[xfer_commands]]
 ==== Befehle
 
-include::autogen/user/xfer_commands.asciidoc[]
+include::autogen/user/xfer_commands.adoc[]
 
 [[support]]
 == Unterstützung
diff --git a/doc/docgen.py b/doc/docgen.py
index e3957a44a..f4c77320e 100644
--- a/doc/docgen.py
+++ b/doc/docgen.py
@@ -143,7 +143,7 @@ class AutogenDoc(object):
 
     def __init__(self, directory, doc, name):
         """Initialize auto-generated doc file."""
-        self.filename = os.path.join(directory, doc, name + '.asciidoc')
+        self.filename = os.path.join(directory, doc, name + '.adoc')
         self.filename_tmp = self.filename + '.tmp'
         self._file = open(self.filename_tmp, 'w')
         self.write('//\n')
diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index 76aee25aa..ed871c914 100644
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (en)"
   )
@@ -37,12 +37,12 @@ if(ENABLE_DOC)
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.en.html"
   )
@@ -52,11 +52,11 @@ if(ENABLE_DOC)
   # plugin API reference
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.en.html"
   )
@@ -66,10 +66,10 @@ if(ENABLE_DOC)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.en.html"
   )
@@ -79,10 +79,10 @@ if(ENABLE_DOC)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.en.html"
   )
@@ -92,10 +92,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.en.html"
   )
@@ -105,10 +105,10 @@ if(ENABLE_DOC)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.en.html"
   )
@@ -118,10 +118,10 @@ if(ENABLE_DOC)
   # relay protocol
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_relay_protocol.en.html"
   )
@@ -131,10 +131,10 @@ if(ENABLE_DOC)
   # developer's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_dev.en.html"
   )
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index 2dcb0889a..c106875a2 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -21,18 +21,18 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.en.asciidoc \
-             cmdline_options.en.asciidoc \
-             weechat_user.en.asciidoc \
-             weechat_plugin_api.en.asciidoc \
-             weechat_scripting.en.asciidoc \
-             weechat_faq.en.asciidoc \
-             weechat_quickstart.en.asciidoc \
-             weechat_tester.en.asciidoc \
-             weechat_relay_protocol.en.asciidoc \
-             weechat_dev.en.asciidoc \
-             $(wildcard autogen/user/*.asciidoc) \
-             $(wildcard autogen/plugin_api/*.asciidoc)
+             weechat.1.en.adoc \
+             cmdline_options.en.adoc \
+             weechat_user.en.adoc \
+             weechat_plugin_api.en.adoc \
+             weechat_scripting.en.adoc \
+             weechat_faq.en.adoc \
+             weechat_quickstart.en.adoc \
+             weechat_tester.en.adoc \
+             weechat_relay_protocol.en.adoc \
+             weechat_dev.en.adoc \
+             $(wildcard autogen/user/*.adoc) \
+             $(wildcard autogen/plugin_api/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -54,40 +54,40 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.en.asciidoc cmdline_options.en.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/en/weechat.1.en.asciidoc
+weechat.1: weechat.1.en.adoc cmdline_options.en.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/en/weechat.1.en.adoc
 
 # user's guide
-weechat_user.en.html: weechat_user.en.asciidoc cmdline_options.en.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.en.html $(abs_top_srcdir)/doc/en/weechat_user.en.asciidoc
+weechat_user.en.html: weechat_user.en.adoc cmdline_options.en.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.en.html $(abs_top_srcdir)/doc/en/weechat_user.en.adoc
 
 # plugin API reference
-weechat_plugin_api.en.html: weechat_plugin_api.en.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.en.html $(abs_top_srcdir)/doc/en/weechat_plugin_api.en.asciidoc
+weechat_plugin_api.en.html: weechat_plugin_api.en.adoc $(wildcard autogen/plugin_api/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.en.html $(abs_top_srcdir)/doc/en/weechat_plugin_api.en.adoc
 
 # scripting guide
-weechat_scripting.en.html: weechat_scripting.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.en.html $(abs_top_srcdir)/doc/en/weechat_scripting.en.asciidoc
+weechat_scripting.en.html: weechat_scripting.en.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.en.html $(abs_top_srcdir)/doc/en/weechat_scripting.en.adoc
 
 # FAQ
-weechat_faq.en.html: weechat_faq.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.en.html $(abs_top_srcdir)/doc/en/weechat_faq.en.asciidoc
+weechat_faq.en.html: weechat_faq.en.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.en.html $(abs_top_srcdir)/doc/en/weechat_faq.en.adoc
 
 # quickstart
-weechat_quickstart.en.html: weechat_quickstart.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.en.html $(abs_top_srcdir)/doc/en/weechat_quickstart.en.asciidoc
+weechat_quickstart.en.html: weechat_quickstart.en.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.en.html $(abs_top_srcdir)/doc/en/weechat_quickstart.en.adoc
 
 # tester's guide
-weechat_tester.en.html: weechat_tester.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.en.html $(abs_top_srcdir)/doc/en/weechat_tester.en.asciidoc
+weechat_tester.en.html: weechat_tester.en.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.en.html $(abs_top_srcdir)/doc/en/weechat_tester.en.adoc
 
 # relay protocol
-weechat_relay_protocol.en.html: weechat_relay_protocol.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.en.html $(abs_top_srcdir)/doc/en/weechat_relay_protocol.en.asciidoc
+weechat_relay_protocol.en.html: weechat_relay_protocol.en.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.en.html $(abs_top_srcdir)/doc/en/weechat_relay_protocol.en.adoc
 
 # developer's guide
-weechat_dev.en.html: weechat_dev.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.en.html $(abs_top_srcdir)/doc/en/weechat_dev.en.asciidoc
+weechat_dev.en.html: weechat_dev.en.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.en.html $(abs_top_srcdir)/doc/en/weechat_dev.en.adoc
 
 # install man/docs
 
diff --git a/doc/en/autogen/plugin_api/completions.asciidoc b/doc/en/autogen/plugin_api/completions.adoc
index 54942d71d..54942d71d 100644
--- a/doc/en/autogen/plugin_api/completions.asciidoc
+++ b/doc/en/autogen/plugin_api/completions.adoc
diff --git a/doc/en/autogen/plugin_api/hdata.asciidoc b/doc/en/autogen/plugin_api/hdata.adoc
index 4a7a634ff..4a7a634ff 100644
--- a/doc/en/autogen/plugin_api/hdata.asciidoc
+++ b/doc/en/autogen/plugin_api/hdata.adoc
diff --git a/doc/en/autogen/plugin_api/infolists.asciidoc b/doc/en/autogen/plugin_api/infolists.adoc
index b3dbc6338..b3dbc6338 100644
--- a/doc/en/autogen/plugin_api/infolists.asciidoc
+++ b/doc/en/autogen/plugin_api/infolists.adoc
diff --git a/doc/en/autogen/plugin_api/infos.asciidoc b/doc/en/autogen/plugin_api/infos.adoc
index d41a9f046..d41a9f046 100644
--- a/doc/en/autogen/plugin_api/infos.asciidoc
+++ b/doc/en/autogen/plugin_api/infos.adoc
diff --git a/doc/en/autogen/plugin_api/infos_hashtable.asciidoc b/doc/en/autogen/plugin_api/infos_hashtable.adoc
index b1bbc605c..b1bbc605c 100644
--- a/doc/en/autogen/plugin_api/infos_hashtable.asciidoc
+++ b/doc/en/autogen/plugin_api/infos_hashtable.adoc
diff --git a/doc/en/autogen/plugin_api/plugins_priority.asciidoc b/doc/en/autogen/plugin_api/plugins_priority.adoc
index 3caae876d..3caae876d 100644
--- a/doc/en/autogen/plugin_api/plugins_priority.asciidoc
+++ b/doc/en/autogen/plugin_api/plugins_priority.adoc
diff --git a/doc/en/autogen/plugin_api/url_options.asciidoc b/doc/en/autogen/plugin_api/url_options.adoc
index f89d4e249..f89d4e249 100644
--- a/doc/en/autogen/plugin_api/url_options.asciidoc
+++ b/doc/en/autogen/plugin_api/url_options.adoc
diff --git a/doc/en/autogen/user/alias_commands.asciidoc b/doc/en/autogen/user/alias_commands.adoc
index 2e723c832..2e723c832 100644
--- a/doc/en/autogen/user/alias_commands.asciidoc
+++ b/doc/en/autogen/user/alias_commands.adoc
diff --git a/doc/en/autogen/user/aspell_commands.asciidoc b/doc/en/autogen/user/aspell_commands.adoc
index 9ff3f7af2..9ff3f7af2 100644
--- a/doc/en/autogen/user/aspell_commands.asciidoc
+++ b/doc/en/autogen/user/aspell_commands.adoc
diff --git a/doc/en/autogen/user/aspell_options.asciidoc b/doc/en/autogen/user/aspell_options.adoc
index 093c60773..093c60773 100644
--- a/doc/en/autogen/user/aspell_options.asciidoc
+++ b/doc/en/autogen/user/aspell_options.adoc
diff --git a/doc/en/autogen/user/charset_commands.asciidoc b/doc/en/autogen/user/charset_commands.adoc
index 883f29385..883f29385 100644
--- a/doc/en/autogen/user/charset_commands.asciidoc
+++ b/doc/en/autogen/user/charset_commands.adoc
diff --git a/doc/en/autogen/user/charset_options.asciidoc b/doc/en/autogen/user/charset_options.adoc
index 62a439c38..62a439c38 100644
--- a/doc/en/autogen/user/charset_options.asciidoc
+++ b/doc/en/autogen/user/charset_options.adoc
diff --git a/doc/en/autogen/user/exec_commands.asciidoc b/doc/en/autogen/user/exec_commands.adoc
index 58379f69c..58379f69c 100644
--- a/doc/en/autogen/user/exec_commands.asciidoc
+++ b/doc/en/autogen/user/exec_commands.adoc
diff --git a/doc/en/autogen/user/exec_options.asciidoc b/doc/en/autogen/user/exec_options.adoc
index 4d39aeca0..4d39aeca0 100644
--- a/doc/en/autogen/user/exec_options.asciidoc
+++ b/doc/en/autogen/user/exec_options.adoc
diff --git a/doc/en/autogen/user/fifo_commands.asciidoc b/doc/en/autogen/user/fifo_commands.adoc
index f0835cdba..f0835cdba 100644
--- a/doc/en/autogen/user/fifo_commands.asciidoc
+++ b/doc/en/autogen/user/fifo_commands.adoc
diff --git a/doc/en/autogen/user/guile_commands.asciidoc b/doc/en/autogen/user/guile_commands.adoc
index 027a1bfaa..027a1bfaa 100644
--- a/doc/en/autogen/user/guile_commands.asciidoc
+++ b/doc/en/autogen/user/guile_commands.adoc
diff --git a/doc/en/autogen/user/irc_colors.asciidoc b/doc/en/autogen/user/irc_colors.adoc
index b09a4758d..b09a4758d 100644
--- a/doc/en/autogen/user/irc_colors.asciidoc
+++ b/doc/en/autogen/user/irc_colors.adoc
diff --git a/doc/en/autogen/user/irc_commands.asciidoc b/doc/en/autogen/user/irc_commands.adoc
index 4a00ae55c..4a00ae55c 100644
--- a/doc/en/autogen/user/irc_commands.asciidoc
+++ b/doc/en/autogen/user/irc_commands.adoc
diff --git a/doc/en/autogen/user/irc_options.asciidoc b/doc/en/autogen/user/irc_options.adoc
index 2081225fb..2081225fb 100644
--- a/doc/en/autogen/user/irc_options.asciidoc
+++ b/doc/en/autogen/user/irc_options.adoc
diff --git a/doc/en/autogen/user/javascript_commands.asciidoc b/doc/en/autogen/user/javascript_commands.adoc
index 0f77bba35..0f77bba35 100644
--- a/doc/en/autogen/user/javascript_commands.asciidoc
+++ b/doc/en/autogen/user/javascript_commands.adoc
diff --git a/doc/en/autogen/user/logger_commands.asciidoc b/doc/en/autogen/user/logger_commands.adoc
index 334fcf279..334fcf279 100644
--- a/doc/en/autogen/user/logger_commands.asciidoc
+++ b/doc/en/autogen/user/logger_commands.adoc
diff --git a/doc/en/autogen/user/logger_options.asciidoc b/doc/en/autogen/user/logger_options.adoc
index 57c781c60..57c781c60 100644
--- a/doc/en/autogen/user/logger_options.asciidoc
+++ b/doc/en/autogen/user/logger_options.adoc
diff --git a/doc/en/autogen/user/lua_commands.asciidoc b/doc/en/autogen/user/lua_commands.adoc
index 663842911..663842911 100644
--- a/doc/en/autogen/user/lua_commands.asciidoc
+++ b/doc/en/autogen/user/lua_commands.adoc
diff --git a/doc/en/autogen/user/perl_commands.asciidoc b/doc/en/autogen/user/perl_commands.adoc
index fca9c12cf..fca9c12cf 100644
--- a/doc/en/autogen/user/perl_commands.asciidoc
+++ b/doc/en/autogen/user/perl_commands.adoc
diff --git a/doc/en/autogen/user/python_commands.asciidoc b/doc/en/autogen/user/python_commands.adoc
index 936306bfb..936306bfb 100644
--- a/doc/en/autogen/user/python_commands.asciidoc
+++ b/doc/en/autogen/user/python_commands.adoc
diff --git a/doc/en/autogen/user/relay_commands.asciidoc b/doc/en/autogen/user/relay_commands.adoc
index 6697e4de8..6697e4de8 100644
--- a/doc/en/autogen/user/relay_commands.asciidoc
+++ b/doc/en/autogen/user/relay_commands.adoc
diff --git a/doc/en/autogen/user/relay_options.asciidoc b/doc/en/autogen/user/relay_options.adoc
index 63cb02d8d..63cb02d8d 100644
--- a/doc/en/autogen/user/relay_options.asciidoc
+++ b/doc/en/autogen/user/relay_options.adoc
diff --git a/doc/en/autogen/user/ruby_commands.asciidoc b/doc/en/autogen/user/ruby_commands.adoc
index 751a36b4e..751a36b4e 100644
--- a/doc/en/autogen/user/ruby_commands.asciidoc
+++ b/doc/en/autogen/user/ruby_commands.adoc
diff --git a/doc/en/autogen/user/script_commands.asciidoc b/doc/en/autogen/user/script_commands.adoc
index 948577762..948577762 100644
--- a/doc/en/autogen/user/script_commands.asciidoc
+++ b/doc/en/autogen/user/script_commands.adoc
diff --git a/doc/en/autogen/user/script_options.asciidoc b/doc/en/autogen/user/script_options.adoc
index 28a78507d..28a78507d 100644
--- a/doc/en/autogen/user/script_options.asciidoc
+++ b/doc/en/autogen/user/script_options.adoc
diff --git a/doc/en/autogen/user/sec_options.asciidoc b/doc/en/autogen/user/sec_options.adoc
index aa3cc1912..aa3cc1912 100644
--- a/doc/en/autogen/user/sec_options.asciidoc
+++ b/doc/en/autogen/user/sec_options.adoc
diff --git a/doc/en/autogen/user/tcl_commands.asciidoc b/doc/en/autogen/user/tcl_commands.adoc
index 008dabbe0..008dabbe0 100644
--- a/doc/en/autogen/user/tcl_commands.asciidoc
+++ b/doc/en/autogen/user/tcl_commands.adoc
diff --git a/doc/en/autogen/user/trigger_commands.asciidoc b/doc/en/autogen/user/trigger_commands.adoc
index 605490abe..605490abe 100644
--- a/doc/en/autogen/user/trigger_commands.asciidoc
+++ b/doc/en/autogen/user/trigger_commands.adoc
diff --git a/doc/en/autogen/user/trigger_options.asciidoc b/doc/en/autogen/user/trigger_options.adoc
index c09104d41..c09104d41 100644
--- a/doc/en/autogen/user/trigger_options.asciidoc
+++ b/doc/en/autogen/user/trigger_options.adoc
diff --git a/doc/en/autogen/user/weechat_commands.asciidoc b/doc/en/autogen/user/weechat_commands.adoc
index 5f12f99cf..5f12f99cf 100644
--- a/doc/en/autogen/user/weechat_commands.asciidoc
+++ b/doc/en/autogen/user/weechat_commands.adoc
diff --git a/doc/en/autogen/user/weechat_options.asciidoc b/doc/en/autogen/user/weechat_options.adoc
index 0dd709d50..0dd709d50 100644
--- a/doc/en/autogen/user/weechat_options.asciidoc
+++ b/doc/en/autogen/user/weechat_options.adoc
diff --git a/doc/en/autogen/user/xfer_commands.asciidoc b/doc/en/autogen/user/xfer_commands.adoc
index 4507b98d3..4507b98d3 100644
--- a/doc/en/autogen/user/xfer_commands.asciidoc
+++ b/doc/en/autogen/user/xfer_commands.adoc
diff --git a/doc/en/autogen/user/xfer_options.asciidoc b/doc/en/autogen/user/xfer_options.adoc
index 7b5701c22..7b5701c22 100644
--- a/doc/en/autogen/user/xfer_options.asciidoc
+++ b/doc/en/autogen/user/xfer_options.adoc
diff --git a/doc/en/cmdline_options.en.asciidoc b/doc/en/cmdline_options.en.adoc
index 82a1c8fb8..82a1c8fb8 100644
--- a/doc/en/cmdline_options.en.asciidoc
+++ b/doc/en/cmdline_options.en.adoc
diff --git a/doc/en/weechat.1.en.asciidoc b/doc/en/weechat.1.en.adoc
index bb5ae4850..4c786dd23 100644
--- a/doc/en/weechat.1.en.asciidoc
+++ b/doc/en/weechat.1.en.adoc
@@ -27,7 +27,7 @@ It is highly customizable and extensible with scripts.
 
 == OPTIONS
 
-include::cmdline_options.en.asciidoc[]
+include::cmdline_options.en.adoc[]
 
 == PLUGIN OPTIONS
 
@@ -98,7 +98,7 @@ This manpage was written by {author}.
 == COPYRIGHT
 
 WeeChat is written by Sébastien Helleu and contributors (complete list is in
-the AUTHORS.asciidoc file).
+the AUTHORS.adoc file).
 
 Copyright (C) 2003-2016 {author}
 
diff --git a/doc/en/weechat_dev.en.asciidoc b/doc/en/weechat_dev.en.adoc
index 615d970ba..12a6693f9 100644
--- a/doc/en/weechat_dev.en.asciidoc
+++ b/doc/en/weechat_dev.en.adoc
@@ -337,24 +337,24 @@ Documentation files:
 
 [width="100%",cols="1m,3",options="header"]
 |===
-| Path/file                                | Description
-| doc/                                     | Documentation
-|    docinfo.html                          | Asciidoctor style
-|    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.asciidoc        | Command-line options (file included in man page and user's guide)
-|       weechat.1.XX.asciidoc              | Man page (`man weechat`)
-|       weechat_dev.XX.asciidoc            | Developer's guide (this document)
-|       weechat_faq.XX.asciidoc            | FAQ
-|       weechat_plugin_api.XX.asciidoc     | Plugin API reference
-|       weechat_quickstart.XX.asciidoc     | Quickstart guide
-|       weechat_relay_protocol.XX.asciidoc | Relay protocol (for remote interfaces)
-|       weechat_scripting.XX.asciidoc      | Scripting guide
-|       weechat_tester.XX.asciidoc         | Tester's guide
-|       weechat_user.XX.asciidoc           | User's guide
-|       autogen/                           | Files auto-built with script docgen.py
-|          user/                           | Files auto-built for user's guide (do *NEVER* update manually!)
-|          plugin_api/                     | Files auto-built for plugin API (do *NEVER* update manually!)
+| Path/file                            | Description
+| doc/                                 | Documentation
+|    docinfo.html                      | Asciidoctor style
+|    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 page and user's guide)
+|       weechat.1.XX.adoc              | Man page (`man weechat`)
+|       weechat_dev.XX.adoc            | Developer's guide (this document)
+|       weechat_faq.XX.adoc            | FAQ
+|       weechat_plugin_api.XX.adoc     | Plugin API reference
+|       weechat_quickstart.XX.adoc     | Quickstart guide
+|       weechat_relay_protocol.XX.adoc | Relay protocol (for remote interfaces)
+|       weechat_scripting.XX.adoc      | Scripting guide
+|       weechat_tester.XX.adoc         | Tester's guide
+|       weechat_user.XX.adoc           | User's guide
+|       autogen/                       | Files auto-built with script docgen.py
+|          user/                       | Files auto-built for user's guide (do *NEVER* update manually!)
+|          plugin_api/                 | Files auto-built for plugin API (do *NEVER* update manually!)
 |===
 
 Translations for WeeChat and plugins are done with gettext, files are in _po/_
diff --git a/doc/en/weechat_faq.en.asciidoc b/doc/en/weechat_faq.en.adoc
index 34a16c705..34a16c705 100644
--- a/doc/en/weechat_faq.en.asciidoc
+++ b/doc/en/weechat_faq.en.adoc
diff --git a/doc/en/weechat_plugin_api.en.asciidoc b/doc/en/weechat_plugin_api.en.adoc
index d728bf253..0d2a78f54 100644
--- a/doc/en/weechat_plugin_api.en.asciidoc
+++ b/doc/en/weechat_plugin_api.en.adoc
@@ -104,7 +104,7 @@ default plugins).
 
 The default WeeChat plugins are initialized in this order:
 
-include::autogen/plugin_api/plugins_priority.asciidoc[]
+include::autogen/plugin_api/plugins_priority.adoc[]
 
 ==== weechat_plugin_end
 
@@ -7175,7 +7175,7 @@ Arguments:
 
 Default completion codes are:
 
-include::autogen/plugin_api/completions.asciidoc[]
+include::autogen/plugin_api/completions.adoc[]
 
 Special codes:
 
@@ -7779,7 +7779,7 @@ available:
 For command "url:...", following options are available (see
 `man curl_easy_setopt` for a description of each option):
 
-include::autogen/plugin_api/url_options.asciidoc[]
+include::autogen/plugin_api/url_options.adoc[]
 
 [NOTE]
 ^(1)^ When constants are available they must be used as value for option. For
@@ -13283,7 +13283,7 @@ Return value:
 
 Infos:
 
-include::autogen/plugin_api/infos.asciidoc[]
+include::autogen/plugin_api/infos.adoc[]
 
 C example:
 
@@ -13335,7 +13335,7 @@ Return value:
 
 Infos:
 
-include::autogen/plugin_api/infos_hashtable.asciidoc[]
+include::autogen/plugin_api/infos_hashtable.adoc[]
 
 C example:
 
@@ -13726,7 +13726,7 @@ Return value:
 
 Infolists:
 
-include::autogen/plugin_api/infolists.asciidoc[]
+include::autogen/plugin_api/infolists.adoc[]
 
 C example:
 
@@ -14441,7 +14441,7 @@ Return value:
 
 List of hdata:
 
-include::autogen/plugin_api/hdata.asciidoc[]
+include::autogen/plugin_api/hdata.adoc[]
 
 C example:
 
diff --git a/doc/en/weechat_quickstart.en.asciidoc b/doc/en/weechat_quickstart.en.adoc
index f0c2ee476..f0c2ee476 100644
--- a/doc/en/weechat_quickstart.en.asciidoc
+++ b/doc/en/weechat_quickstart.en.adoc
diff --git a/doc/en/weechat_relay_protocol.en.asciidoc b/doc/en/weechat_relay_protocol.en.adoc
index 7db6bbf80..7db6bbf80 100644
--- a/doc/en/weechat_relay_protocol.en.asciidoc
+++ b/doc/en/weechat_relay_protocol.en.adoc
diff --git a/doc/en/weechat_scripting.en.asciidoc b/doc/en/weechat_scripting.en.adoc
index 2deff4bed..2deff4bed 100644
--- a/doc/en/weechat_scripting.en.asciidoc
+++ b/doc/en/weechat_scripting.en.adoc
diff --git a/doc/en/weechat_tester.en.asciidoc b/doc/en/weechat_tester.en.adoc
index d7cb15a34..d7cb15a34 100644
--- a/doc/en/weechat_tester.en.asciidoc
+++ b/doc/en/weechat_tester.en.adoc
diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.adoc
index 49e297aae..9434a81c3 100644
--- a/doc/en/weechat_user.en.asciidoc
+++ b/doc/en/weechat_user.en.adoc
@@ -450,7 +450,7 @@ Then like for a crash, use command `bt full`:
 
 Command line arguments:
 
-include::cmdline_options.en.asciidoc[]
+include::cmdline_options.en.adoc[]
 
 To start WeeChat, issue this command:
 
@@ -1416,7 +1416,7 @@ attribute.
 
 Color codes for kbd:[Ctrl+c], kbd:[c] are:
 
-include::autogen/user/irc_colors.asciidoc[]
+include::autogen/user/irc_colors.adoc[]
 
 [NOTE]
 To show all available colors in your terminal, you can do `/color` then
@@ -1678,7 +1678,7 @@ Sections:
 
 Options:
 
-include::autogen/user/sec_options.asciidoc[]
+include::autogen/user/sec_options.adoc[]
 
 [[weechat_options]]
 ==== WeeChat options (weechat.conf)
@@ -1713,12 +1713,12 @@ Sections:
 
 Options:
 
-include::autogen/user/weechat_options.asciidoc[]
+include::autogen/user/weechat_options.adoc[]
 
 [[weechat_commands]]
 ==== WeeChat commands
 
-include::autogen/user/weechat_commands.asciidoc[]
+include::autogen/user/weechat_commands.adoc[]
 
 [[plugins]]
 == Plugins
@@ -1785,7 +1785,7 @@ plugins).
 [[alias_commands]]
 ==== Commands
 
-include::autogen/user/alias_commands.asciidoc[]
+include::autogen/user/alias_commands.adoc[]
 
 [[aspell_plugin]]
 === Aspell plugin
@@ -1810,12 +1810,12 @@ Sections:
 
 Options:
 
-include::autogen/user/aspell_options.asciidoc[]
+include::autogen/user/aspell_options.adoc[]
 
 [[aspell_commands]]
 ==== Commands
 
-include::autogen/user/aspell_commands.asciidoc[]
+include::autogen/user/aspell_commands.adoc[]
 
 [[aspell_speller_options]]
 ==== Speller options
@@ -1914,12 +1914,12 @@ Sections:
 
 Options:
 
-include::autogen/user/charset_options.asciidoc[]
+include::autogen/user/charset_options.adoc[]
 
 [[charset_commands]]
 ==== Commands
 
-include::autogen/user/charset_commands.asciidoc[]
+include::autogen/user/charset_commands.adoc[]
 
 [[charset_set]]
 ==== Set charset
@@ -1996,12 +1996,12 @@ Sections:
 
 Options:
 
-include::autogen/user/exec_options.asciidoc[]
+include::autogen/user/exec_options.adoc[]
 
 [[exec_commands]]
 ==== Commands
 
-include::autogen/user/exec_commands.asciidoc[]
+include::autogen/user/exec_commands.adoc[]
 
 [[fifo_plugin]]
 === Fifo plugin
@@ -2069,7 +2069,7 @@ $ ./auto_weechat_command 'irc.freenode.#weechat *hello'
 [[fifo_commands]]
 ==== Commands
 
-include::autogen/user/fifo_commands.asciidoc[]
+include::autogen/user/fifo_commands.adoc[]
 
 [[irc_plugin]]
 === IRC plugin
@@ -2116,12 +2116,12 @@ Sections:
 
 Options:
 
-include::autogen/user/irc_options.asciidoc[]
+include::autogen/user/irc_options.adoc[]
 
 [[irc_commands]]
 ==== Commands
 
-include::autogen/user/irc_commands.asciidoc[]
+include::autogen/user/irc_commands.adoc[]
 
 [[irc_ssl_certificates]]
 ==== SSL certificates
@@ -2570,12 +2570,12 @@ Sections:
 
 Options:
 
-include::autogen/user/logger_options.asciidoc[]
+include::autogen/user/logger_options.adoc[]
 
 [[logger_commands]]
 ==== Commands
 
-include::autogen/user/logger_commands.asciidoc[]
+include::autogen/user/logger_commands.adoc[]
 
 [[logger_log_levels]]
 ==== Log levels
@@ -2725,12 +2725,12 @@ Sections:
 
 Options:
 
-include::autogen/user/relay_options.asciidoc[]
+include::autogen/user/relay_options.adoc[]
 
 [[relay_commands]]
 ==== Commands
 
-include::autogen/user/relay_commands.asciidoc[]
+include::autogen/user/relay_commands.adoc[]
 
 [[relay_password]]
 ==== Password
@@ -2867,47 +2867,47 @@ Sections:
 
 Options:
 
-include::autogen/user/script_options.asciidoc[]
+include::autogen/user/script_options.adoc[]
 
 [[script_commands]]
 ==== Script commands
 
-include::autogen/user/script_commands.asciidoc[]
+include::autogen/user/script_commands.adoc[]
 
 [[python_commands]]
 ==== Python commands
 
-include::autogen/user/python_commands.asciidoc[]
+include::autogen/user/python_commands.adoc[]
 
 [[perl_commands]]
 ==== Perl commands
 
-include::autogen/user/perl_commands.asciidoc[]
+include::autogen/user/perl_commands.adoc[]
 
 [[ruby_commands]]
 ==== Ruby commands
 
-include::autogen/user/ruby_commands.asciidoc[]
+include::autogen/user/ruby_commands.adoc[]
 
 [[lua_commands]]
 ==== Lua commands
 
-include::autogen/user/lua_commands.asciidoc[]
+include::autogen/user/lua_commands.adoc[]
 
 [[tcl_commands]]
 ==== Tcl commands
 
-include::autogen/user/tcl_commands.asciidoc[]
+include::autogen/user/tcl_commands.adoc[]
 
 [[guile_commands]]
 ==== Guile commands
 
-include::autogen/user/guile_commands.asciidoc[]
+include::autogen/user/guile_commands.adoc[]
 
 [[javascript_commands]]
 ==== Javascript commands
 
-include::autogen/user/javascript_commands.asciidoc[]
+include::autogen/user/javascript_commands.adoc[]
 
 [[trigger_plugin]]
 === Trigger plugin
@@ -2938,12 +2938,12 @@ Sections:
 
 Options:
 
-include::autogen/user/trigger_options.asciidoc[]
+include::autogen/user/trigger_options.adoc[]
 
 [[trigger_commands]]
 ==== Commands
 
-include::autogen/user/trigger_commands.asciidoc[]
+include::autogen/user/trigger_commands.adoc[]
 
 [[trigger_anatomy]]
 ==== Anatomy of a trigger
@@ -3463,12 +3463,12 @@ Sections:
 
 Options:
 
-include::autogen/user/xfer_options.asciidoc[]
+include::autogen/user/xfer_options.adoc[]
 
 [[xfer_commands]]
 ==== Commands
 
-include::autogen/user/xfer_commands.asciidoc[]
+include::autogen/user/xfer_commands.adoc[]
 
 [[support]]
 == Support
diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt
index a4fd2443a..4357ed435 100644
--- a/doc/es/CMakeLists.txt
+++ b/doc/es/CMakeLists.txt
@@ -22,10 +22,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.es.html"
   )
diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am
index 5bec564e2..2dd9746b5 100644
--- a/doc/es/Makefile.am
+++ b/doc/es/Makefile.am
@@ -20,7 +20,7 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat_quickstart.es.asciidoc
+             weechat_quickstart.es.adoc
 
 if MAN
   man_targets =
@@ -35,8 +35,8 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # quickstart
-weechat_quickstart.es.html: weechat_quickstart.es.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.es.html $(abs_top_srcdir)/doc/es/weechat_quickstart.es.asciidoc
+weechat_quickstart.es.html: weechat_quickstart.es.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.es.html $(abs_top_srcdir)/doc/es/weechat_quickstart.es.adoc
 
 # install man/docs
 
diff --git a/doc/es/weechat_quickstart.es.asciidoc b/doc/es/weechat_quickstart.es.adoc
index b8fa605bc..b8fa605bc 100644
--- a/doc/es/weechat_quickstart.es.asciidoc
+++ b/doc/es/weechat_quickstart.es.adoc
diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt
index 1d857adae..86db5ed7c 100644
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (fr)"
   )
@@ -37,12 +37,12 @@ if(ENABLE_DOC)
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.fr.html"
   )
@@ -52,11 +52,11 @@ if(ENABLE_DOC)
   # plugin API reference
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.fr.html"
   )
@@ -66,10 +66,10 @@ if(ENABLE_DOC)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.fr.html"
   )
@@ -79,10 +79,10 @@ if(ENABLE_DOC)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.fr.html"
   )
@@ -92,10 +92,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.fr.html"
   )
@@ -105,10 +105,10 @@ if(ENABLE_DOC)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.fr.html"
   )
@@ -118,10 +118,10 @@ if(ENABLE_DOC)
   # relay protocol
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_relay_protocol.fr.html"
   )
@@ -131,10 +131,10 @@ if(ENABLE_DOC)
   # developer's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.fr.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_dev.fr.html"
   )
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 9d3d94b23..c22bc62d0 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -21,18 +21,18 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.fr.asciidoc \
-             cmdline_options.fr.asciidoc \
-             weechat_user.fr.asciidoc \
-             weechat_plugin_api.fr.asciidoc \
-             weechat_scripting.fr.asciidoc \
-             weechat_faq.fr.asciidoc \
-             weechat_quickstart.fr.asciidoc \
-             weechat_tester.fr.asciidoc \
-             weechat_relay_protocol.fr.asciidoc \
-             weechat_dev.fr.asciidoc \
-             $(wildcard autogen/user/*.asciidoc) \
-             $(wildcard autogen/plugin_api/*.asciidoc)
+             weechat.1.fr.adoc \
+             cmdline_options.fr.adoc \
+             weechat_user.fr.adoc \
+             weechat_plugin_api.fr.adoc \
+             weechat_scripting.fr.adoc \
+             weechat_faq.fr.adoc \
+             weechat_quickstart.fr.adoc \
+             weechat_tester.fr.adoc \
+             weechat_relay_protocol.fr.adoc \
+             weechat_dev.fr.adoc \
+             $(wildcard autogen/user/*.adoc) \
+             $(wildcard autogen/plugin_api/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -54,40 +54,40 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.fr.asciidoc cmdline_options.fr.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/fr/weechat.1.fr.asciidoc
+weechat.1: weechat.1.fr.adoc cmdline_options.fr.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/fr/weechat.1.fr.adoc
 
 # user's guide
-weechat_user.fr.html: weechat_user.fr.asciidoc cmdline_options.fr.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.fr.html $(abs_top_srcdir)/doc/fr/weechat_user.fr.asciidoc
+weechat_user.fr.html: weechat_user.fr.adoc cmdline_options.fr.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.fr.html $(abs_top_srcdir)/doc/fr/weechat_user.fr.adoc
 
 # plugin API reference
-weechat_plugin_api.fr.html: weechat_plugin_api.fr.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.fr.html $(abs_top_srcdir)/doc/fr/weechat_plugin_api.fr.asciidoc
+weechat_plugin_api.fr.html: weechat_plugin_api.fr.adoc $(wildcard autogen/plugin_api/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.fr.html $(abs_top_srcdir)/doc/fr/weechat_plugin_api.fr.adoc
 
 # scripting guide
-weechat_scripting.fr.html: weechat_scripting.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.fr.html $(abs_top_srcdir)/doc/fr/weechat_scripting.fr.asciidoc
+weechat_scripting.fr.html: weechat_scripting.fr.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.fr.html $(abs_top_srcdir)/doc/fr/weechat_scripting.fr.adoc
 
 # FAQ
-weechat_faq.fr.html: weechat_faq.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.fr.html $(abs_top_srcdir)/doc/fr/weechat_faq.fr.asciidoc
+weechat_faq.fr.html: weechat_faq.fr.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.fr.html $(abs_top_srcdir)/doc/fr/weechat_faq.fr.adoc
 
 # quickstart
-weechat_quickstart.fr.html: weechat_quickstart.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.fr.html $(abs_top_srcdir)/doc/fr/weechat_quickstart.fr.asciidoc
+weechat_quickstart.fr.html: weechat_quickstart.fr.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.fr.html $(abs_top_srcdir)/doc/fr/weechat_quickstart.fr.adoc
 
 # tester's guide
-weechat_tester.fr.html: weechat_tester.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.fr.html $(abs_top_srcdir)/doc/fr/weechat_tester.fr.asciidoc
+weechat_tester.fr.html: weechat_tester.fr.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.fr.html $(abs_top_srcdir)/doc/fr/weechat_tester.fr.adoc
 
 # relay protocol
-weechat_relay_protocol.fr.html: weechat_relay_protocol.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.fr.html $(abs_top_srcdir)/doc/fr/weechat_relay_protocol.fr.asciidoc
+weechat_relay_protocol.fr.html: weechat_relay_protocol.fr.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.fr.html $(abs_top_srcdir)/doc/fr/weechat_relay_protocol.fr.adoc
 
 # developer's guide
-weechat_dev.fr.html: weechat_dev.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.fr.html $(abs_top_srcdir)/doc/fr/weechat_dev.fr.asciidoc
+weechat_dev.fr.html: weechat_dev.fr.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.fr.html $(abs_top_srcdir)/doc/fr/weechat_dev.fr.adoc
 
 # install man/docs
 
diff --git a/doc/fr/autogen/plugin_api/completions.asciidoc b/doc/fr/autogen/plugin_api/completions.adoc
index 29bcc7b25..29bcc7b25 100644
--- a/doc/fr/autogen/plugin_api/completions.asciidoc
+++ b/doc/fr/autogen/plugin_api/completions.adoc
diff --git a/doc/fr/autogen/plugin_api/hdata.asciidoc b/doc/fr/autogen/plugin_api/hdata.adoc
index 88499e41a..88499e41a 100644
--- a/doc/fr/autogen/plugin_api/hdata.asciidoc
+++ b/doc/fr/autogen/plugin_api/hdata.adoc
diff --git a/doc/fr/autogen/plugin_api/infolists.asciidoc b/doc/fr/autogen/plugin_api/infolists.adoc
index b4f9f5259..b4f9f5259 100644
--- a/doc/fr/autogen/plugin_api/infolists.asciidoc
+++ b/doc/fr/autogen/plugin_api/infolists.adoc
diff --git a/doc/fr/autogen/plugin_api/infos.asciidoc b/doc/fr/autogen/plugin_api/infos.adoc
index d01d79a0e..d01d79a0e 100644
--- a/doc/fr/autogen/plugin_api/infos.asciidoc
+++ b/doc/fr/autogen/plugin_api/infos.adoc
diff --git a/doc/fr/autogen/plugin_api/infos_hashtable.asciidoc b/doc/fr/autogen/plugin_api/infos_hashtable.adoc
index 2f96dfe32..2f96dfe32 100644
--- a/doc/fr/autogen/plugin_api/infos_hashtable.asciidoc
+++ b/doc/fr/autogen/plugin_api/infos_hashtable.adoc
diff --git a/doc/fr/autogen/plugin_api/plugins_priority.asciidoc b/doc/fr/autogen/plugin_api/plugins_priority.adoc
index 3caae876d..3caae876d 100644
--- a/doc/fr/autogen/plugin_api/plugins_priority.asciidoc
+++ b/doc/fr/autogen/plugin_api/plugins_priority.adoc
diff --git a/doc/fr/autogen/plugin_api/url_options.asciidoc b/doc/fr/autogen/plugin_api/url_options.adoc
index 469a43afe..469a43afe 100644
--- a/doc/fr/autogen/plugin_api/url_options.asciidoc
+++ b/doc/fr/autogen/plugin_api/url_options.adoc
diff --git a/doc/fr/autogen/user/alias_commands.asciidoc b/doc/fr/autogen/user/alias_commands.adoc
index 2fadea96c..2fadea96c 100644
--- a/doc/fr/autogen/user/alias_commands.asciidoc
+++ b/doc/fr/autogen/user/alias_commands.adoc
diff --git a/doc/fr/autogen/user/aspell_commands.asciidoc b/doc/fr/autogen/user/aspell_commands.adoc
index 330f0c76f..330f0c76f 100644
--- a/doc/fr/autogen/user/aspell_commands.asciidoc
+++ b/doc/fr/autogen/user/aspell_commands.adoc
diff --git a/doc/fr/autogen/user/aspell_options.asciidoc b/doc/fr/autogen/user/aspell_options.adoc
index c6c719642..c6c719642 100644
--- a/doc/fr/autogen/user/aspell_options.asciidoc
+++ b/doc/fr/autogen/user/aspell_options.adoc
diff --git a/doc/fr/autogen/user/charset_commands.asciidoc b/doc/fr/autogen/user/charset_commands.adoc
index c16339b76..c16339b76 100644
--- a/doc/fr/autogen/user/charset_commands.asciidoc
+++ b/doc/fr/autogen/user/charset_commands.adoc
diff --git a/doc/fr/autogen/user/charset_options.asciidoc b/doc/fr/autogen/user/charset_options.adoc
index d1a7485b3..d1a7485b3 100644
--- a/doc/fr/autogen/user/charset_options.asciidoc
+++ b/doc/fr/autogen/user/charset_options.adoc
diff --git a/doc/fr/autogen/user/exec_commands.asciidoc b/doc/fr/autogen/user/exec_commands.adoc
index 957310568..957310568 100644
--- a/doc/fr/autogen/user/exec_commands.asciidoc
+++ b/doc/fr/autogen/user/exec_commands.adoc
diff --git a/doc/fr/autogen/user/exec_options.asciidoc b/doc/fr/autogen/user/exec_options.adoc
index b558dad61..b558dad61 100644
--- a/doc/fr/autogen/user/exec_options.asciidoc
+++ b/doc/fr/autogen/user/exec_options.adoc
diff --git a/doc/fr/autogen/user/fifo_commands.asciidoc b/doc/fr/autogen/user/fifo_commands.adoc
index 0374d25b3..0374d25b3 100644
--- a/doc/fr/autogen/user/fifo_commands.asciidoc
+++ b/doc/fr/autogen/user/fifo_commands.adoc
diff --git a/doc/fr/autogen/user/guile_commands.asciidoc b/doc/fr/autogen/user/guile_commands.adoc
index a95b6f65e..a95b6f65e 100644
--- a/doc/fr/autogen/user/guile_commands.asciidoc
+++ b/doc/fr/autogen/user/guile_commands.adoc
diff --git a/doc/fr/autogen/user/irc_colors.asciidoc b/doc/fr/autogen/user/irc_colors.adoc
index 6d1bfb6bb..6d1bfb6bb 100644
--- a/doc/fr/autogen/user/irc_colors.asciidoc
+++ b/doc/fr/autogen/user/irc_colors.adoc
diff --git a/doc/fr/autogen/user/irc_commands.asciidoc b/doc/fr/autogen/user/irc_commands.adoc
index 8776aa498..8776aa498 100644
--- a/doc/fr/autogen/user/irc_commands.asciidoc
+++ b/doc/fr/autogen/user/irc_commands.adoc
diff --git a/doc/fr/autogen/user/irc_options.asciidoc b/doc/fr/autogen/user/irc_options.adoc
index e1d62d7ed..e1d62d7ed 100644
--- a/doc/fr/autogen/user/irc_options.asciidoc
+++ b/doc/fr/autogen/user/irc_options.adoc
diff --git a/doc/fr/autogen/user/javascript_commands.asciidoc b/doc/fr/autogen/user/javascript_commands.adoc
index dd7c4d05b..dd7c4d05b 100644
--- a/doc/fr/autogen/user/javascript_commands.asciidoc
+++ b/doc/fr/autogen/user/javascript_commands.adoc
diff --git a/doc/fr/autogen/user/logger_commands.asciidoc b/doc/fr/autogen/user/logger_commands.adoc
index c48fb0d6c..c48fb0d6c 100644
--- a/doc/fr/autogen/user/logger_commands.asciidoc
+++ b/doc/fr/autogen/user/logger_commands.adoc
diff --git a/doc/fr/autogen/user/logger_options.asciidoc b/doc/fr/autogen/user/logger_options.adoc
index 2f9eb1daf..2f9eb1daf 100644
--- a/doc/fr/autogen/user/logger_options.asciidoc
+++ b/doc/fr/autogen/user/logger_options.adoc
diff --git a/doc/fr/autogen/user/lua_commands.asciidoc b/doc/fr/autogen/user/lua_commands.adoc
index 3c47dbf83..3c47dbf83 100644
--- a/doc/fr/autogen/user/lua_commands.asciidoc
+++ b/doc/fr/autogen/user/lua_commands.adoc
diff --git a/doc/fr/autogen/user/perl_commands.asciidoc b/doc/fr/autogen/user/perl_commands.adoc
index 76027d3f1..76027d3f1 100644
--- a/doc/fr/autogen/user/perl_commands.asciidoc
+++ b/doc/fr/autogen/user/perl_commands.adoc
diff --git a/doc/fr/autogen/user/python_commands.asciidoc b/doc/fr/autogen/user/python_commands.adoc
index 263a706df..263a706df 100644
--- a/doc/fr/autogen/user/python_commands.asciidoc
+++ b/doc/fr/autogen/user/python_commands.adoc
diff --git a/doc/fr/autogen/user/relay_commands.asciidoc b/doc/fr/autogen/user/relay_commands.adoc
index 767f9c96c..767f9c96c 100644
--- a/doc/fr/autogen/user/relay_commands.asciidoc
+++ b/doc/fr/autogen/user/relay_commands.adoc
diff --git a/doc/fr/autogen/user/relay_options.asciidoc b/doc/fr/autogen/user/relay_options.adoc
index 415f09492..415f09492 100644
--- a/doc/fr/autogen/user/relay_options.asciidoc
+++ b/doc/fr/autogen/user/relay_options.adoc
diff --git a/doc/fr/autogen/user/ruby_commands.asciidoc b/doc/fr/autogen/user/ruby_commands.adoc
index c685d271e..c685d271e 100644
--- a/doc/fr/autogen/user/ruby_commands.asciidoc
+++ b/doc/fr/autogen/user/ruby_commands.adoc
diff --git a/doc/fr/autogen/user/script_commands.asciidoc b/doc/fr/autogen/user/script_commands.adoc
index c65c784cb..c65c784cb 100644
--- a/doc/fr/autogen/user/script_commands.asciidoc
+++ b/doc/fr/autogen/user/script_commands.adoc
diff --git a/doc/fr/autogen/user/script_options.asciidoc b/doc/fr/autogen/user/script_options.adoc
index d76aad0d1..d76aad0d1 100644
--- a/doc/fr/autogen/user/script_options.asciidoc
+++ b/doc/fr/autogen/user/script_options.adoc
diff --git a/doc/fr/autogen/user/sec_options.asciidoc b/doc/fr/autogen/user/sec_options.adoc
index 7b4321c29..7b4321c29 100644
--- a/doc/fr/autogen/user/sec_options.asciidoc
+++ b/doc/fr/autogen/user/sec_options.adoc
diff --git a/doc/fr/autogen/user/tcl_commands.asciidoc b/doc/fr/autogen/user/tcl_commands.adoc
index 6110f15ef..6110f15ef 100644
--- a/doc/fr/autogen/user/tcl_commands.asciidoc
+++ b/doc/fr/autogen/user/tcl_commands.adoc
diff --git a/doc/fr/autogen/user/trigger_commands.asciidoc b/doc/fr/autogen/user/trigger_commands.adoc
index edaf65de5..edaf65de5 100644
--- a/doc/fr/autogen/user/trigger_commands.asciidoc
+++ b/doc/fr/autogen/user/trigger_commands.adoc
diff --git a/doc/fr/autogen/user/trigger_options.asciidoc b/doc/fr/autogen/user/trigger_options.adoc
index 61e27c02a..61e27c02a 100644
--- a/doc/fr/autogen/user/trigger_options.asciidoc
+++ b/doc/fr/autogen/user/trigger_options.adoc
diff --git a/doc/fr/autogen/user/weechat_commands.asciidoc b/doc/fr/autogen/user/weechat_commands.adoc
index 3c83e93f9..3c83e93f9 100644
--- a/doc/fr/autogen/user/weechat_commands.asciidoc
+++ b/doc/fr/autogen/user/weechat_commands.adoc
diff --git a/doc/fr/autogen/user/weechat_options.asciidoc b/doc/fr/autogen/user/weechat_options.adoc
index d93d52498..d93d52498 100644
--- a/doc/fr/autogen/user/weechat_options.asciidoc
+++ b/doc/fr/autogen/user/weechat_options.adoc
diff --git a/doc/fr/autogen/user/xfer_commands.asciidoc b/doc/fr/autogen/user/xfer_commands.adoc
index 76f32b123..76f32b123 100644
--- a/doc/fr/autogen/user/xfer_commands.asciidoc
+++ b/doc/fr/autogen/user/xfer_commands.adoc
diff --git a/doc/fr/autogen/user/xfer_options.asciidoc b/doc/fr/autogen/user/xfer_options.adoc
index bd4cb2165..bd4cb2165 100644
--- a/doc/fr/autogen/user/xfer_options.asciidoc
+++ b/doc/fr/autogen/user/xfer_options.adoc
diff --git a/doc/fr/cmdline_options.fr.asciidoc b/doc/fr/cmdline_options.fr.adoc
index 0a5bf6aeb..0a5bf6aeb 100644
--- a/doc/fr/cmdline_options.fr.asciidoc
+++ b/doc/fr/cmdline_options.fr.adoc
diff --git a/doc/fr/weechat.1.fr.asciidoc b/doc/fr/weechat.1.fr.adoc
index 75c9d0794..1a8ee4a61 100644
--- a/doc/fr/weechat.1.fr.asciidoc
+++ b/doc/fr/weechat.1.fr.adoc
@@ -27,7 +27,7 @@ Il est hautement paramétrable et extensible avec des scripts.
 
 == OPTIONS
 
-include::cmdline_options.fr.asciidoc[]
+include::cmdline_options.fr.adoc[]
 
 == OPTIONS D'EXTENSION
 
@@ -100,7 +100,7 @@ Cette page de manuel a été écrite par {author}.
 == COPYRIGHT
 
 WeeChat est écrit par Sébastien Helleu et des contributeurs (la liste complète
-est dans le fichier AUTHORS.asciidoc).
+est dans le fichier AUTHORS.adoc).
 
 Copyright (C) 2003-2016 {author}
 
diff --git a/doc/fr/weechat_dev.fr.asciidoc b/doc/fr/weechat_dev.fr.adoc
index bec35ec9d..ebfd70cf4 100644
--- a/doc/fr/weechat_dev.fr.asciidoc
+++ b/doc/fr/weechat_dev.fr.adoc
@@ -339,24 +339,24 @@ Fichiers de documentation :
 
 [width="100%",cols="1m,3",options="header"]
 |===
-| Chemin/fichier                           | Description
-| doc/                                     | Documentation
-|    docinfo.html                          | Style Asciidoctor
-|    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.asciidoc        | Options de ligne de commande (fichier inclus dans la page de manuel et le guide utilisateur)
-|       weechat.1.XX.asciidoc              | Page de manuel (`man weechat`)
-|       weechat_dev.XX.asciidoc            | Guide du développeur (ce document)
-|       weechat_faq.XX.asciidoc            | FAQ (questions fréquemment posées)
-|       weechat_plugin_api.XX.asciidoc     | Référence API extension
-|       weechat_quickstart.XX.asciidoc     | Guide de démarrage
-|       weechat_relay_protocol.XX.asciidoc | Protocole Relay (pour les interfaces distantes)
-|       weechat_scripting.XX.asciidoc      | Guide pour scripts
-|       weechat_tester.XX.asciidoc         | Guide du testeur
-|       weechat_user.XX.asciidoc           | Guide utilisateur
-|       autogen/                           | Fichiers automatiquement générés avec le script docgen.py
-|          user/                           | Fichiers automatiquement générés pour le guide utilisateur (ne *JAMAIS* les mettre à jour manuellement !)
-|          plugin_api/                     | Fichiers automatiquement générés pour l'API extension (ne *JAMAIS* les mettre à jour manuellement !)
+| Chemin/fichier                       | Description
+| doc/                                 | Documentation
+|    docinfo.html                      | Style Asciidoctor
+|    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 la page de manuel et le guide utilisateur)
+|       weechat.1.XX.adoc              | Page de manuel (`man weechat`)
+|       weechat_dev.XX.adoc            | Guide du développeur (ce document)
+|       weechat_faq.XX.adoc            | FAQ (questions fréquemment posées)
+|       weechat_plugin_api.XX.adoc     | Référence API extension
+|       weechat_quickstart.XX.adoc     | Guide de démarrage
+|       weechat_relay_protocol.XX.adoc | Protocole Relay (pour les interfaces distantes)
+|       weechat_scripting.XX.adoc      | Guide pour scripts
+|       weechat_tester.XX.adoc         | Guide du testeur
+|       weechat_user.XX.adoc           | Guide utilisateur
+|       autogen/                       | Fichiers automatiquement générés avec le script docgen.py
+|          user/                       | Fichiers automatiquement générés pour le guide utilisateur (ne *JAMAIS* les mettre à jour manuellement !)
+|          plugin_api/                 | Fichiers automatiquement générés pour l'API extension (ne *JAMAIS* les mettre à jour manuellement !)
 |===
 
 Les traductions pour WeeChat et les extensions sont effectuées avec gettext, les
diff --git a/doc/fr/weechat_faq.fr.asciidoc b/doc/fr/weechat_faq.fr.adoc
index 755beb2cb..755beb2cb 100644
--- a/doc/fr/weechat_faq.fr.asciidoc
+++ b/doc/fr/weechat_faq.fr.adoc
diff --git a/doc/fr/weechat_plugin_api.fr.asciidoc b/doc/fr/weechat_plugin_api.fr.adoc
index b30cdde17..66aa32446 100644
--- a/doc/fr/weechat_plugin_api.fr.asciidoc
+++ b/doc/fr/weechat_plugin_api.fr.adoc
@@ -109,7 +109,7 @@ chargée après toutes les extensions par défaut).
 
 Les extensions par défaut de WeeChat sont initialisées dans cet ordre :
 
-include::autogen/plugin_api/plugins_priority.asciidoc[]
+include::autogen/plugin_api/plugins_priority.adoc[]
 
 ==== weechat_plugin_end
 
@@ -7301,7 +7301,7 @@ Paramètres :
 
 Les codes complétions par défaut sont :
 
-include::autogen/plugin_api/completions.asciidoc[]
+include::autogen/plugin_api/completions.adoc[]
 
 Codes spéciaux :
 
@@ -7931,7 +7931,7 @@ sont disponibles :
 Pour la commande "url:...", les options suivantes sont disponibles (voir
 `man curl_easy_setopt` pour une description de chaque option) :
 
-include::autogen/plugin_api/url_options.asciidoc[]
+include::autogen/plugin_api/url_options.adoc[]
 
 [NOTE]
 ^(1)^ Lorsque des constantes sont disponibles, elles doivent être utilisées
@@ -13563,7 +13563,7 @@ Valeur de retour :
 
 Infos :
 
-include::autogen/plugin_api/infos.asciidoc[]
+include::autogen/plugin_api/infos.adoc[]
 
 Exemple en C :
 
@@ -13616,7 +13616,7 @@ Valeur de retour :
 
 Infos :
 
-include::autogen/plugin_api/infos_hashtable.asciidoc[]
+include::autogen/plugin_api/infos_hashtable.adoc[]
 
 Exemple en C :
 
@@ -14011,7 +14011,7 @@ Valeur de retour :
 
 Infolists :
 
-include::autogen/plugin_api/infolists.asciidoc[]
+include::autogen/plugin_api/infolists.adoc[]
 
 Exemple en C :
 
@@ -14746,7 +14746,7 @@ Valeur de retour :
 
 Liste des hdata :
 
-include::autogen/plugin_api/hdata.asciidoc[]
+include::autogen/plugin_api/hdata.adoc[]
 
 Exemple en C :
 
diff --git a/doc/fr/weechat_quickstart.fr.asciidoc b/doc/fr/weechat_quickstart.fr.adoc
index 71ab3de59..71ab3de59 100644
--- a/doc/fr/weechat_quickstart.fr.asciidoc
+++ b/doc/fr/weechat_quickstart.fr.adoc
diff --git a/doc/fr/weechat_relay_protocol.fr.asciidoc b/doc/fr/weechat_relay_protocol.fr.adoc
index 7ef67d85a..7ef67d85a 100644
--- a/doc/fr/weechat_relay_protocol.fr.asciidoc
+++ b/doc/fr/weechat_relay_protocol.fr.adoc
diff --git a/doc/fr/weechat_scripting.fr.asciidoc b/doc/fr/weechat_scripting.fr.adoc
index 41f31d3d1..41f31d3d1 100644
--- a/doc/fr/weechat_scripting.fr.asciidoc
+++ b/doc/fr/weechat_scripting.fr.adoc
diff --git a/doc/fr/weechat_tester.fr.asciidoc b/doc/fr/weechat_tester.fr.adoc
index fac4574c2..fac4574c2 100644
--- a/doc/fr/weechat_tester.fr.asciidoc
+++ b/doc/fr/weechat_tester.fr.adoc
diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.adoc
index 8e044d3d5..9f3f4a81d 100644
--- a/doc/fr/weechat_user.fr.asciidoc
+++ b/doc/fr/weechat_user.fr.adoc
@@ -459,7 +459,7 @@ Ensuite comme pour un crash, utilisez la commande `bt full` :
 
 Paramètres de ligne de commande :
 
-include::cmdline_options.fr.asciidoc[]
+include::cmdline_options.fr.adoc[]
 
 Pour lancer WeeChat, tapez cette commande :
 
@@ -1454,7 +1454,7 @@ stopper l'attribut défini.
 
 Les codes couleur pour kbd:[Ctrl+c], kbd:[c] sont :
 
-include::autogen/user/irc_colors.asciidoc[]
+include::autogen/user/irc_colors.adoc[]
 
 [NOTE]
 Pour voir toutes les couleurs disponibles dans votre terminal, vous pouvez
@@ -1731,7 +1731,7 @@ Sections :
 
 Options :
 
-include::autogen/user/sec_options.asciidoc[]
+include::autogen/user/sec_options.adoc[]
 
 [[weechat_options]]
 ==== Options WeeChat (weechat.conf)
@@ -1766,12 +1766,12 @@ Sections :
 
 Options :
 
-include::autogen/user/weechat_options.asciidoc[]
+include::autogen/user/weechat_options.adoc[]
 
 [[weechat_commands]]
 ==== Commandes WeeChat
 
-include::autogen/user/weechat_commands.asciidoc[]
+include::autogen/user/weechat_commands.adoc[]
 
 [[plugins]]
 == Extensions
@@ -1840,7 +1840,7 @@ d'autres extensions).
 [[alias_commands]]
 ==== Commandes
 
-include::autogen/user/alias_commands.asciidoc[]
+include::autogen/user/alias_commands.adoc[]
 
 [[aspell_plugin]]
 === Extension Aspell
@@ -1865,12 +1865,12 @@ Sections :
 
 Options :
 
-include::autogen/user/aspell_options.asciidoc[]
+include::autogen/user/aspell_options.adoc[]
 
 [[aspell_commands]]
 ==== Commandes
 
-include::autogen/user/aspell_commands.asciidoc[]
+include::autogen/user/aspell_commands.adoc[]
 
 [[aspell_speller_options]]
 ==== Options du vérificateur d'orthographe
@@ -1973,12 +1973,12 @@ Sections :
 
 Options :
 
-include::autogen/user/charset_options.asciidoc[]
+include::autogen/user/charset_options.adoc[]
 
 [[charset_commands]]
 ==== Commandes
 
-include::autogen/user/charset_commands.asciidoc[]
+include::autogen/user/charset_commands.adoc[]
 
 [[charset_set]]
 ==== Définir le jeu de caractère
@@ -2061,12 +2061,12 @@ Sections :
 
 Options :
 
-include::autogen/user/exec_options.asciidoc[]
+include::autogen/user/exec_options.adoc[]
 
 [[exec_commands]]
 ==== Commandes
 
-include::autogen/user/exec_commands.asciidoc[]
+include::autogen/user/exec_commands.adoc[]
 
 [[fifo_plugin]]
 === Extension Fifo
@@ -2137,7 +2137,7 @@ $ ./auto_weechat_command 'irc.freenode.#weechat *bonjour'
 [[fifo_commands]]
 ==== Commandes
 
-include::autogen/user/fifo_commands.asciidoc[]
+include::autogen/user/fifo_commands.adoc[]
 
 [[irc_plugin]]
 === Extension IRC
@@ -2186,12 +2186,12 @@ Sections :
 
 Options :
 
-include::autogen/user/irc_options.asciidoc[]
+include::autogen/user/irc_options.adoc[]
 
 [[irc_commands]]
 ==== Commandes
 
-include::autogen/user/irc_commands.asciidoc[]
+include::autogen/user/irc_commands.adoc[]
 
 [[irc_ssl_certificates]]
 ==== Certificats SSL
@@ -2650,12 +2650,12 @@ Sections :
 
 Options :
 
-include::autogen/user/logger_options.asciidoc[]
+include::autogen/user/logger_options.adoc[]
 
 [[logger_commands]]
 ==== Commandes
 
-include::autogen/user/logger_commands.asciidoc[]
+include::autogen/user/logger_commands.adoc[]
 
 [[logger_log_levels]]
 ==== Niveaux d'enregistrement
@@ -2808,12 +2808,12 @@ Sections :
 
 Options :
 
-include::autogen/user/relay_options.asciidoc[]
+include::autogen/user/relay_options.adoc[]
 
 [[relay_commands]]
 ==== Commandes
 
-include::autogen/user/relay_commands.asciidoc[]
+include::autogen/user/relay_commands.adoc[]
 
 [[relay_password]]
 ==== Mot de passe
@@ -2960,47 +2960,47 @@ Sections :
 
 Options :
 
-include::autogen/user/script_options.asciidoc[]
+include::autogen/user/script_options.adoc[]
 
 [[script_commands]]
 ==== Commandes Script
 
-include::autogen/user/script_commands.asciidoc[]
+include::autogen/user/script_commands.adoc[]
 
 [[python_commands]]
 ==== Commandes Python
 
-include::autogen/user/python_commands.asciidoc[]
+include::autogen/user/python_commands.adoc[]
 
 [[perl_commands]]
 ==== Commandes Perl
 
-include::autogen/user/perl_commands.asciidoc[]
+include::autogen/user/perl_commands.adoc[]
 
 [[ruby_commands]]
 ==== Commandes Ruby
 
-include::autogen/user/ruby_commands.asciidoc[]
+include::autogen/user/ruby_commands.adoc[]
 
 [[lua_commands]]
 ==== Commandes Lua
 
-include::autogen/user/lua_commands.asciidoc[]
+include::autogen/user/lua_commands.adoc[]
 
 [[tcl_commands]]
 ==== Commandes Tcl
 
-include::autogen/user/tcl_commands.asciidoc[]
+include::autogen/user/tcl_commands.adoc[]
 
 [[guile_commands]]
 ==== Commandes Guile
 
-include::autogen/user/guile_commands.asciidoc[]
+include::autogen/user/guile_commands.adoc[]
 
 [[javascript_commands]]
 ==== Commandes Javascript
 
-include::autogen/user/javascript_commands.asciidoc[]
+include::autogen/user/javascript_commands.adoc[]
 
 [[trigger_plugin]]
 === Extension Trigger
@@ -3031,12 +3031,12 @@ Sections :
 
 Options :
 
-include::autogen/user/trigger_options.asciidoc[]
+include::autogen/user/trigger_options.adoc[]
 
 [[trigger_commands]]
 ==== Commandes
 
-include::autogen/user/trigger_commands.asciidoc[]
+include::autogen/user/trigger_commands.adoc[]
 
 [[trigger_anatomy]]
 ==== Anatomie d'un trigger
@@ -3571,12 +3571,12 @@ Sections :
 
 Options :
 
-include::autogen/user/xfer_options.asciidoc[]
+include::autogen/user/xfer_options.adoc[]
 
 [[xfer_commands]]
 ==== Commandes
 
-include::autogen/user/xfer_commands.asciidoc[]
+include::autogen/user/xfer_commands.adoc[]
 
 [[support]]
 == Support
diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt
index dfbf64128..e56efe520 100644
--- a/doc/it/CMakeLists.txt
+++ b/doc/it/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (it)"
   )
@@ -37,12 +37,12 @@ if(ENABLE_DOC)
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.it.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.it.html"
   )
@@ -52,11 +52,11 @@ if(ENABLE_DOC)
   # plugin API reference
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.it.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.it.html"
   )
@@ -66,10 +66,10 @@ if(ENABLE_DOC)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.it.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.it.html"
   )
@@ -79,10 +79,10 @@ if(ENABLE_DOC)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.it.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.it.html"
   )
@@ -92,10 +92,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.it.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.it.html"
   )
@@ -105,10 +105,10 @@ if(ENABLE_DOC)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.it.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.it.html"
   )
diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am
index fc732c0a0..28ce332b2 100644
--- a/doc/it/Makefile.am
+++ b/doc/it/Makefile.am
@@ -20,16 +20,16 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.it.asciidoc \
-             cmdline_options.it.asciidoc \
-             weechat_user.it.asciidoc \
-             weechat_plugin_api.it.asciidoc \
-             weechat_scripting.it.asciidoc \
-             weechat_faq.it.asciidoc \
-             weechat_quickstart.it.asciidoc \
-             weechat_tester.it.asciidoc \
-             $(wildcard autogen/user/*.asciidoc) \
-             $(wildcard autogen/plugin_api/*.asciidoc)
+             weechat.1.it.adoc \
+             cmdline_options.it.adoc \
+             weechat_user.it.adoc \
+             weechat_plugin_api.it.adoc \
+             weechat_scripting.it.adoc \
+             weechat_faq.it.adoc \
+             weechat_quickstart.it.adoc \
+             weechat_tester.it.adoc \
+             $(wildcard autogen/user/*.adoc) \
+             $(wildcard autogen/plugin_api/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -49,32 +49,32 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.it.asciidoc cmdline_options.it.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/it/weechat.1.it.asciidoc
+weechat.1: weechat.1.it.adoc cmdline_options.it.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/it/weechat.1.it.adoc
 
 # user's guide
-weechat_user.it.html: weechat_user.it.asciidoc cmdline_options.it.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.it.html $(abs_top_srcdir)/doc/it/weechat_user.it.asciidoc
+weechat_user.it.html: weechat_user.it.adoc cmdline_options.it.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.it.html $(abs_top_srcdir)/doc/it/weechat_user.it.adoc
 
 # plugin API reference
-weechat_plugin_api.it.html: weechat_plugin_api.it.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.it.html $(abs_top_srcdir)/doc/it/weechat_plugin_api.it.asciidoc
+weechat_plugin_api.it.html: weechat_plugin_api.it.adoc $(wildcard autogen/plugin_api/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.it.html $(abs_top_srcdir)/doc/it/weechat_plugin_api.it.adoc
 
 # scripting guide
-weechat_scripting.it.html: weechat_scripting.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.it.html $(abs_top_srcdir)/doc/it/weechat_scripting.it.asciidoc
+weechat_scripting.it.html: weechat_scripting.it.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.it.html $(abs_top_srcdir)/doc/it/weechat_scripting.it.adoc
 
 # FAQ
-weechat_faq.it.html: weechat_faq.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.it.html $(abs_top_srcdir)/doc/it/weechat_faq.it.asciidoc
+weechat_faq.it.html: weechat_faq.it.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.it.html $(abs_top_srcdir)/doc/it/weechat_faq.it.adoc
 
 # quickstart
-weechat_quickstart.it.html: weechat_quickstart.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.it.html $(abs_top_srcdir)/doc/it/weechat_quickstart.it.asciidoc
+weechat_quickstart.it.html: weechat_quickstart.it.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.it.html $(abs_top_srcdir)/doc/it/weechat_quickstart.it.adoc
 
 # tester's guide
-weechat_tester.it.html: weechat_tester.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.it.html $(abs_top_srcdir)/doc/it/weechat_tester.it.asciidoc
+weechat_tester.it.html: weechat_tester.it.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.it.html $(abs_top_srcdir)/doc/it/weechat_tester.it.adoc
 
 # install man/docs
 
diff --git a/doc/it/autogen/plugin_api/completions.asciidoc b/doc/it/autogen/plugin_api/completions.adoc
index 7aaf70f66..7aaf70f66 100644
--- a/doc/it/autogen/plugin_api/completions.asciidoc
+++ b/doc/it/autogen/plugin_api/completions.adoc
diff --git a/doc/it/autogen/plugin_api/hdata.asciidoc b/doc/it/autogen/plugin_api/hdata.adoc
index 9a934c639..9a934c639 100644
--- a/doc/it/autogen/plugin_api/hdata.asciidoc
+++ b/doc/it/autogen/plugin_api/hdata.adoc
diff --git a/doc/it/autogen/plugin_api/infolists.asciidoc b/doc/it/autogen/plugin_api/infolists.adoc
index 9fb925e3b..9fb925e3b 100644
--- a/doc/it/autogen/plugin_api/infolists.asciidoc
+++ b/doc/it/autogen/plugin_api/infolists.adoc
diff --git a/doc/it/autogen/plugin_api/infos.asciidoc b/doc/it/autogen/plugin_api/infos.adoc
index dcb2c139b..dcb2c139b 100644
--- a/doc/it/autogen/plugin_api/infos.asciidoc
+++ b/doc/it/autogen/plugin_api/infos.adoc
diff --git a/doc/it/autogen/plugin_api/infos_hashtable.asciidoc b/doc/it/autogen/plugin_api/infos_hashtable.adoc
index 430d0aebc..430d0aebc 100644
--- a/doc/it/autogen/plugin_api/infos_hashtable.asciidoc
+++ b/doc/it/autogen/plugin_api/infos_hashtable.adoc
diff --git a/doc/it/autogen/plugin_api/plugins_priority.asciidoc b/doc/it/autogen/plugin_api/plugins_priority.adoc
index 3caae876d..3caae876d 100644
--- a/doc/it/autogen/plugin_api/plugins_priority.asciidoc
+++ b/doc/it/autogen/plugin_api/plugins_priority.adoc
diff --git a/doc/it/autogen/plugin_api/url_options.asciidoc b/doc/it/autogen/plugin_api/url_options.adoc
index a109a4b71..a109a4b71 100644
--- a/doc/it/autogen/plugin_api/url_options.asciidoc
+++ b/doc/it/autogen/plugin_api/url_options.adoc
diff --git a/doc/it/autogen/user/alias_commands.asciidoc b/doc/it/autogen/user/alias_commands.adoc
index 2e723c832..2e723c832 100644
--- a/doc/it/autogen/user/alias_commands.asciidoc
+++ b/doc/it/autogen/user/alias_commands.adoc
diff --git a/doc/it/autogen/user/aspell_commands.asciidoc b/doc/it/autogen/user/aspell_commands.adoc
index 4e897f82c..4e897f82c 100644
--- a/doc/it/autogen/user/aspell_commands.asciidoc
+++ b/doc/it/autogen/user/aspell_commands.adoc
diff --git a/doc/it/autogen/user/aspell_options.asciidoc b/doc/it/autogen/user/aspell_options.adoc
index 75ded6631..75ded6631 100644
--- a/doc/it/autogen/user/aspell_options.asciidoc
+++ b/doc/it/autogen/user/aspell_options.adoc
diff --git a/doc/it/autogen/user/charset_commands.asciidoc b/doc/it/autogen/user/charset_commands.adoc
index 627de9931..627de9931 100644
--- a/doc/it/autogen/user/charset_commands.asciidoc
+++ b/doc/it/autogen/user/charset_commands.adoc
diff --git a/doc/it/autogen/user/charset_options.asciidoc b/doc/it/autogen/user/charset_options.adoc
index 376be0e45..376be0e45 100644
--- a/doc/it/autogen/user/charset_options.asciidoc
+++ b/doc/it/autogen/user/charset_options.adoc
diff --git a/doc/it/autogen/user/exec_commands.asciidoc b/doc/it/autogen/user/exec_commands.adoc
index 58379f69c..58379f69c 100644
--- a/doc/it/autogen/user/exec_commands.asciidoc
+++ b/doc/it/autogen/user/exec_commands.adoc
diff --git a/doc/it/autogen/user/exec_options.asciidoc b/doc/it/autogen/user/exec_options.adoc
index 0a9c028ee..0a9c028ee 100644
--- a/doc/it/autogen/user/exec_options.asciidoc
+++ b/doc/it/autogen/user/exec_options.adoc
diff --git a/doc/it/autogen/user/fifo_commands.asciidoc b/doc/it/autogen/user/fifo_commands.adoc
index f0835cdba..f0835cdba 100644
--- a/doc/it/autogen/user/fifo_commands.asciidoc
+++ b/doc/it/autogen/user/fifo_commands.adoc
diff --git a/doc/it/autogen/user/guile_commands.asciidoc b/doc/it/autogen/user/guile_commands.adoc
index cdc72e552..cdc72e552 100644
--- a/doc/it/autogen/user/guile_commands.asciidoc
+++ b/doc/it/autogen/user/guile_commands.adoc
diff --git a/doc/it/autogen/user/irc_colors.asciidoc b/doc/it/autogen/user/irc_colors.adoc
index b09a4758d..b09a4758d 100644
--- a/doc/it/autogen/user/irc_colors.asciidoc
+++ b/doc/it/autogen/user/irc_colors.adoc
diff --git a/doc/it/autogen/user/irc_commands.asciidoc b/doc/it/autogen/user/irc_commands.adoc
index 6c28d5474..6c28d5474 100644
--- a/doc/it/autogen/user/irc_commands.asciidoc
+++ b/doc/it/autogen/user/irc_commands.adoc
diff --git a/doc/it/autogen/user/irc_options.asciidoc b/doc/it/autogen/user/irc_options.adoc
index 92ced6650..92ced6650 100644
--- a/doc/it/autogen/user/irc_options.asciidoc
+++ b/doc/it/autogen/user/irc_options.adoc
diff --git a/doc/it/autogen/user/javascript_commands.asciidoc b/doc/it/autogen/user/javascript_commands.adoc
index 8d0f9c584..8d0f9c584 100644
--- a/doc/it/autogen/user/javascript_commands.asciidoc
+++ b/doc/it/autogen/user/javascript_commands.adoc
diff --git a/doc/it/autogen/user/logger_commands.asciidoc b/doc/it/autogen/user/logger_commands.adoc
index b6f21642c..b6f21642c 100644
--- a/doc/it/autogen/user/logger_commands.asciidoc
+++ b/doc/it/autogen/user/logger_commands.adoc
diff --git a/doc/it/autogen/user/logger_options.asciidoc b/doc/it/autogen/user/logger_options.adoc
index 2a97b1d98..2a97b1d98 100644
--- a/doc/it/autogen/user/logger_options.asciidoc
+++ b/doc/it/autogen/user/logger_options.adoc
diff --git a/doc/it/autogen/user/lua_commands.asciidoc b/doc/it/autogen/user/lua_commands.adoc
index 9ea96f1df..9ea96f1df 100644
--- a/doc/it/autogen/user/lua_commands.asciidoc
+++ b/doc/it/autogen/user/lua_commands.adoc
diff --git a/doc/it/autogen/user/perl_commands.asciidoc b/doc/it/autogen/user/perl_commands.adoc
index bbba1f997..bbba1f997 100644
--- a/doc/it/autogen/user/perl_commands.asciidoc
+++ b/doc/it/autogen/user/perl_commands.adoc
diff --git a/doc/it/autogen/user/python_commands.asciidoc b/doc/it/autogen/user/python_commands.adoc
index 07c53d1c8..07c53d1c8 100644
--- a/doc/it/autogen/user/python_commands.asciidoc
+++ b/doc/it/autogen/user/python_commands.adoc
diff --git a/doc/it/autogen/user/relay_commands.asciidoc b/doc/it/autogen/user/relay_commands.adoc
index d092a4ab6..d092a4ab6 100644
--- a/doc/it/autogen/user/relay_commands.asciidoc
+++ b/doc/it/autogen/user/relay_commands.adoc
diff --git a/doc/it/autogen/user/relay_options.asciidoc b/doc/it/autogen/user/relay_options.adoc
index bad609372..bad609372 100644
--- a/doc/it/autogen/user/relay_options.asciidoc
+++ b/doc/it/autogen/user/relay_options.adoc
diff --git a/doc/it/autogen/user/ruby_commands.asciidoc b/doc/it/autogen/user/ruby_commands.adoc
index afff80c14..afff80c14 100644
--- a/doc/it/autogen/user/ruby_commands.asciidoc
+++ b/doc/it/autogen/user/ruby_commands.adoc
diff --git a/doc/it/autogen/user/script_commands.asciidoc b/doc/it/autogen/user/script_commands.adoc
index 9ec179c32..9ec179c32 100644
--- a/doc/it/autogen/user/script_commands.asciidoc
+++ b/doc/it/autogen/user/script_commands.adoc
diff --git a/doc/it/autogen/user/script_options.asciidoc b/doc/it/autogen/user/script_options.adoc
index 91b437ce0..91b437ce0 100644
--- a/doc/it/autogen/user/script_options.asciidoc
+++ b/doc/it/autogen/user/script_options.adoc
diff --git a/doc/it/autogen/user/sec_options.asciidoc b/doc/it/autogen/user/sec_options.adoc
index cf6266122..cf6266122 100644
--- a/doc/it/autogen/user/sec_options.asciidoc
+++ b/doc/it/autogen/user/sec_options.adoc
diff --git a/doc/it/autogen/user/tcl_commands.asciidoc b/doc/it/autogen/user/tcl_commands.adoc
index 7a1b15170..7a1b15170 100644
--- a/doc/it/autogen/user/tcl_commands.asciidoc
+++ b/doc/it/autogen/user/tcl_commands.adoc
diff --git a/doc/it/autogen/user/trigger_commands.asciidoc b/doc/it/autogen/user/trigger_commands.adoc
index 605490abe..605490abe 100644
--- a/doc/it/autogen/user/trigger_commands.asciidoc
+++ b/doc/it/autogen/user/trigger_commands.adoc
diff --git a/doc/it/autogen/user/trigger_options.asciidoc b/doc/it/autogen/user/trigger_options.adoc
index 732ce6e2c..732ce6e2c 100644
--- a/doc/it/autogen/user/trigger_options.asciidoc
+++ b/doc/it/autogen/user/trigger_options.adoc
diff --git a/doc/it/autogen/user/weechat_commands.asciidoc b/doc/it/autogen/user/weechat_commands.adoc
index c2cfb067a..c2cfb067a 100644
--- a/doc/it/autogen/user/weechat_commands.asciidoc
+++ b/doc/it/autogen/user/weechat_commands.adoc
diff --git a/doc/it/autogen/user/weechat_options.asciidoc b/doc/it/autogen/user/weechat_options.adoc
index 010fc7e24..010fc7e24 100644
--- a/doc/it/autogen/user/weechat_options.asciidoc
+++ b/doc/it/autogen/user/weechat_options.adoc
diff --git a/doc/it/autogen/user/xfer_commands.asciidoc b/doc/it/autogen/user/xfer_commands.adoc
index 8b7697c23..8b7697c23 100644
--- a/doc/it/autogen/user/xfer_commands.asciidoc
+++ b/doc/it/autogen/user/xfer_commands.adoc
diff --git a/doc/it/autogen/user/xfer_options.asciidoc b/doc/it/autogen/user/xfer_options.adoc
index 6c2e5562d..6c2e5562d 100644
--- a/doc/it/autogen/user/xfer_options.asciidoc
+++ b/doc/it/autogen/user/xfer_options.adoc
diff --git a/doc/it/cmdline_options.it.asciidoc b/doc/it/cmdline_options.it.adoc
index d3d682d92..d3d682d92 100644
--- a/doc/it/cmdline_options.it.asciidoc
+++ b/doc/it/cmdline_options.it.adoc
diff --git a/doc/it/weechat.1.it.asciidoc b/doc/it/weechat.1.it.adoc
index a4c067b53..0d2212f04 100644
--- a/doc/it/weechat.1.it.asciidoc
+++ b/doc/it/weechat.1.it.adoc
@@ -30,7 +30,7 @@ It is highly customizable and extensible with scripts.
 
 == OPTIONS
 
-include::cmdline_options.it.asciidoc[]
+include::cmdline_options.it.adoc[]
 
 == PLUGIN OPTIONS
 
@@ -105,7 +105,7 @@ This manpage was written by {author}.
 == COPYRIGHT
 
 WeeChat is written by Sébastien Helleu and contributors (complete list is in
-the AUTHORS.asciidoc file).
+the AUTHORS.adoc file).
 
 Copyright (C) 2003-2016 {author}
 
diff --git a/doc/it/weechat_faq.it.asciidoc b/doc/it/weechat_faq.it.adoc
index ded1e568c..ded1e568c 100644
--- a/doc/it/weechat_faq.it.asciidoc
+++ b/doc/it/weechat_faq.it.adoc
diff --git a/doc/it/weechat_plugin_api.it.asciidoc b/doc/it/weechat_plugin_api.it.adoc
index 2946b3a1b..91b94565c 100644
--- a/doc/it/weechat_plugin_api.it.asciidoc
+++ b/doc/it/weechat_plugin_api.it.adoc
@@ -119,7 +119,7 @@ default plugins).
 
 The default WeeChat plugins are initialized in this order:
 
-include::autogen/plugin_api/plugins_priority.asciidoc[]
+include::autogen/plugin_api/plugins_priority.adoc[]
 
 ==== weechat_plugin_end
 
@@ -7360,7 +7360,7 @@ Argomenti:
 
 I codici predefiniti per il completamento sono:
 
-include::autogen/plugin_api/completions.asciidoc[]
+include::autogen/plugin_api/completions.adoc[]
 
 Codici speciali:
 
@@ -7998,7 +7998,7 @@ available:
 Per il comando "url:..." sono disponibili le seguenti opzioni (consultare
 `man curl_easy_setopt` per la descrizione di ogni opzione):
 
-include::autogen/plugin_api/url_options.asciidoc[]
+include::autogen/plugin_api/url_options.adoc[]
 
 [NOTE]
 ^(1)^ Quando sono disponibili le costanti, esse vanno usate come valore per
@@ -13770,7 +13770,7 @@ Valore restituito:
 // TRANSLATION MISSING
 Infos:
 
-include::autogen/plugin_api/infos.asciidoc[]
+include::autogen/plugin_api/infos.adoc[]
 
 Esempio in C:
 
@@ -13824,7 +13824,7 @@ Valore restituito:
 // TRANSLATION MISSING
 Infos:
 
-include::autogen/plugin_api/infos_hashtable.asciidoc[]
+include::autogen/plugin_api/infos_hashtable.adoc[]
 
 Esempio in C:
 
@@ -14223,7 +14223,7 @@ Valore restituito:
 // TRANSLATION MISSING
 Infolists:
 
-include::autogen/plugin_api/infolists.asciidoc[]
+include::autogen/plugin_api/infolists.adoc[]
 
 Esempio in C:
 
@@ -14966,7 +14966,7 @@ Valore restituito:
 // TRANSLATION MISSING
 List of hdata:
 
-include::autogen/plugin_api/hdata.asciidoc[]
+include::autogen/plugin_api/hdata.adoc[]
 
 Esempio in C:
 
diff --git a/doc/it/weechat_quickstart.it.asciidoc b/doc/it/weechat_quickstart.it.adoc
index 030d4f185..030d4f185 100644
--- a/doc/it/weechat_quickstart.it.asciidoc
+++ b/doc/it/weechat_quickstart.it.adoc
diff --git a/doc/it/weechat_scripting.it.asciidoc b/doc/it/weechat_scripting.it.adoc
index 29e1ae35c..29e1ae35c 100644
--- a/doc/it/weechat_scripting.it.asciidoc
+++ b/doc/it/weechat_scripting.it.adoc
diff --git a/doc/it/weechat_tester.it.asciidoc b/doc/it/weechat_tester.it.adoc
index 423951688..423951688 100644
--- a/doc/it/weechat_tester.it.asciidoc
+++ b/doc/it/weechat_tester.it.adoc
diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.adoc
index 08ea8ed41..2a7580262 100644
--- a/doc/it/weechat_user.it.asciidoc
+++ b/doc/it/weechat_user.it.adoc
@@ -485,7 +485,7 @@ Poi, come per un crash, usare il comando `bt full`:
 
 Argomenti a riga di comando:
 
-include::cmdline_options.it.asciidoc[]
+include::cmdline_options.it.adoc[]
 
 Per avviare WeeChat, digitare questo comando:
 
@@ -1490,7 +1490,7 @@ terminare l'attributo.
 
 I codici colore per kbd:[Ctrl+c], kbd:[c] sono:
 
-include::autogen/user/irc_colors.asciidoc[]
+include::autogen/user/irc_colors.adoc[]
 
 // TRANSLATION MISSING
 [NOTE]
@@ -1765,7 +1765,7 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/sec_options.asciidoc[]
+include::autogen/user/sec_options.adoc[]
 
 [[weechat_options]]
 ==== Opzioni di WeeChat (weechat.conf)
@@ -1803,12 +1803,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/weechat_options.asciidoc[]
+include::autogen/user/weechat_options.adoc[]
 
 [[weechat_commands]]
 ==== Comandi di WeeChat
 
-include::autogen/user/weechat_commands.asciidoc[]
+include::autogen/user/weechat_commands.adoc[]
 
 [[plugins]]
 == Plugin
@@ -1878,7 +1878,7 @@ plugin).
 [[alias_commands]]
 ==== Comandi
 
-include::autogen/user/alias_commands.asciidoc[]
+include::autogen/user/alias_commands.adoc[]
 
 [[aspell_plugin]]
 === Plugin Aspell
@@ -1906,12 +1906,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/aspell_options.asciidoc[]
+include::autogen/user/aspell_options.adoc[]
 
 [[aspell_commands]]
 ==== Comandi
 
-include::autogen/user/aspell_commands.asciidoc[]
+include::autogen/user/aspell_commands.adoc[]
 
 [[aspell_speller_options]]
 ==== Opzioni ortografiche
@@ -2016,12 +2016,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/charset_options.asciidoc[]
+include::autogen/user/charset_options.adoc[]
 
 [[charset_commands]]
 ==== Comandi
 
-include::autogen/user/charset_commands.asciidoc[]
+include::autogen/user/charset_commands.adoc[]
 
 [[charset_set]]
 ==== Impostare il set caratteri
@@ -2104,12 +2104,12 @@ Sections:
 
 Options:
 
-include::autogen/user/exec_options.asciidoc[]
+include::autogen/user/exec_options.adoc[]
 
 [[exec_commands]]
 ==== Commands
 
-include::autogen/user/exec_commands.asciidoc[]
+include::autogen/user/exec_commands.adoc[]
 
 [[fifo_plugin]]
 === Plugin Fifo
@@ -2178,7 +2178,7 @@ $ ./auto_weechat_command 'irc.freenode.#weechat *ciao'
 [[fifo_commands]]
 ==== Comandi
 
-include::autogen/user/fifo_commands.asciidoc[]
+include::autogen/user/fifo_commands.adoc[]
 
 [[irc_plugin]]
 === Plugin IRC
@@ -2228,12 +2228,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/irc_options.asciidoc[]
+include::autogen/user/irc_options.adoc[]
 
 [[irc_commands]]
 ==== Comandi
 
-include::autogen/user/irc_commands.asciidoc[]
+include::autogen/user/irc_commands.adoc[]
 
 [[irc_ssl_certificates]]
 ==== Certificati SSL
@@ -2718,12 +2718,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/logger_options.asciidoc[]
+include::autogen/user/logger_options.adoc[]
 
 [[logger_commands]]
 ==== Comandi
 
-include::autogen/user/logger_commands.asciidoc[]
+include::autogen/user/logger_commands.adoc[]
 
 [[logger_log_levels]]
 ==== Livelli di log
@@ -2879,12 +2879,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/relay_options.asciidoc[]
+include::autogen/user/relay_options.adoc[]
 
 [[relay_commands]]
 ==== Comandi
 
-include::autogen/user/relay_commands.asciidoc[]
+include::autogen/user/relay_commands.adoc[]
 
 // TRANSLATION MISSING
 [[relay_password]]
@@ -3033,47 +3033,47 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/script_options.asciidoc[]
+include::autogen/user/script_options.adoc[]
 
 [[script_commands]]
 ==== Comandi Script
 
-include::autogen/user/script_commands.asciidoc[]
+include::autogen/user/script_commands.adoc[]
 
 [[python_commands]]
 ==== Comandi Python
 
-include::autogen/user/python_commands.asciidoc[]
+include::autogen/user/python_commands.adoc[]
 
 [[perl_commands]]
 ==== Comandi Perl
 
-include::autogen/user/perl_commands.asciidoc[]
+include::autogen/user/perl_commands.adoc[]
 
 [[ruby_commands]]
 ==== Comandi Ruby
 
-include::autogen/user/ruby_commands.asciidoc[]
+include::autogen/user/ruby_commands.adoc[]
 
 [[lua_commands]]
 ==== Comandi Lua
 
-include::autogen/user/lua_commands.asciidoc[]
+include::autogen/user/lua_commands.adoc[]
 
 [[tcl_commands]]
 ==== Comandi Tcl
 
-include::autogen/user/tcl_commands.asciidoc[]
+include::autogen/user/tcl_commands.adoc[]
 
 [[guile_commands]]
 ==== Comandi Guile
 
-include::autogen/user/guile_commands.asciidoc[]
+include::autogen/user/guile_commands.adoc[]
 
 [[javascript_commands]]
 ==== Comandi Javascript
 
-include::autogen/user/javascript_commands.asciidoc[]
+include::autogen/user/javascript_commands.adoc[]
 
 // TRANSLATION MISSING
 [[trigger_plugin]]
@@ -3105,12 +3105,12 @@ Sections:
 
 Options:
 
-include::autogen/user/trigger_options.asciidoc[]
+include::autogen/user/trigger_options.adoc[]
 
 [[trigger_commands]]
 ==== Commands
 
-include::autogen/user/trigger_commands.asciidoc[]
+include::autogen/user/trigger_commands.adoc[]
 
 [[trigger_anatomy]]
 ==== Anatomy of a trigger
@@ -3638,12 +3638,12 @@ Sections:
 // TRANSLATION MISSING
 Options:
 
-include::autogen/user/xfer_options.asciidoc[]
+include::autogen/user/xfer_options.adoc[]
 
 [[xfer_commands]]
 ==== Comandi
 
-include::autogen/user/xfer_commands.asciidoc[]
+include::autogen/user/xfer_commands.adoc[]
 
 [[support]]
 == Supporto
diff --git a/doc/ja/CMakeLists.txt b/doc/ja/CMakeLists.txt
index 65371868f..631efd472 100644
--- a/doc/ja/CMakeLists.txt
+++ b/doc/ja/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (ja)"
   )
@@ -37,12 +37,12 @@ if(ENABLE_DOC)
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.ja.html"
   )
@@ -52,11 +52,11 @@ if(ENABLE_DOC)
   # plugin API reference
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_plugin_api.ja.html"
   )
@@ -66,10 +66,10 @@ if(ENABLE_DOC)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.ja.html"
   )
@@ -79,10 +79,10 @@ if(ENABLE_DOC)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.ja.html"
   )
@@ -92,10 +92,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.ja.html"
   )
@@ -105,10 +105,10 @@ if(ENABLE_DOC)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.ja.html"
   )
@@ -118,10 +118,10 @@ if(ENABLE_DOC)
   # relay protocol
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_relay_protocol.ja.html"
   )
@@ -131,10 +131,10 @@ if(ENABLE_DOC)
   # developer's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.ja.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_dev.ja.html"
   )
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
index 8a46c9a6f..f058fd17a 100644
--- a/doc/ja/Makefile.am
+++ b/doc/ja/Makefile.am
@@ -20,18 +20,18 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.ja.asciidoc \
-             cmdline_options.ja.asciidoc \
-             weechat_user.ja.asciidoc \
-             weechat_plugin_api.ja.asciidoc \
-             weechat_scripting.ja.asciidoc \
-             weechat_faq.ja.asciidoc \
-             weechat_quickstart.ja.asciidoc \
-             weechat_tester.ja.asciidoc \
-             weechat_relay_protocol.ja.asciidoc \
-             weechat_dev.ja.asciidoc \
-             $(wildcard autogen/user/*.asciidoc) \
-             $(wildcard autogen/plugin_api/*.asciidoc)
+             weechat.1.ja.adoc \
+             cmdline_options.ja.adoc \
+             weechat_user.ja.adoc \
+             weechat_plugin_api.ja.adoc \
+             weechat_scripting.ja.adoc \
+             weechat_faq.ja.adoc \
+             weechat_quickstart.ja.adoc \
+             weechat_tester.ja.adoc \
+             weechat_relay_protocol.ja.adoc \
+             weechat_dev.ja.adoc \
+             $(wildcard autogen/user/*.adoc) \
+             $(wildcard autogen/plugin_api/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -53,40 +53,40 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.ja.asciidoc cmdline_options.ja.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ja/weechat.1.ja.asciidoc
+weechat.1: weechat.1.ja.adoc cmdline_options.ja.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ja/weechat.1.ja.adoc
 
 # user's guide
-weechat_user.ja.html: weechat_user.ja.asciidoc cmdline_options.ja.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.ja.html $(abs_top_srcdir)/doc/ja/weechat_user.ja.asciidoc
+weechat_user.ja.html: weechat_user.ja.adoc cmdline_options.ja.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.ja.html $(abs_top_srcdir)/doc/ja/weechat_user.ja.adoc
 
 # plugin API reference
-weechat_plugin_api.ja.html: weechat_plugin_api.ja.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.ja.html $(abs_top_srcdir)/doc/ja/weechat_plugin_api.ja.asciidoc
+weechat_plugin_api.ja.html: weechat_plugin_api.ja.adoc $(wildcard autogen/plugin_api/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.ja.html $(abs_top_srcdir)/doc/ja/weechat_plugin_api.ja.adoc
 
 # scripting guide
-weechat_scripting.ja.html: weechat_scripting.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.ja.html $(abs_top_srcdir)/doc/ja/weechat_scripting.ja.asciidoc
+weechat_scripting.ja.html: weechat_scripting.ja.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.ja.html $(abs_top_srcdir)/doc/ja/weechat_scripting.ja.adoc
 
 # FAQ
-weechat_faq.ja.html: weechat_faq.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.ja.html $(abs_top_srcdir)/doc/ja/weechat_faq.ja.asciidoc
+weechat_faq.ja.html: weechat_faq.ja.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.ja.html $(abs_top_srcdir)/doc/ja/weechat_faq.ja.adoc
 
 # quickstart
-weechat_quickstart.ja.html: weechat_quickstart.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.ja.html $(abs_top_srcdir)/doc/ja/weechat_quickstart.ja.asciidoc
+weechat_quickstart.ja.html: weechat_quickstart.ja.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.ja.html $(abs_top_srcdir)/doc/ja/weechat_quickstart.ja.adoc
 
 # tester's guide
-weechat_tester.ja.html: weechat_tester.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.ja.html $(abs_top_srcdir)/doc/ja/weechat_tester.ja.asciidoc
+weechat_tester.ja.html: weechat_tester.ja.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.ja.html $(abs_top_srcdir)/doc/ja/weechat_tester.ja.adoc
 
 # relay protocol
-weechat_relay_protocol.ja.html: weechat_relay_protocol.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.ja.html $(abs_top_srcdir)/doc/ja/weechat_relay_protocol.ja.asciidoc
+weechat_relay_protocol.ja.html: weechat_relay_protocol.ja.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.ja.html $(abs_top_srcdir)/doc/ja/weechat_relay_protocol.ja.adoc
 
 # developer's guide
-weechat_dev.ja.html: weechat_dev.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.ja.html $(abs_top_srcdir)/doc/ja/weechat_dev.ja.asciidoc
+weechat_dev.ja.html: weechat_dev.ja.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.ja.html $(abs_top_srcdir)/doc/ja/weechat_dev.ja.adoc
 
 # install man/docs
 
diff --git a/doc/ja/autogen/plugin_api/completions.asciidoc b/doc/ja/autogen/plugin_api/completions.adoc
index 0abdf1da5..0abdf1da5 100644
--- a/doc/ja/autogen/plugin_api/completions.asciidoc
+++ b/doc/ja/autogen/plugin_api/completions.adoc
diff --git a/doc/ja/autogen/plugin_api/hdata.asciidoc b/doc/ja/autogen/plugin_api/hdata.adoc
index 8e311ad06..8e311ad06 100644
--- a/doc/ja/autogen/plugin_api/hdata.asciidoc
+++ b/doc/ja/autogen/plugin_api/hdata.adoc
diff --git a/doc/ja/autogen/plugin_api/infolists.asciidoc b/doc/ja/autogen/plugin_api/infolists.adoc
index cfadf71f4..cfadf71f4 100644
--- a/doc/ja/autogen/plugin_api/infolists.asciidoc
+++ b/doc/ja/autogen/plugin_api/infolists.adoc
diff --git a/doc/ja/autogen/plugin_api/infos.asciidoc b/doc/ja/autogen/plugin_api/infos.adoc
index 1f5067955..1f5067955 100644
--- a/doc/ja/autogen/plugin_api/infos.asciidoc
+++ b/doc/ja/autogen/plugin_api/infos.adoc
diff --git a/doc/ja/autogen/plugin_api/infos_hashtable.asciidoc b/doc/ja/autogen/plugin_api/infos_hashtable.adoc
index 7cb8ec3ee..7cb8ec3ee 100644
--- a/doc/ja/autogen/plugin_api/infos_hashtable.asciidoc
+++ b/doc/ja/autogen/plugin_api/infos_hashtable.adoc
diff --git a/doc/ja/autogen/plugin_api/plugins_priority.asciidoc b/doc/ja/autogen/plugin_api/plugins_priority.adoc
index 3caae876d..3caae876d 100644
--- a/doc/ja/autogen/plugin_api/plugins_priority.asciidoc
+++ b/doc/ja/autogen/plugin_api/plugins_priority.adoc
diff --git a/doc/ja/autogen/plugin_api/url_options.asciidoc b/doc/ja/autogen/plugin_api/url_options.adoc
index 232cc1b81..232cc1b81 100644
--- a/doc/ja/autogen/plugin_api/url_options.asciidoc
+++ b/doc/ja/autogen/plugin_api/url_options.adoc
diff --git a/doc/ja/autogen/user/alias_commands.asciidoc b/doc/ja/autogen/user/alias_commands.adoc
index e604d2438..e604d2438 100644
--- a/doc/ja/autogen/user/alias_commands.asciidoc
+++ b/doc/ja/autogen/user/alias_commands.adoc
diff --git a/doc/ja/autogen/user/aspell_commands.asciidoc b/doc/ja/autogen/user/aspell_commands.adoc
index 00fda8804..00fda8804 100644
--- a/doc/ja/autogen/user/aspell_commands.asciidoc
+++ b/doc/ja/autogen/user/aspell_commands.adoc
diff --git a/doc/ja/autogen/user/aspell_options.asciidoc b/doc/ja/autogen/user/aspell_options.adoc
index 3a4412528..3a4412528 100644
--- a/doc/ja/autogen/user/aspell_options.asciidoc
+++ b/doc/ja/autogen/user/aspell_options.adoc
diff --git a/doc/ja/autogen/user/charset_commands.asciidoc b/doc/ja/autogen/user/charset_commands.adoc
index 335b49049..335b49049 100644
--- a/doc/ja/autogen/user/charset_commands.asciidoc
+++ b/doc/ja/autogen/user/charset_commands.adoc
diff --git a/doc/ja/autogen/user/charset_options.asciidoc b/doc/ja/autogen/user/charset_options.adoc
index a50865fd5..a50865fd5 100644
--- a/doc/ja/autogen/user/charset_options.asciidoc
+++ b/doc/ja/autogen/user/charset_options.adoc
diff --git a/doc/ja/autogen/user/exec_commands.asciidoc b/doc/ja/autogen/user/exec_commands.adoc
index a5015fa53..a5015fa53 100644
--- a/doc/ja/autogen/user/exec_commands.asciidoc
+++ b/doc/ja/autogen/user/exec_commands.adoc
diff --git a/doc/ja/autogen/user/exec_options.asciidoc b/doc/ja/autogen/user/exec_options.adoc
index f97d1ad92..f97d1ad92 100644
--- a/doc/ja/autogen/user/exec_options.asciidoc
+++ b/doc/ja/autogen/user/exec_options.adoc
diff --git a/doc/ja/autogen/user/fifo_commands.asciidoc b/doc/ja/autogen/user/fifo_commands.adoc
index 147c5f864..147c5f864 100644
--- a/doc/ja/autogen/user/fifo_commands.asciidoc
+++ b/doc/ja/autogen/user/fifo_commands.adoc
diff --git a/doc/ja/autogen/user/guile_commands.asciidoc b/doc/ja/autogen/user/guile_commands.adoc
index 7b63fc8b9..7b63fc8b9 100644
--- a/doc/ja/autogen/user/guile_commands.asciidoc
+++ b/doc/ja/autogen/user/guile_commands.adoc
diff --git a/doc/ja/autogen/user/irc_colors.asciidoc b/doc/ja/autogen/user/irc_colors.adoc
index fb2b85928..fb2b85928 100644
--- a/doc/ja/autogen/user/irc_colors.asciidoc
+++ b/doc/ja/autogen/user/irc_colors.adoc
diff --git a/doc/ja/autogen/user/irc_commands.asciidoc b/doc/ja/autogen/user/irc_commands.adoc
index c3bffed9d..c3bffed9d 100644
--- a/doc/ja/autogen/user/irc_commands.asciidoc
+++ b/doc/ja/autogen/user/irc_commands.adoc
diff --git a/doc/ja/autogen/user/irc_options.asciidoc b/doc/ja/autogen/user/irc_options.adoc
index b1997a8a8..b1997a8a8 100644
--- a/doc/ja/autogen/user/irc_options.asciidoc
+++ b/doc/ja/autogen/user/irc_options.adoc
diff --git a/doc/ja/autogen/user/javascript_commands.asciidoc b/doc/ja/autogen/user/javascript_commands.adoc
index a606a7e50..a606a7e50 100644
--- a/doc/ja/autogen/user/javascript_commands.asciidoc
+++ b/doc/ja/autogen/user/javascript_commands.adoc
diff --git a/doc/ja/autogen/user/logger_commands.asciidoc b/doc/ja/autogen/user/logger_commands.adoc
index 54d7d30a6..54d7d30a6 100644
--- a/doc/ja/autogen/user/logger_commands.asciidoc
+++ b/doc/ja/autogen/user/logger_commands.adoc
diff --git a/doc/ja/autogen/user/logger_options.asciidoc b/doc/ja/autogen/user/logger_options.adoc
index 04e7a7c45..04e7a7c45 100644
--- a/doc/ja/autogen/user/logger_options.asciidoc
+++ b/doc/ja/autogen/user/logger_options.adoc
diff --git a/doc/ja/autogen/user/lua_commands.asciidoc b/doc/ja/autogen/user/lua_commands.adoc
index eab4237d1..eab4237d1 100644
--- a/doc/ja/autogen/user/lua_commands.asciidoc
+++ b/doc/ja/autogen/user/lua_commands.adoc
diff --git a/doc/ja/autogen/user/perl_commands.asciidoc b/doc/ja/autogen/user/perl_commands.adoc
index 15c189ddf..15c189ddf 100644
--- a/doc/ja/autogen/user/perl_commands.asciidoc
+++ b/doc/ja/autogen/user/perl_commands.adoc
diff --git a/doc/ja/autogen/user/python_commands.asciidoc b/doc/ja/autogen/user/python_commands.adoc
index 7022dd329..7022dd329 100644
--- a/doc/ja/autogen/user/python_commands.asciidoc
+++ b/doc/ja/autogen/user/python_commands.adoc
diff --git a/doc/ja/autogen/user/relay_commands.asciidoc b/doc/ja/autogen/user/relay_commands.adoc
index 31b642315..31b642315 100644
--- a/doc/ja/autogen/user/relay_commands.asciidoc
+++ b/doc/ja/autogen/user/relay_commands.adoc
diff --git a/doc/ja/autogen/user/relay_options.asciidoc b/doc/ja/autogen/user/relay_options.adoc
index ff6369403..ff6369403 100644
--- a/doc/ja/autogen/user/relay_options.asciidoc
+++ b/doc/ja/autogen/user/relay_options.adoc
diff --git a/doc/ja/autogen/user/ruby_commands.asciidoc b/doc/ja/autogen/user/ruby_commands.adoc
index 3787e31bc..3787e31bc 100644
--- a/doc/ja/autogen/user/ruby_commands.asciidoc
+++ b/doc/ja/autogen/user/ruby_commands.adoc
diff --git a/doc/ja/autogen/user/script_commands.asciidoc b/doc/ja/autogen/user/script_commands.adoc
index eddba66f9..eddba66f9 100644
--- a/doc/ja/autogen/user/script_commands.asciidoc
+++ b/doc/ja/autogen/user/script_commands.adoc
diff --git a/doc/ja/autogen/user/script_options.asciidoc b/doc/ja/autogen/user/script_options.adoc
index 1e3e8096e..1e3e8096e 100644
--- a/doc/ja/autogen/user/script_options.asciidoc
+++ b/doc/ja/autogen/user/script_options.adoc
diff --git a/doc/ja/autogen/user/sec_options.asciidoc b/doc/ja/autogen/user/sec_options.adoc
index 8eb920865..8eb920865 100644
--- a/doc/ja/autogen/user/sec_options.asciidoc
+++ b/doc/ja/autogen/user/sec_options.adoc
diff --git a/doc/ja/autogen/user/tcl_commands.asciidoc b/doc/ja/autogen/user/tcl_commands.adoc
index 2c9d18469..2c9d18469 100644
--- a/doc/ja/autogen/user/tcl_commands.asciidoc
+++ b/doc/ja/autogen/user/tcl_commands.adoc
diff --git a/doc/ja/autogen/user/trigger_commands.asciidoc b/doc/ja/autogen/user/trigger_commands.adoc
index c13a210f7..c13a210f7 100644
--- a/doc/ja/autogen/user/trigger_commands.asciidoc
+++ b/doc/ja/autogen/user/trigger_commands.adoc
diff --git a/doc/ja/autogen/user/trigger_options.asciidoc b/doc/ja/autogen/user/trigger_options.adoc
index f684629d1..f684629d1 100644
--- a/doc/ja/autogen/user/trigger_options.asciidoc
+++ b/doc/ja/autogen/user/trigger_options.adoc
diff --git a/doc/ja/autogen/user/weechat_commands.asciidoc b/doc/ja/autogen/user/weechat_commands.adoc
index bbb0e843d..bbb0e843d 100644
--- a/doc/ja/autogen/user/weechat_commands.asciidoc
+++ b/doc/ja/autogen/user/weechat_commands.adoc
diff --git a/doc/ja/autogen/user/weechat_options.asciidoc b/doc/ja/autogen/user/weechat_options.adoc
index f52c24b5f..f52c24b5f 100644
--- a/doc/ja/autogen/user/weechat_options.asciidoc
+++ b/doc/ja/autogen/user/weechat_options.adoc
diff --git a/doc/ja/autogen/user/xfer_commands.asciidoc b/doc/ja/autogen/user/xfer_commands.adoc
index 056cdaa13..056cdaa13 100644
--- a/doc/ja/autogen/user/xfer_commands.asciidoc
+++ b/doc/ja/autogen/user/xfer_commands.adoc
diff --git a/doc/ja/autogen/user/xfer_options.asciidoc b/doc/ja/autogen/user/xfer_options.adoc
index 03b42df90..03b42df90 100644
--- a/doc/ja/autogen/user/xfer_options.asciidoc
+++ b/doc/ja/autogen/user/xfer_options.adoc
diff --git a/doc/ja/cmdline_options.ja.asciidoc b/doc/ja/cmdline_options.ja.adoc
index 4fc052b30..4fc052b30 100644
--- a/doc/ja/cmdline_options.ja.asciidoc
+++ b/doc/ja/cmdline_options.ja.adoc
diff --git a/doc/ja/weechat.1.ja.asciidoc b/doc/ja/weechat.1.ja.adoc
index b06bff969..b9cdb5a42 100644
--- a/doc/ja/weechat.1.ja.asciidoc
+++ b/doc/ja/weechat.1.ja.adoc
@@ -28,7 +28,7 @@ WeeChat (Wee Enhanced Environment for Chat) はフリーのチャットクライ
 
 == オプション
 
-include::cmdline_options.ja.asciidoc[]
+include::cmdline_options.ja.adoc[]
 
 == プラグインオプション
 
@@ -101,7 +101,7 @@ $HOME/.weechat/weechat.log::
 == 著作権
 
 WeeChat は Sébastien Helleu さんと貢献者によって作成されています
-(完全なリストは AUTHORS.asciidoc ファイルを参照してください)。
+(完全なリストは AUTHORS.adoc ファイルを参照してください)。
 
 著作権 (C) 2003-2016 {author}
 
diff --git a/doc/ja/weechat_dev.ja.asciidoc b/doc/ja/weechat_dev.ja.adoc
index 0efffad12..35dce7ed4 100644
--- a/doc/ja/weechat_dev.ja.asciidoc
+++ b/doc/ja/weechat_dev.ja.adoc
@@ -343,24 +343,24 @@ WeeChat "core" は以下のディレクトリに配置されています:
 
 [width="100%",cols="1m,3",options="header"]
 |===
-| パス/ファイル名                          | 説明
-| doc/                                     | 文書
-|    docinfo.html                          | asciidoctor スタイル
-|    docgen.py                             | _autogen/_ ディレクトリ内のファイルを作成する Python スクリプト (以下を参照)
-|    XX/                                   | 言語コード XX (言語コード: en、fr、de、it、...) 用のディレクトリ
-|       cmdline_options.XX.asciidoc        | コマンドラインオプション (man ページとユーザガイドに含まれるファイル)
-|       weechat.1.XX.asciidoc              | man ページ (`man weechat`)
-|       weechat_dev.XX.asciidoc            | 開発者リファレンス (この文書)
-|       weechat_faq.XX.asciidoc            | FAQ
-|       weechat_plugin_api.XX.asciidoc     | プラグイン API リファレンス
-|       weechat_quickstart.XX.asciidoc     | クイックスタートガイド
-|       weechat_relay_protocol.XX.asciidoc | リレープロトコル (リモートインターフェイス用)
-|       weechat_scripting.XX.asciidoc      | スクリプト作成ガイド
-|       weechat_tester.XX.asciidoc         | テスターガイド
-|       weechat_user.XX.asciidoc           | ユーザーガイド
-|       autogen/                           | docgen.py スクリプトが自動生成するファイル
-|          user/                           | ユーザーガイド用の自動生成ファイル (手作業による編集は*禁止* !)
-|          plugin_api/                     | プラグイン API 用の自動生成ファイル (手作業による編集は*禁止* !)
+| パス/ファイル名                      | 説明
+| doc/                                 | 文書
+|    docinfo.html                      | asciidoctor スタイル
+|    docgen.py                         | _autogen/_ ディレクトリ内のファイルを作成する Python スクリプト (以下を参照)
+|    XX/                               | 言語コード XX (言語コード: en、fr、de、it、...) 用のディレクトリ
+|       cmdline_options.XX.adoc        | コマンドラインオプション (man ページとユーザガイドに含まれるファイル)
+|       weechat.1.XX.adoc              | man ページ (`man weechat`)
+|       weechat_dev.XX.adoc            | 開発者リファレンス (この文書)
+|       weechat_faq.XX.adoc            | FAQ
+|       weechat_plugin_api.XX.adoc     | プラグイン API リファレンス
+|       weechat_quickstart.XX.adoc     | クイックスタートガイド
+|       weechat_relay_protocol.XX.adoc | リレープロトコル (リモートインターフェイス用)
+|       weechat_scripting.XX.adoc      | スクリプト作成ガイド
+|       weechat_tester.XX.adoc         | テスターガイド
+|       weechat_user.XX.adoc           | ユーザーガイド
+|       autogen/                       | docgen.py スクリプトが自動生成するファイル
+|          user/                       | ユーザーガイド用の自動生成ファイル (手作業による編集は*禁止* !)
+|          plugin_api/                 | プラグイン API 用の自動生成ファイル (手作業による編集は*禁止* !)
 |===
 
 WeeChat とプラグインの翻訳は gettext で行います、ファイルは _po/_ ディレクトリに含まれています:
diff --git a/doc/ja/weechat_faq.ja.asciidoc b/doc/ja/weechat_faq.ja.adoc
index fe960a162..fe960a162 100644
--- a/doc/ja/weechat_faq.ja.asciidoc
+++ b/doc/ja/weechat_faq.ja.adoc
diff --git a/doc/ja/weechat_plugin_api.ja.asciidoc b/doc/ja/weechat_plugin_api.ja.adoc
index 8500087b9..b3b04ff25 100644
--- a/doc/ja/weechat_plugin_api.ja.asciidoc
+++ b/doc/ja/weechat_plugin_api.ja.adoc
@@ -110,7 +110,7 @@ int weechat_plugin_init (struct t_weechat_plugin *plugin,
 
 WeeChat のデフォルトプラグインは以下の順番で初期化されます:
 
-include::autogen/plugin_api/plugins_priority.asciidoc[]
+include::autogen/plugin_api/plugins_priority.adoc[]
 
 ==== weechat_plugin_end
 
@@ -7173,7 +7173,7 @@ struct t_hook *weechat_hook_command (const char *command,
 
 デフォルトの補完候補コードは:
 
-include::autogen/plugin_api/completions.asciidoc[]
+include::autogen/plugin_api/completions.adoc[]
 
 特殊コード:
 
@@ -7777,7 +7777,7 @@ struct t_hook *weechat_hook_process_hashtable (const char *command,
 "url:..." 型のコマンドでは、以下のコマンドを使うことができます
 (それぞれのオプションについては `man curl_easy_setopt` を参照):
 
-include::autogen/plugin_api/url_options.asciidoc[]
+include::autogen/plugin_api/url_options.adoc[]
 
 [NOTE]
 ^(1)^ 定数が利用可能な場合、定数は必ずオプションの値に含めてください。"mask"
@@ -13276,7 +13276,7 @@ const char *weechat_info_get (const char *info_name, const char *arguments);
 
 インフォ:
 
-include::autogen/plugin_api/infos.asciidoc[]
+include::autogen/plugin_api/infos.adoc[]
 
 C 言語での使用例:
 
@@ -13328,7 +13328,7 @@ struct t_hashtable *weechat_info_get_hashtable (const char *info_name,
 
 インフォ:
 
-include::autogen/plugin_api/infos_hashtable.asciidoc[]
+include::autogen/plugin_api/infos_hashtable.adoc[]
 
 C 言語での使用例:
 
@@ -13719,7 +13719,7 @@ struct t_infolist *weechat_infolist_get (const char *infolist_name,
 
 インフォリスト:
 
-include::autogen/plugin_api/infolists.asciidoc[]
+include::autogen/plugin_api/infolists.adoc[]
 
 C 言語での使用例:
 
@@ -14434,7 +14434,7 @@ struct t_hdata *weechat_hdata_get (const char *hdata_name);
 
 hdata のリスト:
 
-include::autogen/plugin_api/hdata.asciidoc[]
+include::autogen/plugin_api/hdata.adoc[]
 
 C 言語での使用例:
 
diff --git a/doc/ja/weechat_quickstart.ja.asciidoc b/doc/ja/weechat_quickstart.ja.adoc
index 38bf819c3..38bf819c3 100644
--- a/doc/ja/weechat_quickstart.ja.asciidoc
+++ b/doc/ja/weechat_quickstart.ja.adoc
diff --git a/doc/ja/weechat_relay_protocol.ja.asciidoc b/doc/ja/weechat_relay_protocol.ja.adoc
index d6df16934..d6df16934 100644
--- a/doc/ja/weechat_relay_protocol.ja.asciidoc
+++ b/doc/ja/weechat_relay_protocol.ja.adoc
diff --git a/doc/ja/weechat_scripting.ja.asciidoc b/doc/ja/weechat_scripting.ja.adoc
index 8081c15c5..8081c15c5 100644
--- a/doc/ja/weechat_scripting.ja.asciidoc
+++ b/doc/ja/weechat_scripting.ja.adoc
diff --git a/doc/ja/weechat_tester.ja.asciidoc b/doc/ja/weechat_tester.ja.adoc
index 481234a27..481234a27 100644
--- a/doc/ja/weechat_tester.ja.asciidoc
+++ b/doc/ja/weechat_tester.ja.adoc
diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.adoc
index e8a18cb5f..f7c0d4cce 100644
--- a/doc/ja/weechat_user.ja.asciidoc
+++ b/doc/ja/weechat_user.ja.adoc
@@ -453,7 +453,7 @@ gdb /usr/bin/weechat 12345
 
 コマンドライン引数:
 
-include::cmdline_options.ja.asciidoc[]
+include::cmdline_options.ja.adoc[]
 
 WeeChat を起動させるには、以下コマンドを実行:
 
@@ -1419,7 +1419,7 @@ IRC 等のプラグインでは、以下の色コードと属性を利用でき�
 
 kbd:[Ctrl+c], kbd:[c] 用の色コード:
 
-include::autogen/user/irc_colors.asciidoc[]
+include::autogen/user/irc_colors.adoc[]
 
 [NOTE]
 端末で利用可能なすべての色を表示するには、WeeChat で `/color` を実行した後
@@ -1681,7 +1681,7 @@ IRC サーバのパスワードを設定する例:
 
 オプション:
 
-include::autogen/user/sec_options.asciidoc[]
+include::autogen/user/sec_options.adoc[]
 
 [[weechat_options]]
 ==== WeeChat オプション (weechat.conf)
@@ -1716,12 +1716,12 @@ include::autogen/user/sec_options.asciidoc[]
 
 オプション:
 
-include::autogen/user/weechat_options.asciidoc[]
+include::autogen/user/weechat_options.adoc[]
 
 [[weechat_commands]]
 ==== WeeChat コマンド
 
-include::autogen/user/weechat_commands.asciidoc[]
+include::autogen/user/weechat_commands.adoc[]
 
 [[plugins]]
 == プラグイン
@@ -1786,7 +1786,7 @@ Alias プラグインを使うことで、コマンドの別名を定義でき�
 [[alias_commands]]
 ==== コマンド
 
-include::autogen/user/alias_commands.asciidoc[]
+include::autogen/user/alias_commands.adoc[]
 
 [[aspell_plugin]]
 === Aspell プラグイン
@@ -1811,12 +1811,12 @@ Aspell
 
 オプション:
 
-include::autogen/user/aspell_options.asciidoc[]
+include::autogen/user/aspell_options.adoc[]
 
 [[aspell_commands]]
 ==== コマンド
 
-include::autogen/user/aspell_commands.asciidoc[]
+include::autogen/user/aspell_commands.adoc[]
 
 [[aspell_speller_options]]
 ==== Speller オプション
@@ -1915,12 +1915,12 @@ charset: terminal: ISO-8859-15, internal: UTF-8
 
 オプション:
 
-include::autogen/user/charset_options.asciidoc[]
+include::autogen/user/charset_options.adoc[]
 
 [[charset_commands]]
 ==== コマンド
 
-include::autogen/user/charset_commands.asciidoc[]
+include::autogen/user/charset_commands.adoc[]
 
 [[charset_set]]
 ==== 文字コードの設定
@@ -1997,12 +1997,12 @@ IRC サーバの全てのチャンネルおよびプライベートバッファ�
 
 オプション:
 
-include::autogen/user/exec_options.asciidoc[]
+include::autogen/user/exec_options.adoc[]
 
 [[exec_commands]]
 ==== コマンド
 
-include::autogen/user/exec_commands.asciidoc[]
+include::autogen/user/exec_commands.adoc[]
 
 [[fifo_plugin]]
 === Fifo プラグイン
@@ -2070,7 +2070,7 @@ $ ./auto_weechat_command 'irc.freenode.#weechat *hello'
 [[fifo_commands]]
 ==== コマンド
 
-include::autogen/user/fifo_commands.asciidoc[]
+include::autogen/user/fifo_commands.adoc[]
 
 [[irc_plugin]]
 === IRC プラグイン
@@ -2117,12 +2117,12 @@ $ weechat irc://nono@chat.freenode.net/#weechat,#toto
 
 オプション:
 
-include::autogen/user/irc_options.asciidoc[]
+include::autogen/user/irc_options.adoc[]
 
 [[irc_commands]]
 ==== コマンド
 
-include::autogen/user/irc_commands.asciidoc[]
+include::autogen/user/irc_commands.adoc[]
 
 [[irc_ssl_certificates]]
 ==== SSL 証明書
@@ -2570,12 +2570,12 @@ Logger
 
 オプション:
 
-include::autogen/user/logger_options.asciidoc[]
+include::autogen/user/logger_options.adoc[]
 
 [[logger_commands]]
 ==== コマンド
 
-include::autogen/user/logger_commands.asciidoc[]
+include::autogen/user/logger_commands.adoc[]
 
 [[logger_log_levels]]
 ==== ログレベル
@@ -2724,12 +2724,12 @@ Relay プラグインはネットワークを介して異なるプロトコル�
 
 オプション:
 
-include::autogen/user/relay_options.asciidoc[]
+include::autogen/user/relay_options.adoc[]
 
 [[relay_commands]]
 ==== コマンド
 
-include::autogen/user/relay_commands.asciidoc[]
+include::autogen/user/relay_commands.adoc[]
 
 [[relay_password]]
 ==== パスワード
@@ -2866,47 +2866,47 @@ Python、Perl、Ruby、Lua、Tcl、Guile
 
 オプション:
 
-include::autogen/user/script_options.asciidoc[]
+include::autogen/user/script_options.adoc[]
 
 [[script_commands]]
 ==== Script コマンド
 
-include::autogen/user/script_commands.asciidoc[]
+include::autogen/user/script_commands.adoc[]
 
 [[python_commands]]
 ==== Python コマンド
 
-include::autogen/user/python_commands.asciidoc[]
+include::autogen/user/python_commands.adoc[]
 
 [[perl_commands]]
 ==== Perl コマンド
 
-include::autogen/user/perl_commands.asciidoc[]
+include::autogen/user/perl_commands.adoc[]
 
 [[ruby_commands]]
 ==== Ruby コマンド
 
-include::autogen/user/ruby_commands.asciidoc[]
+include::autogen/user/ruby_commands.adoc[]
 
 [[lua_commands]]
 ==== Lua コマンド
 
-include::autogen/user/lua_commands.asciidoc[]
+include::autogen/user/lua_commands.adoc[]
 
 [[tcl_commands]]
 ==== Tcl コマンド
 
-include::autogen/user/tcl_commands.asciidoc[]
+include::autogen/user/tcl_commands.adoc[]
 
 [[guile_commands]]
 ==== Guile コマンド
 
-include::autogen/user/guile_commands.asciidoc[]
+include::autogen/user/guile_commands.adoc[]
 
 [[javascript_commands]]
 ==== Javascript コマンド
 
-include::autogen/user/javascript_commands.asciidoc[]
+include::autogen/user/javascript_commands.adoc[]
 
 [[trigger_plugin]]
 === トリガプラグイン
@@ -2937,12 +2937,12 @@ include::autogen/user/javascript_commands.asciidoc[]
 
 オプション:
 
-include::autogen/user/trigger_options.asciidoc[]
+include::autogen/user/trigger_options.adoc[]
 
 [[trigger_commands]]
 ==== コマンド
 
-include::autogen/user/trigger_commands.asciidoc[]
+include::autogen/user/trigger_commands.adoc[]
 
 [[trigger_anatomy]]
 ==== トリガの構造
@@ -3458,12 +3458,12 @@ Xfer プラグインの機能:
 
 オプション:
 
-include::autogen/user/xfer_options.asciidoc[]
+include::autogen/user/xfer_options.adoc[]
 
 [[xfer_commands]]
 ==== コマンド
 
-include::autogen/user/xfer_commands.asciidoc[]
+include::autogen/user/xfer_commands.adoc[]
 
 [[support]]
 == サポート
diff --git a/doc/pl/CMakeLists.txt b/doc/pl/CMakeLists.txt
index 29baaf5b9..ebee86ba0 100644
--- a/doc/pl/CMakeLists.txt
+++ b/doc/pl/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (pl)"
   )
@@ -37,12 +37,12 @@ if(ENABLE_DOC)
   # user's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.pl.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_user.pl.html"
   )
@@ -52,10 +52,10 @@ if(ENABLE_DOC)
   # scripting guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.pl.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_scripting.pl.html"
   )
@@ -65,10 +65,10 @@ if(ENABLE_DOC)
   # FAQ
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.pl.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_faq.pl.html"
   )
@@ -78,10 +78,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.pl.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.pl.html"
   )
@@ -91,10 +91,10 @@ if(ENABLE_DOC)
   # tester's guide
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.pl.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_tester.pl.html"
   )
diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am
index 4c2a743d1..6aa4237b1 100644
--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -21,14 +21,14 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.pl.asciidoc \
-             cmdline_options.pl.asciidoc \
-             weechat_user.pl.asciidoc \
-             weechat_scripting.pl.asciidoc \
-             weechat_faq.pl.asciidoc \
-             weechat_quickstart.pl.asciidoc \
-             weechat_tester.pl.asciidoc \
-             $(wildcard autogen/user/*.asciidoc)
+             weechat.1.pl.adoc \
+             cmdline_options.pl.adoc \
+             weechat_user.pl.adoc \
+             weechat_scripting.pl.adoc \
+             weechat_faq.pl.adoc \
+             weechat_quickstart.pl.adoc \
+             weechat_tester.pl.adoc \
+             $(wildcard autogen/user/*.adoc)
 
 if MAN
   man_targets = weechat.1
@@ -47,28 +47,28 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.pl.asciidoc cmdline_options.pl.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/pl/weechat.1.pl.asciidoc
+weechat.1: weechat.1.pl.adoc cmdline_options.pl.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/pl/weechat.1.pl.adoc
 
 # user's guide
-weechat_user.pl.html: weechat_user.pl.asciidoc cmdline_options.pl.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.pl.html $(abs_top_srcdir)/doc/pl/weechat_user.pl.asciidoc
+weechat_user.pl.html: weechat_user.pl.adoc cmdline_options.pl.adoc $(wildcard autogen/user/*.adoc) $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.pl.html $(abs_top_srcdir)/doc/pl/weechat_user.pl.adoc
 
 # scripting guide
-weechat_scripting.pl.html: weechat_scripting.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.pl.html $(abs_top_srcdir)/doc/pl/weechat_scripting.pl.asciidoc
+weechat_scripting.pl.html: weechat_scripting.pl.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.pl.html $(abs_top_srcdir)/doc/pl/weechat_scripting.pl.adoc
 
 # FAQ
-weechat_faq.pl.html: weechat_faq.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.pl.html $(abs_top_srcdir)/doc/pl/weechat_faq.pl.asciidoc
+weechat_faq.pl.html: weechat_faq.pl.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.pl.html $(abs_top_srcdir)/doc/pl/weechat_faq.pl.adoc
 
 # quickstart
-weechat_quickstart.pl.html: weechat_quickstart.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.pl.html $(abs_top_srcdir)/doc/pl/weechat_quickstart.pl.asciidoc
+weechat_quickstart.pl.html: weechat_quickstart.pl.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.pl.html $(abs_top_srcdir)/doc/pl/weechat_quickstart.pl.adoc
 
 # tester's guide
-weechat_tester.pl.html: weechat_tester.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.pl.html $(abs_top_srcdir)/doc/pl/weechat_tester.pl.asciidoc
+weechat_tester.pl.html: weechat_tester.pl.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.pl.html $(abs_top_srcdir)/doc/pl/weechat_tester.pl.adoc
 
 # install man/docs
 
diff --git a/doc/pl/autogen/plugin_api/completions.asciidoc b/doc/pl/autogen/plugin_api/completions.adoc
index 824dc557d..824dc557d 100644
--- a/doc/pl/autogen/plugin_api/completions.asciidoc
+++ b/doc/pl/autogen/plugin_api/completions.adoc
diff --git a/doc/pl/autogen/plugin_api/hdata.asciidoc b/doc/pl/autogen/plugin_api/hdata.adoc
index 02588bc98..02588bc98 100644
--- a/doc/pl/autogen/plugin_api/hdata.asciidoc
+++ b/doc/pl/autogen/plugin_api/hdata.adoc
diff --git a/doc/pl/autogen/plugin_api/infolists.asciidoc b/doc/pl/autogen/plugin_api/infolists.adoc
index 33f4a999a..33f4a999a 100644
--- a/doc/pl/autogen/plugin_api/infolists.asciidoc
+++ b/doc/pl/autogen/plugin_api/infolists.adoc
diff --git a/doc/pl/autogen/plugin_api/infos.asciidoc b/doc/pl/autogen/plugin_api/infos.adoc
index b9658429a..b9658429a 100644
--- a/doc/pl/autogen/plugin_api/infos.asciidoc
+++ b/doc/pl/autogen/plugin_api/infos.adoc
diff --git a/doc/pl/autogen/plugin_api/infos_hashtable.asciidoc b/doc/pl/autogen/plugin_api/infos_hashtable.adoc
index 21ae4f729..21ae4f729 100644
--- a/doc/pl/autogen/plugin_api/infos_hashtable.asciidoc
+++ b/doc/pl/autogen/plugin_api/infos_hashtable.adoc
diff --git a/doc/pl/autogen/plugin_api/plugins_priority.asciidoc b/doc/pl/autogen/plugin_api/plugins_priority.adoc
index 3caae876d..3caae876d 100644
--- a/doc/pl/autogen/plugin_api/plugins_priority.asciidoc
+++ b/doc/pl/autogen/plugin_api/plugins_priority.adoc
diff --git a/doc/pl/autogen/plugin_api/url_options.asciidoc b/doc/pl/autogen/plugin_api/url_options.adoc
index 81eeb403b..81eeb403b 100644
--- a/doc/pl/autogen/plugin_api/url_options.asciidoc
+++ b/doc/pl/autogen/plugin_api/url_options.adoc
diff --git a/doc/pl/autogen/user/alias_commands.asciidoc b/doc/pl/autogen/user/alias_commands.adoc
index e485fece0..e485fece0 100644
--- a/doc/pl/autogen/user/alias_commands.asciidoc
+++ b/doc/pl/autogen/user/alias_commands.adoc
diff --git a/doc/pl/autogen/user/aspell_commands.asciidoc b/doc/pl/autogen/user/aspell_commands.adoc
index 8f0c8c1af..8f0c8c1af 100644
--- a/doc/pl/autogen/user/aspell_commands.asciidoc
+++ b/doc/pl/autogen/user/aspell_commands.adoc
diff --git a/doc/pl/autogen/user/aspell_options.asciidoc b/doc/pl/autogen/user/aspell_options.adoc
index 2e946de65..2e946de65 100644
--- a/doc/pl/autogen/user/aspell_options.asciidoc
+++ b/doc/pl/autogen/user/aspell_options.adoc
diff --git a/doc/pl/autogen/user/charset_commands.asciidoc b/doc/pl/autogen/user/charset_commands.adoc
index 18fe2ca46..18fe2ca46 100644
--- a/doc/pl/autogen/user/charset_commands.asciidoc
+++ b/doc/pl/autogen/user/charset_commands.adoc
diff --git a/doc/pl/autogen/user/charset_options.asciidoc b/doc/pl/autogen/user/charset_options.adoc
index 53632b624..53632b624 100644
--- a/doc/pl/autogen/user/charset_options.asciidoc
+++ b/doc/pl/autogen/user/charset_options.adoc
diff --git a/doc/pl/autogen/user/exec_commands.asciidoc b/doc/pl/autogen/user/exec_commands.adoc
index 1990fd63a..1990fd63a 100644
--- a/doc/pl/autogen/user/exec_commands.asciidoc
+++ b/doc/pl/autogen/user/exec_commands.adoc
diff --git a/doc/pl/autogen/user/exec_options.asciidoc b/doc/pl/autogen/user/exec_options.adoc
index 28985ff7a..28985ff7a 100644
--- a/doc/pl/autogen/user/exec_options.asciidoc
+++ b/doc/pl/autogen/user/exec_options.adoc
diff --git a/doc/pl/autogen/user/fifo_commands.asciidoc b/doc/pl/autogen/user/fifo_commands.adoc
index 7a03d1b51..7a03d1b51 100644
--- a/doc/pl/autogen/user/fifo_commands.asciidoc
+++ b/doc/pl/autogen/user/fifo_commands.adoc
diff --git a/doc/pl/autogen/user/guile_commands.asciidoc b/doc/pl/autogen/user/guile_commands.adoc
index 2d25834b8..2d25834b8 100644
--- a/doc/pl/autogen/user/guile_commands.asciidoc
+++ b/doc/pl/autogen/user/guile_commands.adoc
diff --git a/doc/pl/autogen/user/irc_colors.asciidoc b/doc/pl/autogen/user/irc_colors.adoc
index c49d04722..c49d04722 100644
--- a/doc/pl/autogen/user/irc_colors.asciidoc
+++ b/doc/pl/autogen/user/irc_colors.adoc
diff --git a/doc/pl/autogen/user/irc_commands.asciidoc b/doc/pl/autogen/user/irc_commands.adoc
index 8681f0578..8681f0578 100644
--- a/doc/pl/autogen/user/irc_commands.asciidoc
+++ b/doc/pl/autogen/user/irc_commands.adoc
diff --git a/doc/pl/autogen/user/irc_options.asciidoc b/doc/pl/autogen/user/irc_options.adoc
index e3175b3cf..e3175b3cf 100644
--- a/doc/pl/autogen/user/irc_options.asciidoc
+++ b/doc/pl/autogen/user/irc_options.adoc
diff --git a/doc/pl/autogen/user/javascript_commands.asciidoc b/doc/pl/autogen/user/javascript_commands.adoc
index 2774e2b13..2774e2b13 100644
--- a/doc/pl/autogen/user/javascript_commands.asciidoc
+++ b/doc/pl/autogen/user/javascript_commands.adoc
diff --git a/doc/pl/autogen/user/logger_commands.asciidoc b/doc/pl/autogen/user/logger_commands.adoc
index 058e152ff..058e152ff 100644
--- a/doc/pl/autogen/user/logger_commands.asciidoc
+++ b/doc/pl/autogen/user/logger_commands.adoc
diff --git a/doc/pl/autogen/user/logger_options.asciidoc b/doc/pl/autogen/user/logger_options.adoc
index 5ae7581e9..5ae7581e9 100644
--- a/doc/pl/autogen/user/logger_options.asciidoc
+++ b/doc/pl/autogen/user/logger_options.adoc
diff --git a/doc/pl/autogen/user/lua_commands.asciidoc b/doc/pl/autogen/user/lua_commands.adoc
index 8b45b82d6..8b45b82d6 100644
--- a/doc/pl/autogen/user/lua_commands.asciidoc
+++ b/doc/pl/autogen/user/lua_commands.adoc
diff --git a/doc/pl/autogen/user/perl_commands.asciidoc b/doc/pl/autogen/user/perl_commands.adoc
index c980a30a6..c980a30a6 100644
--- a/doc/pl/autogen/user/perl_commands.asciidoc
+++ b/doc/pl/autogen/user/perl_commands.adoc
diff --git a/doc/pl/autogen/user/python_commands.asciidoc b/doc/pl/autogen/user/python_commands.adoc
index 289fa0ad9..289fa0ad9 100644
--- a/doc/pl/autogen/user/python_commands.asciidoc
+++ b/doc/pl/autogen/user/python_commands.adoc
diff --git a/doc/pl/autogen/user/relay_commands.asciidoc b/doc/pl/autogen/user/relay_commands.adoc
index dc3384547..dc3384547 100644
--- a/doc/pl/autogen/user/relay_commands.asciidoc
+++ b/doc/pl/autogen/user/relay_commands.adoc
diff --git a/doc/pl/autogen/user/relay_options.asciidoc b/doc/pl/autogen/user/relay_options.adoc
index 94f4fd074..94f4fd074 100644
--- a/doc/pl/autogen/user/relay_options.asciidoc
+++ b/doc/pl/autogen/user/relay_options.adoc
diff --git a/doc/pl/autogen/user/ruby_commands.asciidoc b/doc/pl/autogen/user/ruby_commands.adoc
index 2a75ef347..2a75ef347 100644
--- a/doc/pl/autogen/user/ruby_commands.asciidoc
+++ b/doc/pl/autogen/user/ruby_commands.adoc
diff --git a/doc/pl/autogen/user/script_commands.asciidoc b/doc/pl/autogen/user/script_commands.adoc
index 9824d7e6d..9824d7e6d 100644
--- a/doc/pl/autogen/user/script_commands.asciidoc
+++ b/doc/pl/autogen/user/script_commands.adoc
diff --git a/doc/pl/autogen/user/script_options.asciidoc b/doc/pl/autogen/user/script_options.adoc
index a173335b8..a173335b8 100644
--- a/doc/pl/autogen/user/script_options.asciidoc
+++ b/doc/pl/autogen/user/script_options.adoc
diff --git a/doc/pl/autogen/user/sec_options.asciidoc b/doc/pl/autogen/user/sec_options.adoc
index 050a08748..050a08748 100644
--- a/doc/pl/autogen/user/sec_options.asciidoc
+++ b/doc/pl/autogen/user/sec_options.adoc
diff --git a/doc/pl/autogen/user/tcl_commands.asciidoc b/doc/pl/autogen/user/tcl_commands.adoc
index b56d29ee9..b56d29ee9 100644
--- a/doc/pl/autogen/user/tcl_commands.asciidoc
+++ b/doc/pl/autogen/user/tcl_commands.adoc
diff --git a/doc/pl/autogen/user/trigger_commands.asciidoc b/doc/pl/autogen/user/trigger_commands.adoc
index 938775c7c..938775c7c 100644
--- a/doc/pl/autogen/user/trigger_commands.asciidoc
+++ b/doc/pl/autogen/user/trigger_commands.adoc
diff --git a/doc/pl/autogen/user/trigger_options.asciidoc b/doc/pl/autogen/user/trigger_options.adoc
index eab3d8754..eab3d8754 100644
--- a/doc/pl/autogen/user/trigger_options.asciidoc
+++ b/doc/pl/autogen/user/trigger_options.adoc
diff --git a/doc/pl/autogen/user/weechat_commands.asciidoc b/doc/pl/autogen/user/weechat_commands.adoc
index 69dcb9ad0..69dcb9ad0 100644
--- a/doc/pl/autogen/user/weechat_commands.asciidoc
+++ b/doc/pl/autogen/user/weechat_commands.adoc
diff --git a/doc/pl/autogen/user/weechat_options.asciidoc b/doc/pl/autogen/user/weechat_options.adoc
index e4a339d2b..e4a339d2b 100644
--- a/doc/pl/autogen/user/weechat_options.asciidoc
+++ b/doc/pl/autogen/user/weechat_options.adoc
diff --git a/doc/pl/autogen/user/xfer_commands.asciidoc b/doc/pl/autogen/user/xfer_commands.adoc
index da77f56d2..da77f56d2 100644
--- a/doc/pl/autogen/user/xfer_commands.asciidoc
+++ b/doc/pl/autogen/user/xfer_commands.adoc
diff --git a/doc/pl/autogen/user/xfer_options.asciidoc b/doc/pl/autogen/user/xfer_options.adoc
index 0ab7967cf..0ab7967cf 100644
--- a/doc/pl/autogen/user/xfer_options.asciidoc
+++ b/doc/pl/autogen/user/xfer_options.adoc
diff --git a/doc/pl/cmdline_options.pl.asciidoc b/doc/pl/cmdline_options.pl.adoc
index 97347ef0a..97347ef0a 100644
--- a/doc/pl/cmdline_options.pl.asciidoc
+++ b/doc/pl/cmdline_options.pl.adoc
diff --git a/doc/pl/weechat.1.pl.asciidoc b/doc/pl/weechat.1.pl.adoc
index 58edba4c1..b7be8d51f 100644
--- a/doc/pl/weechat.1.pl.asciidoc
+++ b/doc/pl/weechat.1.pl.adoc
@@ -28,7 +28,7 @@ Posiada dużo opcji konfiguracyjnych i dodatkowych wtyczek.
 
 == OPCJE
 
-include::cmdline_options.pl.asciidoc[]
+include::cmdline_options.pl.adoc[]
 
 == OPCJE WTYCZEK
 
diff --git a/doc/pl/weechat_faq.pl.asciidoc b/doc/pl/weechat_faq.pl.adoc
index 67927ccb8..67927ccb8 100644
--- a/doc/pl/weechat_faq.pl.asciidoc
+++ b/doc/pl/weechat_faq.pl.adoc
diff --git a/doc/pl/weechat_quickstart.pl.asciidoc b/doc/pl/weechat_quickstart.pl.adoc
index f6818dfa7..f6818dfa7 100644
--- a/doc/pl/weechat_quickstart.pl.asciidoc
+++ b/doc/pl/weechat_quickstart.pl.adoc
diff --git a/doc/pl/weechat_scripting.pl.asciidoc b/doc/pl/weechat_scripting.pl.adoc
index f5102b538..f5102b538 100644
--- a/doc/pl/weechat_scripting.pl.asciidoc
+++ b/doc/pl/weechat_scripting.pl.adoc
diff --git a/doc/pl/weechat_tester.pl.asciidoc b/doc/pl/weechat_tester.pl.adoc
index 3d8264e25..3d8264e25 100644
--- a/doc/pl/weechat_tester.pl.asciidoc
+++ b/doc/pl/weechat_tester.pl.adoc
diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.adoc
index 758f7ac09..a7a97b275 100644
--- a/doc/pl/weechat_user.pl.asciidoc
+++ b/doc/pl/weechat_user.pl.adoc
@@ -457,7 +457,7 @@ Następnie jak w przypadku awarii, użyj polecenia `bt full`:
 
 Parametry z linii poleceń:
 
-include::cmdline_options.pl.asciidoc[]
+include::cmdline_options.pl.adoc[]
 
 Żeby uruchomić WeeChat, wykonaj polecenie:
 
@@ -1432,7 +1432,7 @@ atrybutu.
 
 Kody kolorów dla kbd:[Ctrl+c], kbd:[c]:
 
-include::autogen/user/irc_colors.asciidoc[]
+include::autogen/user/irc_colors.adoc[]
 
 [NOTE]
 W celu wyświetlenia wszystkich dostępnych kolorów dla terminala możesz wykonać
@@ -1696,7 +1696,7 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/sec_options.asciidoc[]
+include::autogen/user/sec_options.adoc[]
 
 [[weechat_options]]
 ==== Opcje WeeChat (weechat.conf)
@@ -1731,12 +1731,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/weechat_options.asciidoc[]
+include::autogen/user/weechat_options.adoc[]
 
 [[weechat_commands]]
 ==== Komendy WeeChat
 
-include::autogen/user/weechat_commands.asciidoc[]
+include::autogen/user/weechat_commands.adoc[]
 
 [[plugins]]
 == Wtyczki
@@ -1802,7 +1802,7 @@ Wtyczka alias pozwala tworzyć aliasy dla komend (z WeeChat lub innych wtyczek).
 [[alias_commands]]
 ==== Komendy
 
-include::autogen/user/alias_commands.asciidoc[]
+include::autogen/user/alias_commands.adoc[]
 
 [[aspell_plugin]]
 === Wtyczka aspell
@@ -1827,12 +1827,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/aspell_options.asciidoc[]
+include::autogen/user/aspell_options.adoc[]
 
 [[aspell_commands]]
 ==== Komendy
 
-include::autogen/user/aspell_commands.asciidoc[]
+include::autogen/user/aspell_commands.adoc[]
 
 [[aspell_speller_options]]
 ==== Opcje słowników
@@ -1932,12 +1932,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/charset_options.asciidoc[]
+include::autogen/user/charset_options.adoc[]
 
 [[charset_commands]]
 ==== Komendy
 
-include::autogen/user/charset_commands.asciidoc[]
+include::autogen/user/charset_commands.adoc[]
 
 [[charset_set]]
 ==== Ustawianie kodowania
@@ -2016,12 +2016,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/exec_options.asciidoc[]
+include::autogen/user/exec_options.adoc[]
 
 [[exec_commands]]
 ==== Komendy
 
-include::autogen/user/exec_commands.asciidoc[]
+include::autogen/user/exec_commands.adoc[]
 
 [[fifo_plugin]]
 === Wtyczka fifo
@@ -2090,7 +2090,7 @@ $ ./auto_weechat_command 'irc.freenode.#weechat *hello'
 [[fifo_commands]]
 ==== Komendy
 
-include::autogen/user/fifo_commands.asciidoc[]
+include::autogen/user/fifo_commands.adoc[]
 
 [[irc_plugin]]
 === Wtyczka IRC
@@ -2139,12 +2139,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/irc_options.asciidoc[]
+include::autogen/user/irc_options.adoc[]
 
 [[irc_commands]]
 ==== Komendy
 
-include::autogen/user/irc_commands.asciidoc[]
+include::autogen/user/irc_commands.adoc[]
 
 [[irc_ssl_certificates]]
 ==== Certyfikaty SSL
@@ -2595,12 +2595,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/logger_options.asciidoc[]
+include::autogen/user/logger_options.adoc[]
 
 [[logger_commands]]
 ==== Komendy
 
-include::autogen/user/logger_commands.asciidoc[]
+include::autogen/user/logger_commands.adoc[]
 
 [[logger_log_levels]]
 ==== Poziomy logowania
@@ -2754,12 +2754,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/relay_options.asciidoc[]
+include::autogen/user/relay_options.adoc[]
 
 [[relay_commands]]
 ==== Komendy
 
-include::autogen/user/relay_commands.asciidoc[]
+include::autogen/user/relay_commands.adoc[]
 
 [[relay_password]]
 ==== Hasło
@@ -2899,47 +2899,47 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/script_options.asciidoc[]
+include::autogen/user/script_options.adoc[]
 
 [[script_commands]]
 ==== Komendy wtyczki script
 
-include::autogen/user/script_commands.asciidoc[]
+include::autogen/user/script_commands.adoc[]
 
 [[python_commands]]
 ==== Komendy wtyczki python
 
-include::autogen/user/python_commands.asciidoc[]
+include::autogen/user/python_commands.adoc[]
 
 [[perl_commands]]
 ==== Komendy wtyczki perl
 
-include::autogen/user/perl_commands.asciidoc[]
+include::autogen/user/perl_commands.adoc[]
 
 [[ruby_commands]]
 ==== Komendy wtyczki ruby
 
-include::autogen/user/ruby_commands.asciidoc[]
+include::autogen/user/ruby_commands.adoc[]
 
 [[lua_commands]]
 ==== Komendy wtyczki lua
 
-include::autogen/user/lua_commands.asciidoc[]
+include::autogen/user/lua_commands.adoc[]
 
 [[tcl_commands]]
 ==== Komendy wtyczki tcl
 
-include::autogen/user/tcl_commands.asciidoc[]
+include::autogen/user/tcl_commands.adoc[]
 
 [[guile_commands]]
 ==== Komendy wtyczki guile
 
-include::autogen/user/guile_commands.asciidoc[]
+include::autogen/user/guile_commands.adoc[]
 
 [[javascript_commands]]
 ==== Komendy wtyczki javascript
 
-include::autogen/user/javascript_commands.asciidoc[]
+include::autogen/user/javascript_commands.adoc[]
 
 [[trigger_plugin]]
 === Wtyczka trigger
@@ -2969,12 +2969,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/trigger_options.asciidoc[]
+include::autogen/user/trigger_options.adoc[]
 
 [[trigger_commands]]
 ==== Komendy
 
-include::autogen/user/trigger_commands.asciidoc[]
+include::autogen/user/trigger_commands.adoc[]
 
 [[trigger_anatomy]]
 ==== Anatomia triggera
@@ -3492,12 +3492,12 @@ Sekcje:
 
 Opcje:
 
-include::autogen/user/xfer_options.asciidoc[]
+include::autogen/user/xfer_options.adoc[]
 
 [[xfer_commands]]
 ==== Komendy
 
-include::autogen/user/xfer_commands.asciidoc[]
+include::autogen/user/xfer_commands.adoc[]
 
 [[support]]
 == Wsparcie
diff --git a/doc/ru/CMakeLists.txt b/doc/ru/CMakeLists.txt
index 596359f32..5724b38f3 100644
--- a/doc/ru/CMakeLists.txt
+++ b/doc/ru/CMakeLists.txt
@@ -21,10 +21,10 @@ if(ENABLE_MAN)
   # man page
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.adoc
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.asciidoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ru.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.adoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ru.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat.1 (ru)"
   )
@@ -37,10 +37,10 @@ if(ENABLE_DOC)
   # quickstart
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.ru.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.ru.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.asciidoc
+    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.ru.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.adoc
     DEPENDS
     ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.asciidoc
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.adoc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Building weechat_quickstart.ru.html"
   )
diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am
index 4991e8a05..af2eca61e 100644
--- a/doc/ru/Makefile.am
+++ b/doc/ru/Makefile.am
@@ -20,9 +20,9 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
-             weechat.1.ru.asciidoc \
-             cmdline_options.ru.asciidoc \
-             weechat_quickstart.ru.asciidoc
+             weechat.1.ru.adoc \
+             cmdline_options.ru.adoc \
+             weechat_quickstart.ru.adoc
 
 if MAN
   man_targets = weechat.1
@@ -37,12 +37,12 @@ endif
 all-local: $(man_targets) $(doc_targets)
 
 # man page
-weechat.1: weechat.1.ru.asciidoc cmdline_options.ru.asciidoc
-	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ru/weechat.1.ru.asciidoc
+weechat.1: weechat.1.ru.adoc cmdline_options.ru.adoc
+	$(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ru/weechat.1.ru.adoc
 
 # quickstart
-weechat_quickstart.ru.html: weechat_quickstart.ru.asciidoc $(abs_top_srcdir)/doc/docinfo.html
-	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.ru.html $(abs_top_srcdir)/doc/ru/weechat_quickstart.ru.asciidoc
+weechat_quickstart.ru.html: weechat_quickstart.ru.adoc $(abs_top_srcdir)/doc/docinfo.html
+	$(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.ru.html $(abs_top_srcdir)/doc/ru/weechat_quickstart.ru.adoc
 
 # install man/docs
 
diff --git a/doc/ru/cmdline_options.ru.asciidoc b/doc/ru/cmdline_options.ru.adoc
index 36692ce15..36692ce15 100644
--- a/doc/ru/cmdline_options.ru.asciidoc
+++ b/doc/ru/cmdline_options.ru.adoc
diff --git a/doc/ru/weechat.1.ru.asciidoc b/doc/ru/weechat.1.ru.adoc
index 516b95876..c26c4d6e7 100644
--- a/doc/ru/weechat.1.ru.asciidoc
+++ b/doc/ru/weechat.1.ru.adoc
@@ -29,7 +29,7 @@ It is highly customizable and extensible with scripts.
 
 == ПАРАМЕТРЫ
 
-include::cmdline_options.ru.asciidoc[]
+include::cmdline_options.ru.adoc[]
 
 == ПАРАМЕТРЫ ПЛАГИНОВ
 
@@ -101,7 +101,7 @@ $HOME/.weechat/weechat.log::
 == КОПИРАЙТ
 
 WeeChat написан Sébastien Helleu и другими участниками (полный список находится
-в файле AUTHORS.asciidoc).
+в файле AUTHORS.adoc).
 
 Copyright (C) 2003-2016 {author}
 
diff --git a/doc/ru/weechat_quickstart.ru.asciidoc b/doc/ru/weechat_quickstart.ru.adoc
index fa0cfb1f3..fa0cfb1f3 100644
--- a/doc/ru/weechat_quickstart.ru.asciidoc
+++ b/doc/ru/weechat_quickstart.ru.adoc
diff --git a/weechat.cygport.in b/weechat.cygport.in
index 970a1b153..46cd4547f 100644
--- a/weechat.cygport.in
+++ b/weechat.cygport.in
@@ -100,12 +100,12 @@ weechat_CONTENTS="
     usr/share/locale/
     usr/share/icons/
     usr/share/man/
-    usr/share/doc/weechat/AUTHORS.asciidoc
-    usr/share/doc/weechat/ChangeLog.asciidoc
-    usr/share/doc/weechat/Contributing.asciidoc
+    usr/share/doc/weechat/AUTHORS.adoc
+    usr/share/doc/weechat/ChangeLog.adoc
+    usr/share/doc/weechat/Contributing.adoc
     usr/share/doc/weechat/COPYING
-    usr/share/doc/weechat/README.asciidoc
-    usr/share/doc/weechat/ReleaseNotes.asciidoc
+    usr/share/doc/weechat/README.adoc
+    usr/share/doc/weechat/ReleaseNotes.adoc
 "
 
 #
diff --git a/weechat.spec b/weechat.spec
index eb225f9f1..39caf2353 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -65,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc AUTHORS.asciidoc ChangeLog.asciidoc Contributing.asciidoc COPYING README.asciidoc ReleaseNotes.asciidoc
+%doc AUTHORS.adoc ChangeLog.adoc Contributing.adoc COPYING README.adoc ReleaseNotes.adoc
 %doc %{_docdir}/%{name}/*.html
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/*/man1/%{name}.1*