diff --git a/.gitignore b/.gitignore
index 9149c3855..ad0a42e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,9 @@ po/*quot*
 POTFILES
 remove-potcdate.sed
 Rules-quot
+doc/de/build/*
+doc/en/build/*
+doc/fr/build/*
 
 *stamp
 stamp*
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 437323b3a..7b51421cb 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -85,49 +85,32 @@ IF(BUILD_HTML OR BUILD_PDF)
     )
   
   FOREACH(dlang ${DOC_LANGS})
-    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml)
+    
+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/user/weechat_user.${dlang}.xml)
       
       IF(BUILD_HTML)
-	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang})
-	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build)
-	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/autogen)
-	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang})
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/autogen)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/autogen)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/user)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/user)
         
 	ADD_CUSTOM_COMMAND(
-	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/index.html ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/weechat.${dlang}.html
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/intro.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/install.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/usage.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugins.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_api.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_charset.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_fifo.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_irc.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_scripts.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_xfer.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/authors.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/autogen/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/"
-	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/ ${CMAKE_CURRENT_BINARY_DIR}/weechat-html.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/weechat.${dlang}.xml
-	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/weechat.${dlang}.html ${CMAKE_CURRENT_BINARY_DIR}/weechat-html-one.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}-build/weechat.${dlang}.xml
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user/index.html ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/user/weechat_user.${dlang}.html
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/user/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/autogen/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/user/"
+	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user/ ${CMAKE_CURRENT_BINARY_DIR}/weechat-html.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/weechat_user.${dlang}.xml
+	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/user/weechat_user.${dlang}.html ${CMAKE_CURRENT_BINARY_DIR}/weechat-html-one.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user-build/weechat_user.${dlang}.xml
 	  DEPENDS
           ${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml
-	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/intro.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/install.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/usage.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugins.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_api.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_charset.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_fifo.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_irc.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_scripts.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_xfer.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/authors.${dlang}.xml
+          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/user/*.xml
 	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*
 	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
 	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
@@ -135,60 +118,109 @@ IF(BUILD_HTML OR BUILD_PDF)
 	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css
 	  COMMENT "Building html doc (${dlang})"
 	  )
-	ADD_CUSTOM_TARGET(doc-html-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/index.html)
-	ADD_CUSTOM_TARGET(doc-html-one-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/weechat.${dlang}.html)
-	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang} DESTINATION share/doc/${PROJECT_NAME}/html)
+	ADD_CUSTOM_TARGET(doc-user-html-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user/index.html)
+	ADD_CUSTOM_TARGET(doc-user-html-one-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/user/weechat_user.${dlang}.html)
+	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/user DESTINATION share/doc/${PROJECT_NAME}/html/${dlang}/)
 	
       ENDIF(BUILD_HTML)
-    
+      
       IF(BUILD_PDF)
-	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang})
-	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build)
-        FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/autogen)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/autogen)
+        FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/autogen)
 	
 	ADD_CUSTOM_COMMAND(
-	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/intro.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/install.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/usage.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugins.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_api.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_charset.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_fifo.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_scripts.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_irc.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_xfer.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/authors.${dlang}.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/autogen/"
-	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/"
-	  COMMAND ${DBLATEX} ARGS -P draft.mode=no -c ${CMAKE_CURRENT_SOURCE_DIR}/dblatex.conf -o ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}-build/weechat.${dlang}.xml
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user/weechat_user.${dlang}.pdf
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/user/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/autogen/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/"
+	  COMMAND ${DBLATEX} ARGS -P draft.mode=no -c ${CMAKE_CURRENT_SOURCE_DIR}/dblatex.conf -o ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user/weechat_user.${dlang}.pdf ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user-build/weechat_user.${dlang}.xml
 	  DEPENDS
           ${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml
-	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/intro.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/install.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/usage.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugins.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_api.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_charset.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_fifo.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_irc.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_scripts.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/plugin_xfer.${dlang}.xml
-          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/authors.${dlang}.xml
+          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/user/*.xml
 	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*
 	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
 	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
 	  COMMENT "Building pdf doc (${dlang})"
 	  )
-	ADD_CUSTOM_TARGET(doc-pdf-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf)
-	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/weechat.${dlang}.pdf DESTINATION share/doc/${PROJECT_NAME})
+	ADD_CUSTOM_TARGET(doc-user-pdf-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user/weechat_user.${dlang}.pdf)
+	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/user/weechat_user.${dlang}.pdf DESTINATION share/doc/${PROJECT_NAME})
 
       ENDIF(BUILD_PDF)
       
-    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/weechat.${dlang}.xml)
+    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/user/weechat_user.${dlang}.xml)
+    
+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/devel/weechat_devel.${dlang}.xml)
+      
+      IF(BUILD_HTML)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/autogen)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/autogen)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/devel)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/devel)
+        
+	ADD_CUSTOM_COMMAND(
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel/index.html ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/devel/weechat_devel.${dlang}.html
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/devel/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/autogen/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css" "${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/devel/"
+	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel/ ${CMAKE_CURRENT_BINARY_DIR}/weechat-html.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/weechat_devel.${dlang}.xml
+	  COMMAND ${XSLTPROC} ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/devel/weechat_devel.${dlang}.html ${CMAKE_CURRENT_BINARY_DIR}/weechat-html-one.xsl ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel-build/weechat_devel.${dlang}.xml
+	  DEPENDS
+          ${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml
+          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/devel/*.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*
+	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html.xsl.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-doc.css
+	  COMMENT "Building html doc (${dlang})"
+	  )
+	ADD_CUSTOM_TARGET(doc-devel-html-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel/index.html)
+	ADD_CUSTOM_TARGET(doc-devel-html-one-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html-one/${dlang}/devel/weechat_devel.${dlang}.html)
+	INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/${dlang}/devel DESTINATION share/doc/${PROJECT_NAME}/html/${dlang}/)
+	
+      ENDIF(BUILD_HTML)
+      
+      IF(BUILD_PDF)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel)
+	FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel)
+        FILE(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/autogen)
+        FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/autogen)
+        
+	ADD_CUSTOM_COMMAND(
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel/weechat_devel.${dlang}.pdf
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/devel/*.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/"
+	  COMMAND ${COPY} ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/autogen/"
+          COMMAND ${COPY} ARGS "${CMAKE_CURRENT_BINARY_DIR}/date.xml" "${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/"
+	  COMMAND ${DBLATEX} ARGS -P draft.mode=no -c ${CMAKE_CURRENT_SOURCE_DIR}/dblatex.conf -o ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel/weechat_devel.${dlang}.pdf ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel-build/weechat_devel.${dlang}.xml
+	  DEPENDS
+          ${CMAKE_CURRENT_SOURCE_DIR}/include_autogen.xml
+          ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/*.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/devel/*.xml
+	  ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/autogen/*
+	  ${CMAKE_CURRENT_SOURCE_DIR}/date.xml.in
+	  ${CMAKE_CURRENT_SOURCE_DIR}/weechat-html-one.xsl.in
+	  COMMENT "Building pdf doc (${dlang})"
+	  )
+	ADD_CUSTOM_TARGET(doc-devel-pdf-${dlang} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel/weechat_devel.${dlang}.pdf)
+	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdf/${dlang}/devel/weechat_devel.${dlang}.pdf DESTINATION share/doc/${PROJECT_NAME})
+        
+      ENDIF(BUILD_PDF)
+      
+    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${dlang}/devel/weechat_devel.${dlang}.xml)
   
   ENDFOREACH(dlang ${DOC_LANGS})
 
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
index 3e36ed88d..de9dcbd71 100644
--- a/doc/de/Makefile.am
+++ b/doc/de/Makefile.am
@@ -15,87 +15,186 @@
 #
 
 LANGCODE = de
-BOOK = weechat.$(LANGCODE)
-BOOK_INCLUDE = authors.$(LANGCODE).xml \
-               intro.$(LANGCODE).xml \
-               install.$(LANGCODE).xml \
-               usage.$(LANGCODE).xml \
-               plugins.$(LANGCODE).xml \
-               plugin_api.$(LANGCODE).xml \
-               plugin_charset.$(LANGCODE).xml \
-               plugin_fifo.$(LANGCODE).xml \
-               plugin_irc.$(LANGCODE).xml \
-               plugin_scripts.$(LANGCODE).xml \
-               plugin_xfer.$(LANGCODE).xml \
-               ../include_autogen.xml \
-               autogen/weechat_commands.xml \
-               autogen/weechat_options.xml \
-               autogen/weechat_infos.xml \
-               autogen/irc_commands.xml \
-               autogen/irc_options.xml \
-               autogen/irc_infos.xml
+
+BOOK_AUTOGEN_INCLUDE = ../include_autogen.xml       \
+                       autogen/alias_commands.xml   \
+                       autogen/alias_infos.xml      \
+                       autogen/aspell_commands.xml  \
+                       autogen/aspell_options.xml   \
+                       autogen/charset_commands.xml \
+                       autogen/demo_commands.xml    \
+                       autogen/fifo_infos.xml       \
+                       autogen/irc_commands.xml     \
+                       autogen/irc_infos.xml        \
+                       autogen/irc_options.xml      \
+                       autogen/logger_commands.xml  \
+                       autogen/logger_infos.xml     \
+                       autogen/logger_options.xml   \
+                       autogen/lua_commands.xml     \
+                       autogen/notify_commands.xml  \
+                       autogen/perl_commands.xml    \
+                       autogen/python_commands.xml  \
+                       autogen/ruby_commands.xml    \
+                       autogen/tcl_commands.xml     \
+                       autogen/weechat_commands.xml \
+                       autogen/weechat_infos.xml    \
+                       autogen/weechat_options.xml  \
+                       autogen/xfer_commands.xml    \
+                       autogen/xfer_infos.xml       \
+                       autogen/xfer_options.xml
+
+BOOK_COMMON_INCLUDE  = authors.$(LANGCODE).xml \
+                       intro.$(LANGCODE).xml
+
+BOOK_USER            = weechat_user.$(LANGCODE)
+BOOK_USER_INCLUDE    = user/install.$(LANGCODE).xml        \
+                       user/plugin_charset.$(LANGCODE).xml \
+                       user/plugin_fifo.$(LANGCODE).xml    \
+                       user/plugin_irc.$(LANGCODE).xml     \
+                       user/plugin_xfer.$(LANGCODE).xml    \
+                       user/usage.$(LANGCODE).xml
+
+BOOK_DEVEL           = weechat_devel.$(LANGCODE)
+BOOK_DEVEL_INCLUDE   = devel/plugin_api.$(LANGCODE).xml     \
+                       devel/plugin_scripts.$(LANGCODE).xml \
+                       devel/plugins.$(LANGCODE).xml        \
+                       devel/weechat_devel.$(LANGCODE).xml
+
 QUICKSTART = weechat_quickstart.$(LANGCODE).txt
 
-EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART)
+EXTRA_DIST = $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) \
+             user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE)          \
+             devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE)        \
+             $(QUICKSTART)
 
 if DBLATEX_FOUND
-PDF = pdf-stamp
+PDF = user-pdf-stamp devel-pdf-stamp
 endif
 
 docdir = $(datadir)/doc/$(PACKAGE)
 
-all-local: html-stamp $(PDF)
+all-local: user-html-stamp devel-html-stamp $(PDF)
 
-# HTML output with chunks (many pages)
+# user guide, HTML output with chunks (many pages)
 
-html: html-stamp
+user-html: user-html-stamp
 
-html-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	mkdir -p html/
-	xsltproc -o html/ ../weechat-html.xsl $(BOOK).xml || true
-	rm -f include_autogen.xml
-	cp ../weechat-doc.css html/
-	touch html-stamp
+user-html-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/user-html/autogen/
+	mkdir -p build/user-html/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-html/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-html/
+	cp user/$(BOOK_USER).xml build/user-html/
+	cp $(BOOK_USER_INCLUDE) build/user-html/
+	cp ../include_autogen.xml build/user-html/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-html/date.xml
+	mkdir -p html/user/
+	cd build/user-html/ ; xsltproc -o ../../html/user/ ../../../weechat-html.xsl $(BOOK_USER).xml || true
+	cp ../weechat-doc.css html/user/
+	touch user-html-stamp
 
-# HTML output, all in one page
+# user guide, HTML output, all in one page
 
-html1: html1-stamp
+user-html1: user-html1-stamp
 
-html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	mkdir -p html1/
-	xsltproc -o html1/$(BOOK).html ../weechat-html-one.xsl $(BOOK).xml || true
-	rm -f include_autogen.xml
-	cp ../weechat-doc.css html1/
-	touch html1-stamp
+user-html1-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/user-html1/autogen/
+	mkdir -p build/user-html1/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-html1/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-html1/
+	cp user/$(BOOK_USER).xml build/user-html1/
+	cp $(BOOK_USER_INCLUDE) build/user-html1/
+	cp ../include_autogen.xml build/user-html1/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-html1/date.xml
+	mkdir -p html1/user/
+	cd build/user-html1/ ; xsltproc -o ../../html1/user/$(BOOK_USER).html ../../../weechat-html-one.xsl $(BOOK_USER).xml || true
+	cp ../weechat-doc.css html1/user/
+	touch user-html1-stamp
 
-# PDF output
+# user guide, PDF output
 
-pdf: pdf-stamp
+user-pdf: user-pdf-stamp
 
-pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	dblatex -P draft.mode=no -c ../dblatex.conf $(BOOK).xml || true
-	rm -f include_autogen.xml
-	touch pdf-stamp
+user-pdf-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../include_autogen.xml
+	rm -rf build/user-pdf/autogen/
+	mkdir -p build/user-pdf/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-pdf/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-pdf/
+	cp user/$(BOOK_USER).xml build/user-pdf/
+	cp $(BOOK_USER_INCLUDE) build/user-pdf/
+	cp ../include_autogen.xml build/user-pdf/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-pdf/date.xml
+	mkdir -p pdf/user/
+	cd build/user-pdf/ ; dblatex -o ../../pdf/user/$(BOOK_USER).pdf -P draft.mode=no -c ../../../dblatex.conf $(BOOK_USER).xml || true
+	touch user-pdf-stamp
+
+# devel guide, HTML output with chunks (many pages)
+
+devel-html: devel-html-stamp
+
+devel-html-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/devel-html/autogen/
+	mkdir -p build/devel-html/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-html/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-html/
+	cp devel/$(BOOK_DEVEL).xml build/devel-html/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-html/
+	cp ../include_autogen.xml build/devel-html/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-html/date.xml
+	mkdir -p html/devel/
+	cd build/devel-html/ ; xsltproc -o ../../html/devel/ ../../../weechat-html.xsl $(BOOK_DEVEL).xml || true
+	cp ../weechat-doc.css html/devel/
+	touch devel-html-stamp
+
+# devel guide, HTML output, all in one page
+
+devel-html1: devel-html1-stamp
+
+devel-html1-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/devel-html1/autogen/
+	mkdir -p build/devel-html1/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-html1/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-html1/
+	cp devel/$(BOOK_DEVEL).xml build/devel-html1/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-html1/
+	cp ../include_autogen.xml build/devel-html1/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-html1/date.xml
+	mkdir -p html1/devel/
+	cd build/devel-html1/ ; xsltproc -o ../../html1/devel/$(BOOK_DEVEL).html ../../../weechat-html-one.xsl $(BOOK_DEVEL).xml || true
+	cp ../weechat-doc.css html1/devel/
+	touch devel-html1-stamp
+
+# devel guide, PDF output
+
+devel-pdf: devel-pdf-stamp
+
+devel-pdf-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../include_autogen.xml
+	rm -rf build/devel-pdf/autogen/
+	mkdir -p build/devel-pdf/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-pdf/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-pdf/
+	cp devel/$(BOOK_DEVEL).xml build/devel-pdf/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-pdf/
+	cp ../include_autogen.xml build/devel-pdf/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-pdf/date.xml
+	mkdir -p pdf/devel/
+	cd build/devel-pdf/ ; dblatex -o ../../pdf/devel/$(BOOK_DEVEL).pdf -P draft.mode=no -c ../../../dblatex.conf $(BOOK_DEVEL).xml || true
+	touch devel-pdf-stamp
 
 # install docs
 
 install-data-hook:
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/
-	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/user/ $(DESTDIR)$(docdir)/html/$(LANGCODE)/devel/
+	$(INSTALL_DATA) html/user/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/user/
+	$(INSTALL_DATA) html/devel/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/devel/
 	$(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/
 if DBLATEX_FOUND
-	$(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) pdf/user/$(BOOK_USER).pdf $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) pdf/devel/$(BOOK_DEVEL).pdf $(DESTDIR)$(docdir)/
 endif
 
 # clean
 
 clean-local:
-	-rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml include_autogen.xml
-	-rm -rf html/ html1/
-	-rm -f html-stamp html1-stamp pdf-stamp
+	-rm -rf html/ html1/ pdf/ build/
+	-rm -f user-html-stamp user-html1-stamp user-pdf-stamp devel-html-stamp devel-html1-stamp devel-pdf-stamp
diff --git a/doc/de/plugin_api.de.xml b/doc/de/devel/plugin_api.de.xml
similarity index 100%
rename from doc/de/plugin_api.de.xml
rename to doc/de/devel/plugin_api.de.xml
diff --git a/doc/de/plugin_scripts.de.xml b/doc/de/devel/plugin_scripts.de.xml
similarity index 100%
rename from doc/de/plugin_scripts.de.xml
rename to doc/de/devel/plugin_scripts.de.xml
diff --git a/doc/de/plugins.de.xml b/doc/de/devel/plugins.de.xml
similarity index 100%
rename from doc/de/plugins.de.xml
rename to doc/de/devel/plugins.de.xml
diff --git a/doc/de/devel/weechat_devel.de.xml b/doc/de/devel/weechat_devel.de.xml
new file mode 100644
index 000000000..a2bbecf51
--- /dev/null
+++ b/doc/de/devel/weechat_devel.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+WeeChat documentation (german version)
+
+Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+
+This manual is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This manual is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd"
+[
+  <!-- ***** auto-built: *****  -->
+  <!ENTITY date.xml SYSTEM "date.xml">
+  <!ENTITY % include_autogen.xml SYSTEM "include_autogen.xml">
+    %include_autogen.xml;
+
+  <!-- ***** written by hand: ***** -->
+  <!ENTITY intro.de.xml          SYSTEM "intro.de.xml">
+  <!ENTITY plugins.de.xml        SYSTEM "plugins.de.xml">
+  <!ENTITY plugin_api.de.xml     SYSTEM "plugin_api.de.xml">
+  <!ENTITY plugin_scripts.de.xml SYSTEM "plugin_scripts.de.xml">
+  <!ENTITY authors.de.xml        SYSTEM "authors.de.xml">
+]>
+
+<book lang="de">
+  
+  <bookinfo>
+    
+    <title>WeeChat 0.2.7-dev - Developer guide</title>
+    <subtitle>Schneller, leichter und erweiterbarer Chat Client</subtitle>
+    
+    <author>
+      <firstname>Sébastien</firstname>
+      <surname>Helleu</surname>
+      <email>flashcode AT flashtux.org</email>
+    </author>
+    
+    &date.xml;
+    
+    <copyright>
+      <year>2008</year>
+      <holder>Sébastien Helleu</holder>
+    </copyright>
+    
+    <legalnotice>
+      <para>
+        Dieses Programm ist freie Software. Sie können es unter
+        den Bedingungen der GNU General Public License,
+        wie von der Free Software Foundation veröffentlicht,
+        weitergeben und/oder modifizieren, entweder gemäß Version 3
+        der Lizenz oder (nach Ihrer Option) jeder späteren Version.
+      </para>
+      <para>
+        Die Veröffentlichung dieses Programms erfolgt in der
+        Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE
+        IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der
+        MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK.
+        Details finden Sie in der GNU General Public License.
+      </para>
+      <para>
+        Sie sollten ein Exemplar der GNU General Public License
+        zusammen mit diesem Programm erhalten haben. Falls nicht,
+        &lt;http://www.gnu.org/licenses/&gt;.
+      </para>
+    </legalnotice>
+    
+    <abstract>
+      <para>
+        <!-- TRANSLATION NEEDED -->
+        This manual documents development of WeeChat and its extensions.
+        It is part of WeeChat.
+      </para>
+      <para>
+        Deutsche version: Frank Zacharias
+      </para>
+      <para>
+        Die aktuellste Version ist auf dieser Seite zu finden:
+        <ulink url="http://weechat.flashtux.org/doc.php">
+          http://weechat.flashtux.org/doc.php
+        </ulink>
+      </para>
+    </abstract>
+    
+  </bookinfo>
+  
+  &intro.de.xml;
+  
+  <!-- &plugins.de.xml; -->
+  
+  &authors.de.xml;
+  
+</book>
diff --git a/doc/de/install.de.xml b/doc/de/user/install.de.xml
similarity index 100%
rename from doc/de/install.de.xml
rename to doc/de/user/install.de.xml
diff --git a/doc/de/plugin_charset.de.xml b/doc/de/user/plugin_charset.de.xml
similarity index 100%
rename from doc/de/plugin_charset.de.xml
rename to doc/de/user/plugin_charset.de.xml
diff --git a/doc/de/plugin_fifo.de.xml b/doc/de/user/plugin_fifo.de.xml
similarity index 100%
rename from doc/de/plugin_fifo.de.xml
rename to doc/de/user/plugin_fifo.de.xml
diff --git a/doc/de/plugin_irc.de.xml b/doc/de/user/plugin_irc.de.xml
similarity index 100%
rename from doc/de/plugin_irc.de.xml
rename to doc/de/user/plugin_irc.de.xml
diff --git a/doc/de/plugin_xfer.de.xml b/doc/de/user/plugin_xfer.de.xml
similarity index 100%
rename from doc/de/plugin_xfer.de.xml
rename to doc/de/user/plugin_xfer.de.xml
diff --git a/doc/de/usage.de.xml b/doc/de/user/usage.de.xml
similarity index 100%
rename from doc/de/usage.de.xml
rename to doc/de/user/usage.de.xml
diff --git a/doc/de/weechat.de.xml b/doc/de/user/weechat_user.de.xml
similarity index 84%
rename from doc/de/weechat.de.xml
rename to doc/de/user/weechat_user.de.xml
index 4b62b4010..45d5a1690 100644
--- a/doc/de/weechat.de.xml
+++ b/doc/de/user/weechat_user.de.xml
@@ -30,17 +30,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     %include_autogen.xml;
 
   <!-- ***** written by hand: ***** -->
-  <!ENTITY intro.de.xml SYSTEM "intro.de.xml">
-  <!ENTITY install.de.xml SYSTEM "install.de.xml">
-  <!ENTITY usage.de.xml SYSTEM "usage.de.xml">
-  <!ENTITY plugins.de.xml SYSTEM "plugins.de.xml">
-  <!ENTITY plugin_api.de.xml SYSTEM "plugin_api.de.xml">
-  <!ENTITY plugin_irc.de.xml SYSTEM "plugin_irc.de.xml">
+  <!ENTITY intro.de.xml          SYSTEM "intro.de.xml">
+  <!ENTITY install.de.xml        SYSTEM "install.de.xml">
+  <!ENTITY usage.de.xml          SYSTEM "usage.de.xml">
+  <!ENTITY plugin_irc.de.xml     SYSTEM "plugin_irc.de.xml">
   <!ENTITY plugin_charset.de.xml SYSTEM "plugin_charset.de.xml">
-  <!ENTITY plugin_fifo.de.xml SYSTEM "plugin_fifo.de.xml">
-  <!ENTITY plugin_scripts.de.xml SYSTEM "plugin_scripts.de.xml">
-  <!ENTITY plugin_xfer.de.xml SYSTEM "plugin_xfer.de.xml">
-  <!ENTITY authors.de.xml SYSTEM "authors.de.xml">
+  <!ENTITY plugin_fifo.de.xml    SYSTEM "plugin_fifo.de.xml">
+  <!ENTITY plugin_xfer.de.xml    SYSTEM "plugin_xfer.de.xml">
+  <!ENTITY authors.de.xml        SYSTEM "authors.de.xml">
 ]>
 
 <book lang="de">
@@ -109,7 +106,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
   &usage.de.xml;
   
-  &plugins.de.xml;
+  <!-- &plugins.de.xml; -->
   
   &authors.de.xml;
   
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index 893faaf5c..bea92b05c 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -15,87 +15,186 @@
 #
 
 LANGCODE = en
-BOOK = weechat.$(LANGCODE)
-BOOK_INCLUDE = authors.$(LANGCODE).xml \
-               intro.$(LANGCODE).xml \
-               install.$(LANGCODE).xml \
-               usage.$(LANGCODE).xml \
-               plugins.$(LANGCODE).xml \
-               plugin_api.$(LANGCODE).xml \
-               plugin_charset.$(LANGCODE).xml \
-               plugin_fifo.$(LANGCODE).xml \
-               plugin_irc.$(LANGCODE).xml \
-               plugin_scripts.$(LANGCODE).xml \
-               plugin_xfer.$(LANGCODE).xml \
-               ../include_autogen.xml \
-               autogen/weechat_commands.xml \
-               autogen/weechat_options.xml \
-               autogen/weechat_infos.xml \
-               autogen/irc_commands.xml \
-               autogen/irc_options.xml \
-               autogen/irc_infos.xml
+
+BOOK_AUTOGEN_INCLUDE = ../include_autogen.xml       \
+                       autogen/alias_commands.xml   \
+                       autogen/alias_infos.xml      \
+                       autogen/aspell_commands.xml  \
+                       autogen/aspell_options.xml   \
+                       autogen/charset_commands.xml \
+                       autogen/demo_commands.xml    \
+                       autogen/fifo_infos.xml       \
+                       autogen/irc_commands.xml     \
+                       autogen/irc_infos.xml        \
+                       autogen/irc_options.xml      \
+                       autogen/logger_commands.xml  \
+                       autogen/logger_infos.xml     \
+                       autogen/logger_options.xml   \
+                       autogen/lua_commands.xml     \
+                       autogen/notify_commands.xml  \
+                       autogen/perl_commands.xml    \
+                       autogen/python_commands.xml  \
+                       autogen/ruby_commands.xml    \
+                       autogen/tcl_commands.xml     \
+                       autogen/weechat_commands.xml \
+                       autogen/weechat_infos.xml    \
+                       autogen/weechat_options.xml  \
+                       autogen/xfer_commands.xml    \
+                       autogen/xfer_infos.xml       \
+                       autogen/xfer_options.xml
+
+BOOK_COMMON_INCLUDE  = authors.$(LANGCODE).xml \
+                       intro.$(LANGCODE).xml
+
+BOOK_USER            = weechat_user.$(LANGCODE)
+BOOK_USER_INCLUDE    = user/install.$(LANGCODE).xml        \
+                       user/plugin_charset.$(LANGCODE).xml \
+                       user/plugin_fifo.$(LANGCODE).xml    \
+                       user/plugin_irc.$(LANGCODE).xml     \
+                       user/plugin_xfer.$(LANGCODE).xml    \
+                       user/usage.$(LANGCODE).xml
+
+BOOK_DEVEL           = weechat_devel.$(LANGCODE)
+BOOK_DEVEL_INCLUDE   = devel/plugin_api.$(LANGCODE).xml     \
+                       devel/plugin_scripts.$(LANGCODE).xml \
+                       devel/plugins.$(LANGCODE).xml        \
+                       devel/weechat_devel.$(LANGCODE).xml
+
 QUICKSTART = weechat_quickstart.$(LANGCODE).txt
 
-EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART)
+EXTRA_DIST = $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) \
+             user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE)          \
+             devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE)        \
+             $(QUICKSTART)
 
 if DBLATEX_FOUND
-PDF = pdf-stamp
+PDF = user-pdf-stamp devel-pdf-stamp
 endif
 
 docdir = $(datadir)/doc/$(PACKAGE)
 
-all-local: html-stamp $(PDF)
+all-local: user-html-stamp devel-html-stamp $(PDF)
 
-# HTML output with chunks (many pages)
+# user guide, HTML output with chunks (many pages)
 
-html: html-stamp
+user-html: user-html-stamp
 
-html-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	mkdir -p html/
-	xsltproc -o html/ ../weechat-html.xsl $(BOOK).xml || true
-	rm -f include_autogen.xml
-	cp ../weechat-doc.css html/
-	touch html-stamp
+user-html-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/user-html/autogen/
+	mkdir -p build/user-html/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-html/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-html/
+	cp user/$(BOOK_USER).xml build/user-html/
+	cp $(BOOK_USER_INCLUDE) build/user-html/
+	cp ../include_autogen.xml build/user-html/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-html/date.xml
+	mkdir -p html/user/
+	cd build/user-html/ ; xsltproc -o ../../html/user/ ../../../weechat-html.xsl $(BOOK_USER).xml || true
+	cp ../weechat-doc.css html/user/
+	touch user-html-stamp
 
-# HTML output, all in one page
+# user guide, HTML output, all in one page
 
-html1: html1-stamp
+user-html1: user-html1-stamp
 
-html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	mkdir -p html1/
-	xsltproc -o html1/$(BOOK).html ../weechat-html-one.xsl $(BOOK).xml || true
-	rm -f include_autogen.xml
-	cp ../weechat-doc.css html1/
-	touch html1-stamp
+user-html1-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/user-html1/autogen/
+	mkdir -p build/user-html1/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-html1/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-html1/
+	cp user/$(BOOK_USER).xml build/user-html1/
+	cp $(BOOK_USER_INCLUDE) build/user-html1/
+	cp ../include_autogen.xml build/user-html1/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-html1/date.xml
+	mkdir -p html1/user/
+	cd build/user-html1/ ; xsltproc -o ../../html1/user/$(BOOK_USER).html ../../../weechat-html-one.xsl $(BOOK_USER).xml || true
+	cp ../weechat-doc.css html1/user/
+	touch user-html1-stamp
 
-# PDF output
+# user guide, PDF output
 
-pdf: pdf-stamp
+user-pdf: user-pdf-stamp
 
-pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	dblatex -P draft.mode=no -c ../dblatex.conf $(BOOK).xml || true
-	rm -f include_autogen.xml
-	touch pdf-stamp
+user-pdf-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../include_autogen.xml
+	rm -rf build/user-pdf/autogen/
+	mkdir -p build/user-pdf/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-pdf/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-pdf/
+	cp user/$(BOOK_USER).xml build/user-pdf/
+	cp $(BOOK_USER_INCLUDE) build/user-pdf/
+	cp ../include_autogen.xml build/user-pdf/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-pdf/date.xml
+	mkdir -p pdf/user/
+	cd build/user-pdf/ ; dblatex -o ../../pdf/user/$(BOOK_USER).pdf -P draft.mode=no -c ../../../dblatex.conf $(BOOK_USER).xml || true
+	touch user-pdf-stamp
+
+# devel guide, HTML output with chunks (many pages)
+
+devel-html: devel-html-stamp
+
+devel-html-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/devel-html/autogen/
+	mkdir -p build/devel-html/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-html/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-html/
+	cp devel/$(BOOK_DEVEL).xml build/devel-html/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-html/
+	cp ../include_autogen.xml build/devel-html/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-html/date.xml
+	mkdir -p html/devel/
+	cd build/devel-html/ ; xsltproc -o ../../html/devel/ ../../../weechat-html.xsl $(BOOK_DEVEL).xml || true
+	cp ../weechat-doc.css html/devel/
+	touch devel-html-stamp
+
+# devel guide, HTML output, all in one page
+
+devel-html1: devel-html1-stamp
+
+devel-html1-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/devel-html1/autogen/
+	mkdir -p build/devel-html1/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-html1/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-html1/
+	cp devel/$(BOOK_DEVEL).xml build/devel-html1/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-html1/
+	cp ../include_autogen.xml build/devel-html1/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-html1/date.xml
+	mkdir -p html1/devel/
+	cd build/devel-html1/ ; xsltproc -o ../../html1/devel/$(BOOK_DEVEL).html ../../../weechat-html-one.xsl $(BOOK_DEVEL).xml || true
+	cp ../weechat-doc.css html1/devel/
+	touch devel-html1-stamp
+
+# devel guide, PDF output
+
+devel-pdf: devel-pdf-stamp
+
+devel-pdf-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../include_autogen.xml
+	rm -rf build/devel-pdf/autogen/
+	mkdir -p build/devel-pdf/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-pdf/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-pdf/
+	cp devel/$(BOOK_DEVEL).xml build/devel-pdf/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-pdf/
+	cp ../include_autogen.xml build/devel-pdf/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-pdf/date.xml
+	mkdir -p pdf/devel/
+	cd build/devel-pdf/ ; dblatex -o ../../pdf/devel/$(BOOK_DEVEL).pdf -P draft.mode=no -c ../../../dblatex.conf $(BOOK_DEVEL).xml || true
+	touch devel-pdf-stamp
 
 # install docs
 
 install-data-hook:
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/
-	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/user/ $(DESTDIR)$(docdir)/html/$(LANGCODE)/devel/
+	$(INSTALL_DATA) html/user/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/user/
+	$(INSTALL_DATA) html/devel/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/devel/
 	$(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/
 if DBLATEX_FOUND
-	$(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) pdf/user/$(BOOK_USER).pdf $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) pdf/devel/$(BOOK_DEVEL).pdf $(DESTDIR)$(docdir)/
 endif
 
 # clean
 
 clean-local:
-	-rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml include_autogen.xml
-	-rm -rf html/ html1/
-	-rm -f html-stamp html1-stamp pdf-stamp
+	-rm -rf html/ html1/ pdf/ build/
+	-rm -f user-html-stamp user-html1-stamp user-pdf-stamp devel-html-stamp devel-html1-stamp devel-pdf-stamp
diff --git a/doc/en/plugin_api.en.xml b/doc/en/devel/plugin_api.en.xml
similarity index 100%
rename from doc/en/plugin_api.en.xml
rename to doc/en/devel/plugin_api.en.xml
diff --git a/doc/en/plugin_scripts.en.xml b/doc/en/devel/plugin_scripts.en.xml
similarity index 100%
rename from doc/en/plugin_scripts.en.xml
rename to doc/en/devel/plugin_scripts.en.xml
diff --git a/doc/en/plugins.en.xml b/doc/en/devel/plugins.en.xml
similarity index 100%
rename from doc/en/plugins.en.xml
rename to doc/en/devel/plugins.en.xml
diff --git a/doc/en/devel/weechat_devel.en.xml b/doc/en/devel/weechat_devel.en.xml
new file mode 100644
index 000000000..e21d3cf0e
--- /dev/null
+++ b/doc/en/devel/weechat_devel.en.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+WeeChat documentation (english version)
+
+Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+
+This manual is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This manual is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd"
+[
+  <!-- ***** auto-built: *****  -->
+  <!ENTITY date.xml SYSTEM "date.xml">
+  <!ENTITY % include_autogen.xml SYSTEM "include_autogen.xml">
+    %include_autogen.xml;
+
+  <!-- ***** written by hand: ***** -->
+  <!ENTITY intro.en.xml          SYSTEM "intro.en.xml">
+  <!ENTITY plugins.en.xml        SYSTEM "plugins.en.xml">
+  <!ENTITY plugin_api.en.xml     SYSTEM "plugin_api.en.xml">
+  <!ENTITY plugin_scripts.en.xml SYSTEM "plugin_scripts.en.xml">
+  <!ENTITY authors.en.xml        SYSTEM "authors.en.xml">
+]>
+
+<book lang="en">
+  
+  <bookinfo>
+    
+    <title>WeeChat 0.2.7-dev - Developer guide</title>
+    <subtitle>Fast, light and extensible chat client</subtitle>
+    
+    <author>
+      <firstname>Sébastien</firstname>
+      <surname>Helleu</surname>
+      <email>flashcode AT flashtux.org</email>
+    </author>
+    
+    &date.xml;
+    
+    <copyright>
+      <year>2008</year>
+      <holder>Sébastien Helleu</holder>
+    </copyright>
+    
+    <legalnotice>
+      <para>
+        This manual is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 3 of the License, or
+        (at your option) any later version.
+      </para>
+      <para>
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+      </para>
+      <para>
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see
+        &lt;http://www.gnu.org/licenses/&gt;.
+      </para>
+    </legalnotice>
+    
+    <abstract>
+      <para>
+        This manual documents development of WeeChat and its extensions.
+        It is part of WeeChat.
+      </para>
+      <para>
+        Latest version of this document can be found on this page:
+        <ulink url="http://weechat.flashtux.org/doc.php">
+          http://weechat.flashtux.org/doc.php
+        </ulink>
+      </para>
+    </abstract>
+    
+  </bookinfo>
+  
+  &intro.en.xml;
+  
+  <!-- &plugins.en.xml; -->
+  
+  &authors.en.xml;
+  
+</book>
diff --git a/doc/en/install.en.xml b/doc/en/user/install.en.xml
similarity index 100%
rename from doc/en/install.en.xml
rename to doc/en/user/install.en.xml
diff --git a/doc/en/plugin_charset.en.xml b/doc/en/user/plugin_charset.en.xml
similarity index 100%
rename from doc/en/plugin_charset.en.xml
rename to doc/en/user/plugin_charset.en.xml
diff --git a/doc/en/plugin_fifo.en.xml b/doc/en/user/plugin_fifo.en.xml
similarity index 100%
rename from doc/en/plugin_fifo.en.xml
rename to doc/en/user/plugin_fifo.en.xml
diff --git a/doc/en/plugin_irc.en.xml b/doc/en/user/plugin_irc.en.xml
similarity index 100%
rename from doc/en/plugin_irc.en.xml
rename to doc/en/user/plugin_irc.en.xml
diff --git a/doc/en/plugin_xfer.en.xml b/doc/en/user/plugin_xfer.en.xml
similarity index 100%
rename from doc/en/plugin_xfer.en.xml
rename to doc/en/user/plugin_xfer.en.xml
diff --git a/doc/en/usage.en.xml b/doc/en/user/usage.en.xml
similarity index 100%
rename from doc/en/usage.en.xml
rename to doc/en/user/usage.en.xml
diff --git a/doc/en/weechat.en.xml b/doc/en/user/weechat_user.en.xml
similarity index 83%
rename from doc/en/weechat.en.xml
rename to doc/en/user/weechat_user.en.xml
index 6a98a3008..d66d85c65 100644
--- a/doc/en/weechat.en.xml
+++ b/doc/en/user/weechat_user.en.xml
@@ -30,17 +30,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     %include_autogen.xml;
 
   <!-- ***** written by hand: ***** -->
-  <!ENTITY intro.en.xml SYSTEM "intro.en.xml">
-  <!ENTITY install.en.xml SYSTEM "install.en.xml">
-  <!ENTITY usage.en.xml SYSTEM "usage.en.xml">
-  <!ENTITY plugins.en.xml SYSTEM "plugins.en.xml">
-  <!ENTITY plugin_api.en.xml SYSTEM "plugin_api.en.xml">
-  <!ENTITY plugin_irc.en.xml SYSTEM "plugin_irc.en.xml">
+  <!ENTITY intro.en.xml          SYSTEM "intro.en.xml">
+  <!ENTITY install.en.xml        SYSTEM "install.en.xml">
+  <!ENTITY usage.en.xml          SYSTEM "usage.en.xml">
+  <!ENTITY plugin_irc.en.xml     SYSTEM "plugin_irc.en.xml">
   <!ENTITY plugin_charset.en.xml SYSTEM "plugin_charset.en.xml">
-  <!ENTITY plugin_fifo.en.xml SYSTEM "plugin_fifo.en.xml">
-  <!ENTITY plugin_scripts.en.xml SYSTEM "plugin_scripts.en.xml">
-  <!ENTITY plugin_xfer.en.xml SYSTEM "plugin_xfer.en.xml">
-  <!ENTITY authors.en.xml SYSTEM "authors.en.xml">
+  <!ENTITY plugin_fifo.en.xml    SYSTEM "plugin_fifo.en.xml">
+  <!ENTITY plugin_xfer.en.xml    SYSTEM "plugin_xfer.en.xml">
+  <!ENTITY authors.en.xml        SYSTEM "authors.en.xml">
 ]>
 
 <book lang="en">
@@ -103,7 +100,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
   &usage.en.xml;
   
-  &plugins.en.xml;
+  <!-- &plugins.en.xml; -->
   
   &authors.en.xml;
   
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 10a4640be..ca66c15d8 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -15,87 +15,186 @@
 #
 
 LANGCODE = fr
-BOOK = weechat.$(LANGCODE)
-BOOK_INCLUDE = authors.$(LANGCODE).xml \
-               intro.$(LANGCODE).xml \
-               install.$(LANGCODE).xml \
-               usage.$(LANGCODE).xml \
-               plugins.$(LANGCODE).xml \
-               plugin_api.$(LANGCODE).xml \
-               plugin_charset.$(LANGCODE).xml \
-               plugin_fifo.$(LANGCODE).xml \
-               plugin_irc.$(LANGCODE).xml \
-               plugin_scripts.$(LANGCODE).xml \
-               plugin_xfer.$(LANGCODE).xml \
-               ../include_autogen.xml \
-               autogen/weechat_commands.xml \
-               autogen/weechat_options.xml \
-               autogen/weechat_infos.xml \
-               autogen/irc_commands.xml \
-               autogen/irc_options.xml \
-               autogen/irc_infos.xml
+
+BOOK_AUTOGEN_INCLUDE = ../include_autogen.xml       \
+                       autogen/alias_commands.xml   \
+                       autogen/alias_infos.xml      \
+                       autogen/aspell_commands.xml  \
+                       autogen/aspell_options.xml   \
+                       autogen/charset_commands.xml \
+                       autogen/demo_commands.xml    \
+                       autogen/fifo_infos.xml       \
+                       autogen/irc_commands.xml     \
+                       autogen/irc_infos.xml        \
+                       autogen/irc_options.xml      \
+                       autogen/logger_commands.xml  \
+                       autogen/logger_infos.xml     \
+                       autogen/logger_options.xml   \
+                       autogen/lua_commands.xml     \
+                       autogen/notify_commands.xml  \
+                       autogen/perl_commands.xml    \
+                       autogen/python_commands.xml  \
+                       autogen/ruby_commands.xml    \
+                       autogen/tcl_commands.xml     \
+                       autogen/weechat_commands.xml \
+                       autogen/weechat_infos.xml    \
+                       autogen/weechat_options.xml  \
+                       autogen/xfer_commands.xml    \
+                       autogen/xfer_infos.xml       \
+                       autogen/xfer_options.xml
+
+BOOK_COMMON_INCLUDE  = authors.$(LANGCODE).xml \
+                       intro.$(LANGCODE).xml
+
+BOOK_USER            = weechat_user.$(LANGCODE)
+BOOK_USER_INCLUDE    = user/install.$(LANGCODE).xml        \
+                       user/plugin_charset.$(LANGCODE).xml \
+                       user/plugin_fifo.$(LANGCODE).xml    \
+                       user/plugin_irc.$(LANGCODE).xml     \
+                       user/plugin_xfer.$(LANGCODE).xml    \
+                       user/usage.$(LANGCODE).xml
+
+BOOK_DEVEL           = weechat_devel.$(LANGCODE)
+BOOK_DEVEL_INCLUDE   = devel/plugin_api.$(LANGCODE).xml     \
+                       devel/plugin_scripts.$(LANGCODE).xml \
+                       devel/plugins.$(LANGCODE).xml        \
+                       devel/weechat_devel.$(LANGCODE).xml
+
 QUICKSTART = weechat_quickstart.$(LANGCODE).txt
 
-EXTRA_DIST = $(BOOK).xml $(BOOK_INCLUDE) $(QUICKSTART)
+EXTRA_DIST = $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) \
+             user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE)          \
+             devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE)        \
+             $(QUICKSTART)
 
 if DBLATEX_FOUND
-PDF = pdf-stamp
+PDF = user-pdf-stamp devel-pdf-stamp
 endif
 
 docdir = $(datadir)/doc/$(PACKAGE)
 
-all-local: html-stamp $(PDF)
+all-local: user-html-stamp devel-html-stamp $(PDF)
 
-# HTML output with chunks (many pages)
+# user guide, HTML output with chunks (many pages)
 
-html: html-stamp
+user-html: user-html-stamp
 
-html-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	mkdir -p html/
-	xsltproc -o html/ ../weechat-html.xsl $(BOOK).xml || true
-	rm -f include_autogen.xml
-	cp ../weechat-doc.css html/
-	touch html-stamp
+user-html-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/user-html/autogen/
+	mkdir -p build/user-html/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-html/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-html/
+	cp user/$(BOOK_USER).xml build/user-html/
+	cp $(BOOK_USER_INCLUDE) build/user-html/
+	cp ../include_autogen.xml build/user-html/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-html/date.xml
+	mkdir -p html/user/
+	cd build/user-html/ ; xsltproc -o ../../html/user/ ../../../weechat-html.xsl $(BOOK_USER).xml || true
+	cp ../weechat-doc.css html/user/
+	touch user-html-stamp
 
-# HTML output, all in one page
+# user guide, HTML output, all in one page
 
-html1: html1-stamp
+user-html1: user-html1-stamp
 
-html1-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	mkdir -p html1/
-	xsltproc -o html1/$(BOOK).html ../weechat-html-one.xsl $(BOOK).xml || true
-	rm -f include_autogen.xml
-	cp ../weechat-doc.css html1/
-	touch html1-stamp
+user-html1-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/user-html1/autogen/
+	mkdir -p build/user-html1/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-html1/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-html1/
+	cp user/$(BOOK_USER).xml build/user-html1/
+	cp $(BOOK_USER_INCLUDE) build/user-html1/
+	cp ../include_autogen.xml build/user-html1/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-html1/date.xml
+	mkdir -p html1/user/
+	cd build/user-html1/ ; xsltproc -o ../../html1/user/$(BOOK_USER).html ../../../weechat-html-one.xsl $(BOOK_USER).xml || true
+	cp ../weechat-doc.css html1/user/
+	touch user-html1-stamp
 
-# PDF output
+# user guide, PDF output
 
-pdf: pdf-stamp
+user-pdf: user-pdf-stamp
 
-pdf-stamp: $(BOOK).xml $(BOOK_INCLUDE) ../include_autogen.xml
-	echo "<pubdate>`date '+%F %T'`</pubdate>" >date.xml
-	cp ../include_autogen.xml .
-	dblatex -P draft.mode=no -c ../dblatex.conf $(BOOK).xml || true
-	rm -f include_autogen.xml
-	touch pdf-stamp
+user-pdf-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) user/$(BOOK_USER).xml $(BOOK_USER_INCLUDE) ../include_autogen.xml
+	rm -rf build/user-pdf/autogen/
+	mkdir -p build/user-pdf/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/user-pdf/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/user-pdf/
+	cp user/$(BOOK_USER).xml build/user-pdf/
+	cp $(BOOK_USER_INCLUDE) build/user-pdf/
+	cp ../include_autogen.xml build/user-pdf/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/user-pdf/date.xml
+	mkdir -p pdf/user/
+	cd build/user-pdf/ ; dblatex -o ../../pdf/user/$(BOOK_USER).pdf -P draft.mode=no -c ../../../dblatex.conf $(BOOK_USER).xml || true
+	touch user-pdf-stamp
+
+# devel guide, HTML output with chunks (many pages)
+
+devel-html: devel-html-stamp
+
+devel-html-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../weechat-html.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/devel-html/autogen/
+	mkdir -p build/devel-html/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-html/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-html/
+	cp devel/$(BOOK_DEVEL).xml build/devel-html/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-html/
+	cp ../include_autogen.xml build/devel-html/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-html/date.xml
+	mkdir -p html/devel/
+	cd build/devel-html/ ; xsltproc -o ../../html/devel/ ../../../weechat-html.xsl $(BOOK_DEVEL).xml || true
+	cp ../weechat-doc.css html/devel/
+	touch devel-html-stamp
+
+# devel guide, HTML output, all in one page
+
+devel-html1: devel-html1-stamp
+
+devel-html1-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../weechat-html-one.xsl ../weechat-doc.css ../include_autogen.xml
+	rm -rf build/devel-html1/autogen/
+	mkdir -p build/devel-html1/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-html1/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-html1/
+	cp devel/$(BOOK_DEVEL).xml build/devel-html1/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-html1/
+	cp ../include_autogen.xml build/devel-html1/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-html1/date.xml
+	mkdir -p html1/devel/
+	cd build/devel-html1/ ; xsltproc -o ../../html1/devel/$(BOOK_DEVEL).html ../../../weechat-html-one.xsl $(BOOK_DEVEL).xml || true
+	cp ../weechat-doc.css html1/devel/
+	touch devel-html1-stamp
+
+# devel guide, PDF output
+
+devel-pdf: devel-pdf-stamp
+
+devel-pdf-stamp: $(BOOK_AUTOGEN_INCLUDE) $(BOOK_COMMON_INCLUDE) devel/$(BOOK_DEVEL).xml $(BOOK_DEVEL_INCLUDE) ../include_autogen.xml
+	rm -rf build/devel-pdf/autogen/
+	mkdir -p build/devel-pdf/autogen/
+	cp $(BOOK_AUTOGEN_INCLUDE) build/devel-pdf/autogen/
+	cp $(BOOK_COMMON_INCLUDE) build/devel-pdf/
+	cp devel/$(BOOK_DEVEL).xml build/devel-pdf/
+	cp $(BOOK_DEVEL_INCLUDE) build/devel-pdf/
+	cp ../include_autogen.xml build/devel-pdf/
+	echo "<pubdate>`date '+%F %T'`</pubdate>" >build/devel-pdf/date.xml
+	mkdir -p pdf/devel/
+	cd build/devel-pdf/ ; dblatex -o ../../pdf/devel/$(BOOK_DEVEL).pdf -P draft.mode=no -c ../../../dblatex.conf $(BOOK_DEVEL).xml || true
+	touch devel-pdf-stamp
 
 # install docs
 
 install-data-hook:
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/
-	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/user/ $(DESTDIR)$(docdir)/html/$(LANGCODE)/devel/
+	$(INSTALL_DATA) html/user/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/user/
+	$(INSTALL_DATA) html/devel/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/devel/
 	$(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/
 if DBLATEX_FOUND
-	$(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) pdf/user/$(BOOK_USER).pdf $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) pdf/devel/$(BOOK_DEVEL).pdf $(DESTDIR)$(docdir)/
 endif
 
 # clean
 
 clean-local:
-	-rm -f $(BOOK).html $(BOOK).pdf $(BOOK).txt date.xml include_autogen.xml
-	-rm -rf html/ html1/
-	-rm -f html-stamp html1-stamp pdf-stamp
+	-rm -rf html/ html1/ pdf/ build/
+	-rm -f user-html-stamp user-html1-stamp user-pdf-stamp devel-html-stamp devel-html1-stamp devel-pdf-stamp
diff --git a/doc/fr/plugin_api.fr.xml b/doc/fr/devel/plugin_api.fr.xml
similarity index 100%
rename from doc/fr/plugin_api.fr.xml
rename to doc/fr/devel/plugin_api.fr.xml
diff --git a/doc/fr/plugin_scripts.fr.xml b/doc/fr/devel/plugin_scripts.fr.xml
similarity index 100%
rename from doc/fr/plugin_scripts.fr.xml
rename to doc/fr/devel/plugin_scripts.fr.xml
diff --git a/doc/fr/plugins.fr.xml b/doc/fr/devel/plugins.fr.xml
similarity index 100%
rename from doc/fr/plugins.fr.xml
rename to doc/fr/devel/plugins.fr.xml
diff --git a/doc/fr/devel/weechat_devel.fr.xml b/doc/fr/devel/weechat_devel.fr.xml
new file mode 100644
index 000000000..71df8d88e
--- /dev/null
+++ b/doc/fr/devel/weechat_devel.fr.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+WeeChat documentation (french version)
+
+Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
+
+This manual is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This manual is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd"
+[
+  <!-- ***** auto-built: *****  -->
+  <!ENTITY date.xml SYSTEM "date.xml">
+  <!ENTITY % include_autogen.xml SYSTEM "include_autogen.xml">
+    %include_autogen.xml;
+
+  <!-- ***** written by hand: ***** -->
+  <!ENTITY intro.fr.xml          SYSTEM "intro.fr.xml">
+  <!ENTITY plugins.fr.xml        SYSTEM "plugins.fr.xml">
+  <!ENTITY plugin_api.fr.xml     SYSTEM "plugin_api.fr.xml">
+  <!ENTITY plugin_scripts.fr.xml SYSTEM "plugin_scripts.fr.xml">
+  <!ENTITY authors.fr.xml        SYSTEM "authors.fr.xml">
+]>
+
+<book lang="fr">
+  
+  <bookinfo>
+    
+    <title>WeeChat 0.2.7-dev - Guide du développeur</title>
+    <subtitle>Client de discussion rapide, léger et extensible</subtitle>
+    
+    <author>
+      <firstname>Sébastien</firstname>
+      <surname>Helleu</surname>
+      <email>flashcode AT flashtux.org</email>
+    </author>
+    
+    &date.xml;
+    
+    <copyright>
+      <year>2008</year>
+      <holder>Sébastien Helleu</holder>
+    </copyright>
+    
+    <legalnotice>
+      <para>
+        This manual is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 3 of the License, or
+        (at your option) any later version.
+      </para>
+      <para>
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+      </para>
+      <para>
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see
+        &lt;http://www.gnu.org/licenses/&gt;.
+      </para>
+    </legalnotice>
+    
+    <abstract>
+      <para>
+        Ce manuel documente le développement de WeeChat et ses extensions.
+        Il fait partie de WeeChat.
+      </para>
+      <para>
+        La dernière version de ce document peut être téléchargée
+        sur cette page :
+        <ulink url="http://weechat.flashtux.org/doc.php">
+          http://weechat.flashtux.org/doc.php
+        </ulink>
+      </para>
+    </abstract>
+    
+  </bookinfo>
+  
+  &intro.fr.xml;
+  
+  <!-- &plugins.fr.xml; -->
+  
+  &authors.fr.xml;
+  
+</book>
diff --git a/doc/fr/install.fr.xml b/doc/fr/user/install.fr.xml
similarity index 100%
rename from doc/fr/install.fr.xml
rename to doc/fr/user/install.fr.xml
diff --git a/doc/fr/plugin_charset.fr.xml b/doc/fr/user/plugin_charset.fr.xml
similarity index 100%
rename from doc/fr/plugin_charset.fr.xml
rename to doc/fr/user/plugin_charset.fr.xml
diff --git a/doc/fr/plugin_fifo.fr.xml b/doc/fr/user/plugin_fifo.fr.xml
similarity index 100%
rename from doc/fr/plugin_fifo.fr.xml
rename to doc/fr/user/plugin_fifo.fr.xml
diff --git a/doc/fr/plugin_irc.fr.xml b/doc/fr/user/plugin_irc.fr.xml
similarity index 100%
rename from doc/fr/plugin_irc.fr.xml
rename to doc/fr/user/plugin_irc.fr.xml
diff --git a/doc/fr/plugin_xfer.fr.xml b/doc/fr/user/plugin_xfer.fr.xml
similarity index 100%
rename from doc/fr/plugin_xfer.fr.xml
rename to doc/fr/user/plugin_xfer.fr.xml
diff --git a/doc/fr/usage.fr.xml b/doc/fr/user/usage.fr.xml
similarity index 100%
rename from doc/fr/usage.fr.xml
rename to doc/fr/user/usage.fr.xml
diff --git a/doc/fr/weechat.fr.xml b/doc/fr/user/weechat_user.fr.xml
similarity index 84%
rename from doc/fr/weechat.fr.xml
rename to doc/fr/user/weechat_user.fr.xml
index b3864ab53..1d6b80bb7 100644
--- a/doc/fr/weechat.fr.xml
+++ b/doc/fr/user/weechat_user.fr.xml
@@ -30,17 +30,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     %include_autogen.xml;
 
   <!-- ***** written by hand: ***** -->
-  <!ENTITY intro.fr.xml SYSTEM "intro.fr.xml">
-  <!ENTITY install.fr.xml SYSTEM "install.fr.xml">
-  <!ENTITY usage.fr.xml SYSTEM "usage.fr.xml">
-  <!ENTITY plugins.fr.xml SYSTEM "plugins.fr.xml">
-  <!ENTITY plugin_api.fr.xml SYSTEM "plugin_api.fr.xml">
-  <!ENTITY plugin_irc.fr.xml SYSTEM "plugin_irc.fr.xml">
+  <!ENTITY intro.fr.xml          SYSTEM "intro.fr.xml">
+  <!ENTITY install.fr.xml        SYSTEM "install.fr.xml">
+  <!ENTITY usage.fr.xml          SYSTEM "usage.fr.xml">
+  <!ENTITY plugin_irc.fr.xml     SYSTEM "plugin_irc.fr.xml">
   <!ENTITY plugin_charset.fr.xml SYSTEM "plugin_charset.fr.xml">
-  <!ENTITY plugin_fifo.fr.xml SYSTEM "plugin_fifo.fr.xml">
-  <!ENTITY plugin_scripts.fr.xml SYSTEM "plugin_scripts.fr.xml">
-  <!ENTITY plugin_xfer.fr.xml SYSTEM "plugin_xfer.fr.xml">
-  <!ENTITY authors.fr.xml SYSTEM "authors.fr.xml">
+  <!ENTITY plugin_fifo.fr.xml    SYSTEM "plugin_fifo.fr.xml">
+  <!ENTITY plugin_xfer.fr.xml    SYSTEM "plugin_xfer.fr.xml">
+  <!ENTITY authors.fr.xml        SYSTEM "authors.fr.xml">
 ]>
 
 <book lang="fr">
@@ -105,7 +102,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
   &usage.fr.xml;
   
-  &plugins.fr.xml;
+  <!-- &plugins.fr.xml; -->
   
   &authors.fr.xml;