Version 0.3.1.1

Add missing includes in FindIconv.cmake (patch #7069 )
Fix crash when purging old xfer chats (bug #28764 )
2026-06-23 03:16:37 +02:00 · 2010-01-31 11:43:51 +01:00 · 2010-01-30 18:27:09 +01:00 · 2010-01-29 16:21:26 +01:00 · 2010-01-29 12:42:53 +01:00 · 2010-01-29 08:00:27 +01:00
435 changed files with 41190 additions and 14672 deletions
@@ -9,13 +9,11 @@
 *.lo
 *.m4
 *.o
-*.pdf
 *.Plo
 *.Po
 *.so
 *.so.0
 *.so.0.0.0
-*.xsl

 ABOUT-NLS
 autom4te*
@@ -27,7 +25,6 @@ config.rpath
 config.status
 config.sub
 configure
-date.xml
 debian/*.log
 depcomp
 insert-header.sin
@@ -7,7 +7,7 @@ Developers
 * General code

 ** FlashCode <flashcode@flashtux.org>
-*** Web: http://weechat.flashtux.org/
+*** Web: http://www.weechat.org/
 *** IRC: 'FlashCode' on irc.freenode.net


@@ -30,6 +30,13 @@ Contributors
 * Voroskoi, IRC: 'voroskoi'
 * Frank Zacharias
 * Pavel Shevchuk, IRC: 'Stalwart'
+* soltys
+* Nils Görs
+* rettub
+* m4v
+* Marco Paolone
+* Dmitry Kobylin
+* Dominik Honnef


 Contact
@@ -39,4 +46,4 @@ Whole team is connected to IRC:
 server: 'irc.freenode.net', channels: '#weechat' (english) and '#weechat-fr' (french)


-See README file for licence detail.
+See README file for license detail.
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #

-PROJECT(weechat)
+PROJECT(weechat C)

 cmake_minimum_required(VERSION 2.4)

@@ -28,15 +28,31 @@ ENDIF(PREFIX)

 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "3")
-SET(VERSION_PATCH "0-rc2")
+SET(VERSION_PATCH "1.1")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
-SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
-SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
-SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
-SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
 STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})

+IF(DEFINED LIBDIR)
+  SET(LIBDIR ${LIBDIR}/${PROJECT_NAME})
+ELSE(DEFINED LIBDIR)
+  SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME})
+ENDIF(DEFINED LIBDIR)
+
+IF(NOT DEFINED SHAREDIR)
+  SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share)
+ENDIF(NOT DEFINED SHAREDIR)
+
+IF(NOT DEFINED LOCALEDIR)
+  SET(LOCALEDIR ${SHAREDIR}/locale)
+ENDIF(NOT DEFINED LOCALEDIR)
+
+IF(DEFINED INCLUDEDIR)
+  SET(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
+ELSE(DEFINED INCLUDEDIR)
+  SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
+ENDIF(DEFINED INCLUDEDIR)
+
 OPTION(DISABLE_NCURSES       "Disable Ncurses interface")
 OPTION(ENABLE_GTK            "Enable GTK interface")
 OPTION(DISABLE_NLS           "Disable Native Language Support")
@@ -59,7 +75,10 @@ OPTION(DISABLE_TCL           "Disable Tcl scripting language")
 OPTION(DISABLE_XFER          "Disable Xfer plugin (file transfer and direct chat)")
 OPTION(DISABLE_DOC           "Disable Doc")

-ADD_SUBDIRECTORY( po )
+IF(NOT DISABLE_NLS)
+  ADD_SUBDIRECTORY( po )
+ENDIF(NOT DISABLE_NLS)
+
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( doc )

@@ -90,7 +109,7 @@ SET(exec_prefix "\${prefix}")
 SET(libdir "\${exec_prefix}/lib")
 SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)

 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
@@ -113,10 +132,10 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
  "/config\\\\.h.in$" "/config\\\\.log$" "/config\\\\.rpath$"
  "/config\\\\.status$" "/config\\\\.sub$" "/configure$" "/depcomp$"
  "/install-sh$" "/missing$" "/intl/" "/libtool$" "/\\\\.libs/"
-  "/ltmain\\\\.sh$" "/\\\\.deps/" "/date\\\\.xml$" "/html/" "/html1/"
-  "\\\\.pdf$" "/Makefile$" "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$"
-  "\\\\.gmo$" "~$" "\\\\.o$" "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$"
-  "\\\\.Plo$" "/weechat-curses$" "/weechat-gtk$"
+  "/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
+  "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
+  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
+  "/weechat-gtk$"
 )

 INCLUDE(CPack)
@@ -1,10 +1,79 @@
 WeeChat ChangeLog
 =================
 FlashCode <flashcode@flashtux.org>
-v0.3.0-dev, 2009-06-14
+v0.3.1.1, 2010-01-31


-Version 0.3.0 (under dev!)
+Version 0.3.1.1 (2010-01-31)
+----------------------------
+* irc: fix crash with SSL connection if option ssl_cert is set (bug #28752)
+* irc: fix bug with SSL connection (fails sometimes when ssl_verify is on)
+  (bug #28741)
+* irc: fix compilation with old GnuTLS versions (bug #28723)
+* xfer: fix crash when purging old xfer chats (bug #28764)
+
+Version 0.3.1 (2010-01-23)
+--------------------------
+
+* core: fix bug with script installation on BSD/OSX (patch #6980)
+* core: add option grab_key_command for /input (bound by default to alt-k)
+* core: fix compilation under Cygwin (patch #6916)
+* core: fix cmake directories: let user customize lib, share, locale and include
+  directories (patch #6922)
+* core: fix plural form in translation files (bug #27430)
+* core: fix terminal title bug: do not reset it when option
+  weechat.look.set_title is off (bug #27399)
+* core: fix buffer used by some input functions called via plugin API with
+  buffer pointer (bug #28152)
+* alias: new expansions for alias arguments ($n, $-m, $n-, $n-m, $*, $~)
+  (patch #6917)
+* alias: allow use of wildcards for /alias list (patch #6925)
+* alias: allow /unalias to remove multiple aliases (patch #6926)
+* alias: fix bug with buffer for execution of alias, when called from plugin API
+  with function "command" (bug #27697)
+* alias: fix bug with arguments (bug #27440)
+* irc: add new commands /allchan and /allserv with excluding option, commands
+  /ame and /amsg are now aliases, new aliases /aaway and /anick
+* irc: add options to customize target buffer for messages (task #7381)
+* irc: add new output queue for messages with low priority (like automatic CTCP
+  replies), high priority is given to user messages or commands
+* irc: use self-signed certificate to auto identify on IRC server (CertFP)
+  (task #7492, debian #453348)
+* irc: check SSL certificates (task #7492)
+* irc: add option "autorejoin_delay" for servers (task #8771)
+* irc: add option to use same nick color in channel and private (task #9870)
+* irc: add missing command 275 (patch #6952)
+* irc: add commands /sajoin, /samode, /sanick, /sapart, /saquit (task #9770)
+* irc: add options for CTCP, to block/customize CTCP reply (task #9693)
+* irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270)
+* irc: add all server options for commands /server and /connect
+* irc: add arguments for command /rehash
+* irc: improve error management on socket error (recv/send)
+* irc: improve mask used by command /kickban
+* irc: fix nick color for nicks with wide chars (bug #28547)
+* irc: fix autorejoin on channels with key
+* irc: fix command /connect (options -ssl, -ipv6 and -port) (bug #27486)
+* xfer: add color for nicks in chat
+* xfer: add missing command /me (bug #28658)
+* xfer: add missing charset decoding/encoding for IRC DCC chat (bug #27482)
+* ruby: support of Ruby >= 1.9.1 (patch #6989)
+* fifo: remove old pipes before creating new pipe
+* gui: add color "darkgray", add support for background with light color
+* gui: fix color "black" (bug #23882, debian #512957)
+* gui: fix message "Day changed to", sometimes displayed at wrong time
+  (bug #26959)
+* gui: fix bug with URL selection in some terminals (caused by horizontal lines)
+  (bug #27700)
+* gui: use default auto completion for arguments of unknown commands
+* gui: fix alignment problem for buffer name when a merged buffer is closed
+  (bug #27617)
+* gui: update hotlist when a buffer is closed (bug #27470), remove buffer from
+  hotlist when buffer is cleared (bug #27530)
+* gui: fix /input history_global_next: reset input content when last command in
+  history is reached
+* api: fix function weechat_bar_set for python/lua/ruby (patch #6912)
+
+Version 0.3.0 (2009-09-06)
 --------------------------

 * irc: add irc plugin (replaces old IRC code in core) (task #6217)
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,9 +38,12 @@ EXTRA_DIST = CMakeLists.txt \
             cmake/FindSourcehighlight.cmake \
             cmake/FindTCL.cmake \
             cmake/makedist.sh.in \
+             po/CMakeLists.txt \
+             po/srcfiles.cmake \
             weechat.spec \
             weechat_icon_32.png \
-             weechat.pc.in
+             weechat.pc.in \
+             UPGRADE_0.3

 ACLOCAL_AMFLAGS = -I m4

@@ -1,6 +1,29 @@
 WeeChat News
 ============

+FlashCode, 2010-01-31::
+    WeeChat 0.3.1.1 released.
+    +
+    This version fixes crashs with SSL connection and purge of old DCC chats.
+
+FlashCode, 2010-01-23::
+    WeeChat 0.3.1 released.
+    +
+    IRC commands /ame and /amsg are now aliases, if you are upgrading from
+    version 0.3.0, you must create aliases with following commands:
+    * `/alias aaway allserv /away`
+    * `/alias ame allchan /me`
+    * `/alias amsg allchan /amsg *`
+    * `/alias anick allserv /nick`
+
+FlashCode, 2009-09-06::
+    WeeChat 0.3.0 released.
+    +
+    This version brings major changes, especially for configuration files
+    and plugin API.
+    +
+    For more information about this version, please read file UPGRADE_0.3.
+
 FlashCode, 2009-06-13::
    WeeChat 0.2.6.3 released.
    +
@@ -13,7 +13,7 @@ Features
 * chat client with multi-protocols/servers connection
 * many GUI (curses, Gtk, Qt) (1)
 * small, fast and very light
-* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua)
+* customizable and extensible with plugins (C, Perl, Python, Ruby, Lua, Tcl)
 * compliant with IRC RFCs 1459, 2810, 2811, 2812 and 2813
 * developed from scratch
 * multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other) (2)
@@ -27,7 +27,7 @@ NOTE: (1) only Curses interface is available today
 Copyright
 ---------

-WeeChat (c) Copyright 2003-2009 by FlashCode <flashcode@flashtux.org>
+WeeChat (c) Copyright 2003-2010 by FlashCode <flashcode@flashtux.org>

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -0,0 +1,83 @@
+WeeChat Upgrade to 0.3.x
+========================
+FlashCode <flashcode@flashtux.org>
+v0.3.0, 2009-09-06
+
+
+This document lists major changes introduced in version 0.3.0 and not compatible
+with versions 0.2.x.
+
+
+Upgrade to version 0.3.x
+------------------------
+
+It is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x.
+You have to quit your old WeeChat, then run new version.
+
+Of course, command `/upgrade` is working fine once you'll be with 0.3.x to
+upgrade to another 0.3.x (unless this command is broken again, please look
+at release notes (file 'NEWS') for version you're currently installing).
+
+
+Configuration files
+-------------------
+
+Changes with previous versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New configuration files (`*.conf`) are not compatible with old files (`*.rc`).
+
+Name of options is similar to old versions, but there is now one configuration
+file by plugin, and one file for WeeChat core.
+
+There is *no automatic conversion* for your old options to new configuration files,
+so you'll have to setup again your IRC servers and all other options.
+
+In WeeChat, option names are now with format: `plugin.section.option` (for
+WeeChat core, `plugin` is `weechat`).
+
+Examples:
+
+* WeeChat options: `weechat.xxx.yyy`
+* IRC options: `irc.xxx.yyy`
+
+You should read quickstart guide to be familiar with basic commands and syntax
+(some commands like `/server` have changed): http://www.weechat.org/doc
+
+
+List of configuration files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Old configuration files:
+** weechat.rc
+** plugins.rc
+* New configuration files are now (with default plugins):
+** weechat.conf
+** alias.conf
+** aspell.conf
+** charset.conf
+** irc.conf
+** jabber.conf
+** logger.conf
+** plugins.conf
+** relay.conf
+** xfer.conf
+
+
+Plugin API
+----------
+
+Plugin API has been rewritten and is not compatible with previous versions.
+Accordingly, scripts and plugins must have been designed for version 0.3.x to
+be loaded into WeeChat.
+
+There is no migration script today to convert old script to new API.
+Therefore, if you plan to use old script, you'll have to wait for new version
+or you can convert script yourself and send us new version ;)
+
+You can download scripts for new API on plugins page:
+http://www.weechat.org/plugins
+
+More information about new API is available on wiki:
+http://wiki.flashtux.org/wiki/WeeChat_0.3.0
+and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,12 +52,12 @@ IF(HAVE_LIBINTL_H)
      /usr/lib
      )
    IF(LIBINTL_LIBRARY)
-      IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
        SET(CMAKE_REQUIRED_LIBRARIES "iconv")
        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
-      ELSE(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-      ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+      ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
      
      IF(LIBINTL_HAS_DGETTEXT)
 	SET(GETTEXT_FOUND TRUE)
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,6 +30,9 @@ IF(ICONV_FOUND)
   set(ICONV_FIND_QUIETLY TRUE)
 ENDIF(ICONV_FOUND)

+INCLUDE(CheckLibraryExists)
+INCLUDE(CheckFunctionExists)
+
 FIND_PATH(ICONV_INCLUDE_PATH
  NAMES iconv.h
  PATHS /usr/include /usr/local/include /usr/pkg/include
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,10 +35,15 @@ FIND_PROGRAM(RUBY_EXECUTABLE

 IF(RUBY_EXECUTABLE)
  EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['archdir']"
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']"
    OUTPUT_VARIABLE RUBY_ARCH_DIR
    )

+  EXECUTE_PROCESS(
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['arch']"
+    OUTPUT_VARIABLE RUBY_ARCH
+    )
+
  EXECUTE_PROCESS(
    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
@@ -48,17 +53,27 @@ IF(RUBY_EXECUTABLE)
    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
    )
+
+  EXECUTE_PROCESS(
+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['ruby_version']"
+    OUTPUT_VARIABLE RUBY_VERSION
+    )
  
  # remove the new lines from the output by replacing them with empty strings
  STRING(REPLACE "\n" "" RUBY_ARCH_DIR "${RUBY_ARCH_DIR}")
  STRING(REPLACE "\n" "" RUBY_POSSIBLE_LIB_PATH "${RUBY_POSSIBLE_LIB_PATH}")
  STRING(REPLACE "\n" "" RUBY_RUBY_LIB_PATH "${RUBY_RUBY_LIB_PATH}")
+  STRING(REPLACE "\n" "" RUBY_ARCH "${RUBY_ARCH}")
+  STRING(REPLACE "\n" "" RUBY_VERSION "${RUBY_VERSION}")
  
  FIND_PATH(RUBY_INCLUDE_PATH
    NAMES ruby.h
    PATHS ${RUBY_ARCH_DIR}
    )

+  SET(RUBY_ARCH
+    "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
+
  FIND_LIBRARY(RUBY_LIBRARY
    NAMES ruby ruby1.6 ruby16 ruby1.8 ruby18 ruby1.9 ruby19
    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
@@ -67,11 +82,15 @@ IF(RUBY_EXECUTABLE)
  IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
    SET(RUBY_FOUND TRUE)
  ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-
+  
+  IF(${RUBY_VERSION} STREQUAL "1.9.0")
+    SET(RUBY_FOUND FALSE)
+  ENDIF(${RUBY_VERSION} STREQUAL "1.9.0")
+  
  MARK_AS_ADVANCED(
    RUBY_EXECUTABLE
    RUBY_LIBRARY
+    RUBY_ARCH
    RUBY_INCLUDE_PATH
    )
-  
 ENDIF(RUBY_EXECUTABLE)
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,10 +18,10 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.0-rc2, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.3.1.1, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/core/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.0-rc2])
+AM_INIT_AUTOMAKE([weechat], [0.3.1.1])

 # Checks for programs
 AC_PROG_CC
@@ -45,10 +45,13 @@ netbsd*)
 solaris*)
        LDFLAGS="$LDFLAGS -lsocket -lxnet"
        ;;
+cygwin*)
+        LDFLAGS="$LDFLAGS -no-undefined"
+        ;;
 esac

 # Gettext
-ALL_LINGUAS="fr es cs hu de ru pl"
+ALL_LINGUAS="fr es cs hu de ru pl it"
 AM_GNU_GETTEXT([use-libtool])
 AM_GNU_GETTEXT_VERSION([0.15])

@@ -137,6 +140,7 @@ AC_ARG_ENABLE(xfer,         [  --disable-xfer          turn off Xfer (file trans
 AC_ARG_WITH(lua-inc,        [  --with-lua-inc=DIR,     lua include files are in DIR (default=autodetect)],lua_inc=$withval,lua_inc='')
 AC_ARG_WITH(lua-lib,        [  --with-lua-lib=DIR,     lua library files are in DIR (default=autodetect)],lua_lib=$withval,lua_lib='')
 AC_ARG_WITH(lua-suffix,     [  --with-lua-suffix=ARG   lua is suffixed with ARG (default=autodetect)],lua_suffix=$withval,lua_suffix='')
+AC_ARG_WITH(tclconfig,      [  --with-tclconfig=DIR    directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='')
 AC_ARG_ENABLE(doc,          [  --disable-doc           turn off documentation (default=built)],enable_doc=$enableval,enable_doc=yes)
 AC_ARG_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1)

@@ -155,7 +159,7 @@ if test "$LIBDL_FOUND" != "yes"; then
 fi
 if test "$LIBDL_FOUND" != "yes"; then
    AC_MSG_ERROR([
-*** "dl" library (dynamic library loader) couldn't be found in your system.
+*** "dl" library (dynamic library loader) couldn't be found on your system.
 *** Try to install it with your software package manager.])
 fi
 AC_SUBST(PLUGINS_LFLAGS)
@@ -266,7 +270,7 @@ fi

 if test "x$iconv_found" = "xno" ; then
   AC_MSG_ERROR([
-*** Iconv headers and/or libraries couldn't be found in your system.
+*** Iconv headers and/or libraries couldn't be found on your system.
 *** Try to install them with your software package manager.
 *** WeeChat can't be built without Iconv support.])
 fi
@@ -308,7 +312,7 @@ if test "x$enable_aspell" = "xyes" ; then
    if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
       AC_MSG_RESULT(no)
       AC_MSG_WARN([
-*** Aspell headers and/or libraries couldn't be found in your system.
+*** Aspell headers and/or libraries couldn't be found on your system.
 *** Try to install them with your software package manager.
 *** WeeChat will be built without Aspell support.])
       enable_aspell="no"
@@ -424,7 +428,7 @@ if test "x$enable_perl" = "xyes" ; then
                AC_MSG_RESULT(found)
            else
                AC_MSG_WARN([
-*** Perl library couldn't be found in your system.
+*** Perl library couldn't be found on your system.
 *** Try to install it with your software package manager.
 *** WeeChat will be built without Perl support.])
                enable_perl="no"
@@ -432,7 +436,7 @@ if test "x$enable_perl" = "xyes" ; then
            fi
        else
            AC_MSG_WARN([
-*** Perl headers couldn't be found in your system.
+*** Perl headers couldn't be found on your system.
 *** Try to install it with your software package manager.
 *** WeeChat will be built without Perl support.])
            enable_perl="no"
@@ -485,7 +489,7 @@ if test "x$enable_python" = "xyes" ; then
               AC_MSG_RESULT(found)
            else
                AC_MSG_WARN([
-*** Python library couldn't be found in your system.            
+*** Python library couldn't be found on your system.            
 *** Try to install it with your software package manager.
 *** WeeChat will be built without Python support.])
                enable_python="no"
@@ -493,7 +497,7 @@ if test "x$enable_python" = "xyes" ; then
            fi
        else
            AC_MSG_WARN([
-*** Python header files couldn't be found in your system.
+*** Python header files couldn't be found on your system.
 *** Try to install them with your software package manager.
 *** WeeChat will be built without Python support.])
            enable_python="no"
@@ -525,20 +529,32 @@ if test "x$enable_ruby" = "xyes" ; then
        not_found="$not_found ruby"
    else
 	RUBY_VERSION=`$RUBY -rrbconfig -e "puts Config::CONFIG[['ruby_version']]"`
-        RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['archdir']]"`
-        AC_MSG_CHECKING(for Ruby header files)
-        if test -r "$RUBY_INCLUDE/ruby.h"; then
-            RUBY_CFLAGS="-I$RUBY_INCLUDE"
-        else
+        if test "$RUBY_VERSION" = "1.9.0"; then
            AC_MSG_WARN([
-*** Ruby header files couldn't be found in your system.
-*** Try to install them with your software package manager.
+*** Ruby header files have been found, but they're of the version 1.9.0.
+*** Ruby 1.9.0 is an unstable release and should not be used in production.
+*** Please install Ruby >=1.8.6 or 1.9.1.
 *** WeeChat will be built without Ruby support.])
            enable_ruby="no"
            not_found="$not_found ruby"
+        else
+            RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['rubyhdrdir']] || Config::CONFIG[['archdir']]"`
+            RUBY_ARCH=`$RUBY -rrbconfig -e 'print Config::CONFIG[["arch"]]'`
+            AC_MSG_CHECKING(for Ruby header files)
+            if test -d "$RUBY_INCLUDE/"; then
+                M_RUBY_VERSION=`$RUBY -rrbconfig -e "puts Config::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
+                RUBY_CFLAGS="-I$RUBY_INCLUDE/ -I$RUBY_INCLUDE/$RUBY_ARCH -DRUBY_VERSION=$M_RUBY_VERSION"
+            else
+                AC_MSG_WARN([
+*** Ruby header files couldn't be found on your system.
+*** Try to install them with your software package manager.
+*** WeeChat will be built without Ruby support.])
+                enable_ruby="no"
+                not_found="$not_found ruby"
+            fi
+            AC_MSG_RESULT(found)
+            RUBY_LFLAGS=`$RUBY -rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]"`
        fi
-        AC_MSG_RESULT(found)
-        RUBY_LFLAGS=`$RUBY -rrbconfig -e "puts Config::CONFIG[['LIBRUBYARG_SHARED']]"`
    fi
 else
    not_asked="$not_asked ruby"
@@ -650,7 +666,7 @@ if test "x$enable_lua" = "xyes" ; then
    if test "x$LUA_TEST" != "x0" ; then
        AC_MSG_RESULT(no)
        AC_MSG_WARN([
-*** Lua (>=5.0) headers and/or librairies couldn't be found in your system.
+*** Lua (>=5.0) headers and/or librairies couldn't be found on your system.
 *** Try to install liblua, liblualib and liblua-dev with your software package manager.
 *** WeeChat will be built without Lua support.])
        enable_lua="no"
@@ -673,49 +689,34 @@ if test "x$enable_lua" = "xyes" ; then
 fi

 # --------------------------------- tcl -------------------------------------
+
 TCL_VERSION=

 if test "x$enable_tcl" = "xyes" ; then
    enable_plugins="yes"
    
-    AC_PATH_PROGS(TCL, tclsh tclsh8.5 tclsh8.4)
-    if test -z $TCL ; then
+    AC_MSG_CHECKING(for tclConfig.sh)
+    tcl_found="no"
+    tcl_dirs="/lib /usr/lib /usr/tcl/lib /usr/lib/tcl8.5 /usr/lib/tcl8.4 /usr/lib/tcl8.3 /usr/local/lib /usr/local/tcl-8.5/lib /usr/local/tcl-8.4/lib /usr/local/tcl-8.3/lib /usr/local/tcl/lib /opt/lib"
+    if test "x$tclconfig" != "x" ; then
+      tcl_dirs="${tclconfig} ${tcl_dirs}"
+    fi
+    for tcl_dir in $tcl_dirs ; do
+        if test -f ${tcl_dir}/tclConfig.sh ; then
+            . ${tcl_dir}/tclConfig.sh
+            TCL_CFLAGS="-I${TCL_PREFIX}/include $TCL_INCLUDE_SPEC"
+            TCL_LFLAGS="$TCL_LIB_SPEC $TCL_LIBS"
+            tcl_found="yes"
+            AC_MSG_RESULT(${tcl_dir}/tclConfig.sh)
+            break
+        fi
+    done
+    if test "x$tcl_found" = "xno" ; then
        AC_MSG_WARN([
-*** Tcl must be installed on your system but tcl interpreter couldn't be found in path.
-*** Please check that tclsh is in path, or install it with your software package manager.
+*** Script tclConfig.sh couldn't be found on your system.
 *** WeeChat will be built without Tcl support.])
        enable_tcl="no"
        not_found="$not_found tcl"
-    else
-        TCL_VERSION=`echo 'puts $tcl_version' | $TCL`
-        TCL_PATCHLEVEL=`echo 'puts $tcl_patchLevel' | $TCL`
-        
-	AC_MSG_CHECKING(for Tcl headers files)
-        TCL_HEADER_TEST=`TT=tcltest.c ; echo "#include <tcl.h>" > $TT; echo "int main() { return 0; }" >> $TT ; $CC -Wall $TT -o $TT.out 1>/dev/null 2>&1; echo $?; rm -f $TT $TT.out 1>/dev/null 2>&1`
-        if test "x$TCL_HEADER_TEST" = "x0" ; then
-            TCL_CFLAGS="-fPIC"
-            AC_MSG_RESULT(found)
-            AC_MSG_CHECKING(for Tcl library)
-            TCL_LIB_TEST=`TT=tcltest.c ; echo "int main() { return 0; }" > $TT ; $CC -Wall $TT -o $TT.out -ltcl$TCL_VERSION 1>/dev/null 2>&1; echo $?; rm -f $TT $TT.out 1>/dev/null 2>&1`
-            if test "x$TCL_LIB_TEST" = "x0" ; then	        
-                TCL_LFLAGS="-ltcl$TCL_VERSION -ldl -export-dynamic"
-                AC_MSG_RESULT(found)
-            else
-                AC_MSG_WARN([
-*** Tcl library couldn't be found in your system.
-*** Try to install it with your software package manager.
-*** WeeChat will be built without Tcl support.])
-                enable_tcl="no"
-                not_found="$not_found tcl"
-            fi
-        else
-            AC_MSG_WARN([
-*** Tcl headers couldn't be found in your system.
-*** Try to install it with your software package manager.
-*** WeeChat will be built without Tcl support.])
-            enable_tcl="no"
-            not_found="$not_found tcl"
-        fi
    fi
 fi

@@ -888,7 +889,7 @@ else
    AC_MSG_RESULT(no)
 fi

-CFLAGS=`echo $CFLAGS | sed 's/ -g //g'`
+CFLAGS=`echo $CFLAGS | sed 's/ -g / /g'`
 CFLAGS=`echo $CFLAGS | sed 's/^-g //g'`
 CFLAGS=`echo $CFLAGS | sed 's/ -g$//g'`
 CFLAGS=`echo $CFLAGS | sed 's/^-g$//g'`
@@ -957,6 +958,11 @@ AC_OUTPUT([Makefile
           doc/Makefile
           doc/en/Makefile
           doc/fr/Makefile
+           doc/pl/Makefile
+           doc/de/Makefile
+           doc/ru/Makefile
+           doc/ja/Makefile
+           doc/it/Makefile
           src/Makefile
           src/core/Makefile
           src/plugins/Makefile
@@ -1045,7 +1051,7 @@ if test "x$enable_lua" = "xyes"; then
    listplugins="$listplugins lua($LUA_VERSION)"
 fi
 if test "x$enable_tcl" = "xyes"; then
-    listplugins="$listplugins tcl($TCL_PATCHLEVEL)"
+    listplugins="$listplugins tcl($TCL_VERSION)"
 fi
 if test "x$enable_xfer" = "xyes"; then
    listplugins="$listplugins xfer"
@@ -1,7 +1,9 @@
-weechat (0.1.6-1) unstable; urgency=low
+weechat (0.3.0-1) unstable; urgency=low

-  * This release introduces some incompatible changes with old scripts
-  and locale support, you can read the upstream NEWS file for more
-  information.
+  This release introduces major changes. Large part of code was
+  rewritten without keeping compatibility with older versions.

- -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 20:45:46 +0100
+  Please refer to the file /usr/share/doc/weechat-core/UPGRADE_0.3
+  for more informations on upgrade from a version 0.2.x to 0.3.x.
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Tue, 15 Sep 2009 20:59:42 +0000
@@ -1,20 +1,73 @@
-weechat (0.3.0-1) experimental; urgency=low
+weechat (0.3.0-1) unstable; urgency=low
+
+  * New (final) upstream release.
+  * Upload to unstable.
+  * Add doc-base files for documentation.
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Tue, 15 Sep 2009 20:58:07 +0000
+
+weechat (0.3.0~rc3-1) experimental; urgency=low

  * New (major) upstream release.
    - Fix the excessive number of wakeups (Closes: #461945)
-  * Packaging changes:
-    - Drop weechat-common
-    - Add weechat-doc (Documentation)
-    - Add weechat-core (locales files, essential plugins)
-    - Add weechat-dbg (gdb debugging symbols)
-    - Add weechat-dev (plugins developement files)
-  * Adjust Build-Depends for new tcl plugin (update debian/copyright).
-  * Remove quilt from Build-Depends (patches merged upstream).
-  * Switch packaging from cdbs to plain debhelper.
+  * Remove patches (merged upstream).
+  * Update debian/copyright: add new copyright holder.
+  * Packaging changes (taking into account future frontends: weechat-gtk,
+    weechat-qt, etc.):
+      - Drop weechat-common
+      - Add weechat-doc (Documentation)
+      - Add weechat-core (locales files, essential plugins)
+      - Add weechat-dev (plugins development files)
+      - Add weechat-dbg (gdb debugging symbols)
+  * Switch packaging from cdbs to debhelper 7.
  * Update packages descriptions.
  * Add a lintian-override against manpage line wrapping error.
+  * Update Standards-Version to 3.8.3.
+  * Add file UPGRADE_0.3 to doc files.
+  * Update debian/NEWS about major changes in this release.

- -- Emmanuel Bouthenot <kolter@openics.org>  Fri, 08 May 2009 13:36:39 +0000
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 16 Aug 2009 20:32:01 +0000
+
+weechat (0.2.6.3-1) unstable; urgency=low
+
+  * New upstream release
+    - drop the usage of the deprecated libgnutls-config script to detect
+      gnutls (Closes: #529912).
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sat, 13 Jun 2009 21:47:56 +0000
+
+weechat (0.2.6.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Add a patch which fix typos in aspell plugin.
+  * Refresh patch multiple_ip_servers according to the new upstream release.
+  
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 19 Apr 2009 10:23:26 +0000
+
+weechat (0.2.6.1-1) unstable; urgency=low
+
+  * New upstream release which includes a fix against a possible remote
+    Denial of Service (crash) while receiving messages with special chars
+    (Closes: #519940).
+  * Refresh patch multiple_ip_servers according to the new upstream release.
+  * Update Standards-Version to 3.8.1.
+  
+ -- Emmanuel Bouthenot <kolter@openics.org>  Mon, 16 Mar 2009 13:18:29 +0000
+ 
+weechat (0.2.6-3) unstable; urgency=low
+
+  * Add a patch to make weechat try to connect other server IPs
+    when the first one failed. Thanks to Lionel Elie Mamane for
+    his patch (Closes: #498610).
+  * Rename patch 01_perlembed_init_macros to perlembed_init_macros.
+  * Update debian/control:
+     - add ${misc:Depends}
+     - update descriptions
+  * Update debian/copyright about debian packaging.
+  * Add Vcs-Browser and Vcs-Git fields in debian/control.
+  * Add DM-Upload-Allowed field.
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sat, 21 Feb 2009 18:34:08 +0000

 weechat (0.2.6-2) unstable; urgency=low

@@ -28,14 +81,14 @@ weechat (0.2.6-2) unstable; urgency=low
  * Reformat NEWS file to avoid lintian warnings.
  * Fix typos in control file.

- -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 30 Nov 2008 16:38:54 +0100
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 07 Sep 2008 19:39:42 +0000

 weechat (0.2.6-1) unstable; urgency=low

  * New Upstream Version
  * Switch to GPLv3 (update copyright)
  * Update menu entry
-
+  
 -- Emmanuel Bouthenot <kolter@openics.org>  Thu, 06 Sep 2007 20:10:26 +0200

 weechat (0.2.5-1) unstable; urgency=low
@@ -2,12 +2,15 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml
+Build-Depends-Indep: asciidoc (>= 8.2), source-highlight
 Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
 ruby, ruby1.8-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
 tcl-dev, libgnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.8.1
-Homepage: http://weechat.flashtux.org/
+Standards-Version: 3.8.3
+Homepage: http://weechat.org/
+Vcs-Git: git://git.debian.org/users/kolter-guest/weechat.git
+Vcs-Browser: http://git.debian.org/git/users/kolter-guest/weechat.git
+DM-Upload-Allowed: yes

 Package: weechat
 Architecture: all
@@ -27,6 +30,8 @@ Description: Fast, light and extensible chat client
 Package: weechat-curses
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
+Conflicts: weechat-common
+Breaks: weechat-scripts (<= 20090221-1)
 Recommends: weechat-plugins (= ${binary:Version})
 Description: Fast, light and extensible chat client - console client
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -45,30 +50,29 @@ Description: Fast, light and extensible chat client - console client
 Package: weechat-core
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: weechat-common, weechat-plugins (<< 0.3.0)
 Suggests: weechat-doc (= ${source:Version})
-Conflicts: weechat-common, weechat-plugins (<< 0.3.0)
 Description: Fast, light and extensible chat client - core files
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides core plugins and locales files for WeeChat. It
- currently ships the following plugins: xfer, notify, irc, charset and
+ currently ships the following plugins: alias, xfer, irc, charset and
 logger. It is useless without weechat-curses.

 Package: weechat-plugins
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
-Suggests: weechat-scripts
+Suggests: weechat-scripts (>> 20090221-1)
 Description: Fast, light and extensible chat client - plugins
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 for many operating systems. Everything can be done with a keyboard.
 .
 This package provides some plugins to enhance WeeChat. It currently
 ships the following plugins:
-  - Perl, Python, Ruby, Lua, and Tcl scripting.
-  - Spell checking (thanks to aspell).
-  - Charsets management
-  - And many others (Relay, Fifo, ...)
+  - Perl, Python, Ruby, Lua, and Tcl scripting
+  - Spell checking (thanks to aspell)
+  - And many others (Fifo, ...)

 Package: weechat-doc
 Section: doc
@@ -1,13 +1,12 @@
 This package was debianized by FlashCode <flashcode@flashtux.org> on
 Sat, 21 May 2005 08:00:00 +0200.

-It was downloaded from http://weechat.flashtux.org/download
+It was downloaded from http://weechat.org/files/src/

 Copyright:
-	(2003)	FlashCode <flashcode@flashtux.org>
-		Emmanuel Bouthenot <kolter@openics.org>
-	(2008)	Dmitry Kobylin <fnfal@academ.tsc.ru> (tcl plugin)
-
+    Copyright (C) (2003-2010) FlashCode <flashcode@flashtux.org>
+    Copyright (C) (2005-2010) Emmanuel Bouthenot <kolter@openics.org>
+    Copyright (C) (2008-2010) Dmitry Kobylin <fnfal@academ.tsc.ru> (tcl plugin)

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,3 +16,7 @@ your option) any later version.
 On Debian systems, the complete text of the GNU General Public
 License, Version 3 can be found in the file
 /usr/share/common-licenses/GPL-3
+
+Debian packaging (licensed under the GPLv3):
+  Copyright(C) 2005-2008, Julien Louis <ptitlouis@sysif.net>
+  Copyright(C) 2008-2010, Emmanuel Bouthenot <kolter@openics.org>
@@ -4,12 +4,12 @@ builddir/Makefile:
 	mkdir -p builddir
 	cd builddir && \
 	cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_C_FLAGS="$(CFLAGS)" \
-		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
-		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
+		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
+		-DCMAKE_LD_FLAGS:STRING="-Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
+		-DCMAKE_SKIP_RPATH:BOOL=ON \
+		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON

 build: build-stamp
 build-stamp: builddir/Makefile 
@@ -1,2 +1,2 @@
 version=2
-http://weechat.flashtux.org/download/weechat-(\d.*)\.tar\.bz2 
+http://weechat.org/files/src/weechat-(\d.*)\.tar\.bz2
@@ -1,3 +1,4 @@
 AUTHORS
 NEWS
 README
+UPGRADE_0.3
@@ -0,0 +1,13 @@
+Document: weechat-faq-en
+Title: WeeChat FAQ (English)
+Author: Sebastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (English version).
+Section: Network/Communication
+
+Format: text
+Files: /usr/share/doc/weechat-doc/weechat_faq.en.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_faq.en.html
+Files: /usr/share/doc/weechat-doc/weechat_faq.en.html
@@ -0,0 +1,13 @@
+Document: weechat-faq-fr
+Title: WeeChat FAQ (French)
+Author: Sebastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (French version).
+Section: Network/Communication
+
+Format: text
+Files: /usr/share/doc/weechat-doc/weechat_faq.fr.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_faq.fr.html
+Files: /usr/share/doc/weechat-doc/weechat_faq.fr.html
@@ -0,0 +1,10 @@
+Document: weechat-faq-pl
+Title: WeeChat FAQ (Polish)
+Author: Sebastien Helleu
+Abstract: This document answers frequently asked questions
+ about the WeeChat IRC client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_faq.pl.html
+Files: /usr/share/doc/weechat-doc/weechat_faq.pl.html
@@ -0,0 +1,10 @@
+Document: weechat-plugin-en
+Title: WeeChat plugins API (English)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html
+Files: /usr/share/doc/weechat-doc/weechat_plugin_api.en.html
@@ -0,0 +1,10 @@
+Document: weechat-plugin-fr
+Title: WeeChat plugins API (French)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html
+Files: /usr/share/doc/weechat-doc/weechat_plugin_api.fr.html
@@ -0,0 +1,9 @@
+Document: weechat-quickstart-de
+Title: WeeChat Quickstart (German)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (German version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_quickstart.de.html
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.de.html
@@ -0,0 +1,12 @@
+Document: weechat-quickstart-en
+Title: WeeChat Quickstart (English)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (English version).
+Section: Network/Communication
+
+Format: text
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.en.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_quickstart.en.html
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.en.html
@@ -0,0 +1,12 @@
+Document: weechat-quickstart-fr
+Title: WeeChat Quickstart (French)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (French version).
+Section: Network/Communication
+
+Format: text
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.fr.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.fr.html
@@ -0,0 +1,9 @@
+Document: weechat-quickstart-pl
+Title: WeeChat Quickstart (Polish)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.pl.html
@@ -0,0 +1,9 @@
+Document: weechat-quickstart-ru
+Title: WeeChat Quickstart (Russian)
+Author: Sebastien Helleu
+Abstract: A short HowTo for new WeeChat users (Russian version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html
+Files: /usr/share/doc/weechat-doc/weechat_quickstart.ru.html
@@ -0,0 +1,10 @@
+Document: weechat-scripting-en
+Title: WeeChat Scripting Guide (English)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_scripting.en.html
+Files: /usr/share/doc/weechat-doc/weechat_scripting.en.html
@@ -0,0 +1,10 @@
+Document: weechat-scripting-fr
+Title: WeeChat Scripting Guide (French)
+Author: Sebastien Helleu
+Abstract: This document describes the API to create scripts
+ for WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_scripting.fr.html
+Files: /usr/share/doc/weechat-doc/weechat_scripting.fr.html
@@ -0,0 +1,13 @@
+Document: weechat-tester-en
+Title: WeeChat Tester's Guide (English)
+Author: Sebastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (English version).
+Section: Network/Communication
+
+Format: text
+Files: /usr/share/doc/weechat-doc/weechat_tester.en.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_tester.en.html
+Files: /usr/share/doc/weechat-doc/weechat_tester.en.html
@@ -0,0 +1,13 @@
+Document: weechat-tester-fr
+Title: WeeChat Tester's Guide (French)
+Author: Sebastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (French version).
+Section: Network/Communication
+
+Format: text
+Files: /usr/share/doc/weechat-doc/weechat_tester.fr.txt.gz
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_tester.fr.html
+Files: /usr/share/doc/weechat-doc/weechat_tester.fr.html
@@ -0,0 +1,10 @@
+Document: weechat-tester-pl
+Title: WeeChat Tester's Guide (Polish)
+Author: Sebastien Helleu
+Abstract: This document describes how to test and report
+ bugs against the WeeChat IRC Client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_tester.pl.html
+Files: /usr/share/doc/weechat-doc/weechat_tester.pl.html
@@ -0,0 +1,10 @@
+Document: weechat-user-en
+Title: WeeChat User's Guide (English)
+Author: Sebastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (English version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_user.en.html
+Files: /usr/share/doc/weechat-doc/weechat_user.en.html
@@ -0,0 +1,10 @@
+Document: weechat-user-fr
+Title: WeeChat User's Guide (French)
+Author: Sebastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/weechat_user.fr.html
+Files: /usr/share/doc/weechat-doc/weechat_user.fr.html
@@ -1 +1 @@
-usr/share/doc/weechat usr/share/doc/weechat-doc
+usr/share/doc/weechat/* usr/share/doc/weechat-doc
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +21,13 @@ IF(NOT DISABLE_DOC)
  IF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
    ADD_SUBDIRECTORY( en )
    ADD_SUBDIRECTORY( fr )
+    ADD_SUBDIRECTORY( pl )
+    ADD_SUBDIRECTORY( de )
+    ADD_SUBDIRECTORY( ru )
+    ADD_SUBDIRECTORY( ja )
+    ADD_SUBDIRECTORY( it )
  ENDIF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)

 ENDIF(NOT DISABLE_DOC)

-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION share/man/man1)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${SHAREDIR}/man/man1)
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #

-SUBDIRS = . en fr
+SUBDIRS = . en fr pl de ru ja it

 man_MANS = weechat-curses.1

@@ -0,0 +1,48 @@
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
+#
+# This program 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 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# FAQ
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+  DEPENDS
+  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+  COMMENT "Building weechat_faq.de.html"
+)
+ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+# quickstart
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+  DEPENDS
+  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+  COMMENT "Building weechat_quickstart.de.html"
+)
+ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+# tester's guide
+ADD_CUSTOM_COMMAND(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+  DEPENDS
+  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+  COMMENT "Building weechat_tester.de.html"
+)
+ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
@@ -0,0 +1,49 @@
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
+#
+# This program 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 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+docdir = $(datadir)/doc/$(PACKAGE)
+
+EXTRA_DIST = CMakeLists.txt \
+		weechat_faq.de.txt \
+		weechat_quickstart.de.txt \
+		weechat_tester.de.txt
+
+all-local: weechat_faq.de.html \
+		weechat_quickstart.de.html \
+		weechat_tester.de.html
+
+# FAQ
+weechat_faq.de.html: weechat_faq.de.txt
+	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_faq.de.html weechat_faq.de.txt
+
+# quickstart
+weechat_quickstart.de.html: weechat_quickstart.de.txt
+	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_quickstart.de.html weechat_quickstart.de.txt
+
+# tester's guide
+weechat_tester.de.html: weechat_tester.de.txt
+	$(ASCIIDOC) -a toc -a toc-title='Inhaltsverzeichnis' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_tester.de.html weechat_tester.de.txt
+
+# install docs
+
+install-data-hook:
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/
+	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/
+
+# clean
+
+clean-local:
+	-rm -f *.html
@@ -0,0 +1,378 @@
+WeeChat FAQ (Frequently Asked Questions)
+========================================
+FlashCode <flashcode@flashtux.org>
+
+
+Allgemein
+---------
+
+
+[[why_choose_weechat]]
+Weshalb WeeChat? - X-Chat und Irssi sind sehr gut...
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Weil WeeChat schlank ist und neue Funktionen besitzt.
+Einige Funktionen (Version > = 0.3.x):
+
+* Unterstützung mehrerer Protokolle durch Erweiterungen (IRC, Jabber)
+* mehrere Remote GUIs als Ergänzung zu Curses (in Kürze)
+* in mehreren Sprachen verfügbar
+* Erweiterungsfähig durch Erweiterungen (C, Perl, Python, Ruby, Lua, Tcl)
+* Buffer mit unabhängigem Inhalt
+* Filterung der Anzeige mittels Tags und regulären Ausdrücken
+* horizontale und vertikale Teilung der Fenster
+* anpass- und erweiterbare Leisten
+* Nickliste in allen GUI's verfügbar
+* inkrementelle Textsuche in Buffern, zu Highlights springen
+* FIFO Pipe für Fernsteuerung
+* Unterstützung für Aspell
+* Doppelter Zeichensatz (Kodierung/Dekodierung)
+* Neuentwicklung (basiert auf keinem anderem Programm)
+* Lauffähig auf einer Vielzahl von Plattformen
+* 100% GPL und Frei
+
+Weitere Informationen gibt es auf der folgenden Internetseite:
+http://www.weechat.org/features
+
+
+Kompilierung / Installation
+---------------------------
+
+
+[[gui]]
+Ich habe gehört, es gibt mehrere GUIs für WeeChat. Wie kann ich diese kompilieren bzw nutzen?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Zur Zeit ist nur die GUI für Curses verfügbar.
+
+Andere GUIs (zur Zeit in der Entwicklung) werden als Remote Clients verfügbar
+sein.
+
+
+[[compile_git]]
+Ich kann WeeChat nach Cloning des git Repository nicht kompilieren - warum?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Der empfohlene Weg WeeChat zu komilieren ist die Nutzung von cmake.
+
+Falls Du mit Hilfe der autotools kompilierst (also nicht cmake), stelle sicher,
+dass Du die neueste Version von autoconf und automake besitzt (WeeChat wird mit
+autoconf 2.61 und automake 1.10.1 entwickelt).
+
+Der andere Weg ist, das "Entwickler-Paket" zu installieren, dieses hat weniger
+Abhängigkeiten. Dieses Paket wird quasi täglich aus dem git Repository erstellt.
+Beachte, dass dieses Paket nicht immer exakt mit dem git Repository übereinstimmt
+und daher auch weniger brauchbar sein kann als wenn man selbst das Repository
+klont und daraus Updates installiert.
+
+
+WeeChat anwenden
+----------------
+
+
+[[lost]]
+Ich habe WeeChat gestartet, komme aber nicht mehr weiter - was kann ich tun?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Um Hilfe zu erhalten, gebe `/help` ein. Hilfe zu einem Befehl erhälst Du durch
+die Eingabe von: `help Befehlsname`. 
+Befehle sowie die Belegung der jeweiligen Tasten sind in der Dokumentation
+aufgeführt.
+FIXME: (Tip: Mit den Tasten <Bild-hoch>/<Bild-runter> kannst Du die Anzeige
+scrollen)
+
+Neue Benutzer sollten unbedingt die 'quickstart'-Anleitung lesen (siehe
+Dokumentation auf der Internetseite).
+
+
+[[buffer_vs_window]]
+Ich habe von "Buffern" und "Fenstern" gehört - was ist der Unterschied?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ein 'Buffer' besteht aus einer Nummer, einem Namen, anzuzeigenden Zeilen (und
+anderen Daten)
+
+Ein 'Fenster' ist ein Bildschirmbereich der Buffer darstellt. Es ist möglich
+den Bildschirm in mehrere Fenster aufzuteilen.
+
+Jedes Fenster stellt einen Buffer dar. Ein Buffer kann unsichtbar sein (er wird
+nicht durch ein Fenster angezeigt), oder durch ein sowie mehrere Fenster
+angezeigt werden.
+
+
+[[charset]]
+Teilweise fehlen bei Zeichen die Akzente, was kann ich tun?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dies ist ein bekanntes Problem, bitte lese nachfolgendes sorgfältig und
+prüfe *alle* aufgezeigten Lösungsmöglichkeiten.
+
+Für Versionen < 0.2.3, bitte auf die neueste stabile Version upgraden.
+
+Für Versionen > = 0.2.3:
+
+* prüfe, dass weechat-curses mit libncursesw gelinkt ist (Warnung: nötig bei den
+  meißten Distributionen - jedoch nicht bei allen):
+  `ldd /path/to/weechat-curses`
+* prüfe mit dem Befehl `/plugin`, dass die "Charset" Erweiterung geladen ist (falls
+  nicht, benötigst Du wahrscheinlich noch das Paket "weechat-plugins")
+* prüfe die Ausgabe des Befehls /charset (auf dem Server-Buffer). Du solltest
+  'ISO-XXXXXX' oder 'UTF-8' für den Terminal Zeichensatz sehen. Falls Du
+  'ANSI_X3.4-1968' oder andere Werte siehst, ist Deine Einstellung der locale
+  möglicherweise falsch.
+* setzen des globalen decode Wertes, z.B.:
+** WeeChat < = 0.2.6: `/setp charset.global.decode = ISO-8859-15`
+** WeeChat > = 0.3.x: `/set charset.default.decode "ISO-8859-15"`
+* Falls Du UTF-8 locale nutzt:
+** prüfe, ob Dein Terminal UTF-8 fähig ist (der empfohlene Terminal für UTF-8
+   ist rxvt-unicode)
+** Solltest Du screen nutzten, prüfe ob er im UTF-8 Modus läuft
+   ("`defutf8 on`" in der Datei ~/.screenrc oder `screen -U` zum Sarten von
+   screen)
+
+[NOTE]
+Die Nutzung der UTF-8 locale wird für WeeChat empfohlen. Nutzt Du jedoch ISO
+oder andere locale, bitte vergewissere Dich dann, dass *alle* Deine
+Einstellungen (Terminal, screen, ...) sich auch auf ISO beziehen und *nicht* auf
+UTF-8.
+
+
+[[bars_background]]
+Leisten, z.B. Titel und Status sind nicht ausgefüllt, die Hintergrundfarbe endet direkt nach dem Text, warum?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dies kann durch einen falschen Wert der Variablen TERM Deiner Shell verursacht
+werden (schaue Dir die Ausgabe von `echo $TERM` in Deinem Terminal an).
+
+Abhängig davon wo Du WeeChat startest, solltest Du folgenden Wert haben:
+
+* falls WeeChat lokal oder auf einem entfernten Rechner läuft, je nach benutztem
+  Terminal: 'xterm', 'rxvt', ...
+* falls WeeChat unter screen läuft, sollte der Wert 'screen' sein.
+
+Wenn nötig korrigiere den Wert Deiner Variablen TERM: `export TERM="xxx"`.
+
+
+[[screen_weird_chars]]
+Wenn ich Weechat unter screen nutze, habe ich merkwürdige Zeichen, wie kann ich dies beheben?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dies kann durch einen falschen Wert der Variablen TERM Deiner Shell verursacht
+werden (schaue Dir die Ausgabe von `echo $TERM` in Deinem Terminal an).
+
+Als Beispiel, 'xterm-color' könnte solche merkwürdigen Zeichen produzieren,
+nutzte stattdessen 'xterm' - die ist ok (wie mehrer andere Werte).
+
+Wenn nötig korrigiere den Wert Deiner Variablen TERM: `export TERM="xxx"`.
+
+
+[[key_bindings]]
+Wie kann ich die Tastaturbelegung anpassen?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Die Tasten werden mit dem Befehl /key belegt.
+
+Per Voreinstellung kannst Du mit der Tastenkombination Meta-k (normal Alt-k) den
+Code der jeweiligen Taste herausfinden und in die Eingabezeile einfügen.
+
+
+[[openbsd_plugins]]
+Ich benutze BSD, und WeeChat lädt keine Erweiterungen - warum?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Unter BSD Enden die Dateinamen der Erweiterungen mit ".so.0.0" (".so" bei Linux).
+
+Um dies zu beheben muss folgendes konfiguriert werden:
+
+* WeeChat < = 0.2.6: +
+  `/set plugins_extension = ".so.0.0"`
+* WeeChat > = 0.3.x: +
+  `/set weechat.plugin.extension ".so.0.0"`
+
+Danach: `/plugin autoload`.
+
+
+[[scripts]]
+Wie kann ich Perl/Python/Ruby/Lua/Tcl Skripten laden? Sind Skripten kompatibel zu anderen IRC-Clients?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Benutze die Befehle: `/perl`, `/python`, `/ruby`, `/lua` und `/tcl` um Skripten
+zu laden (Voreingestellter Pfad zu den Skripten: '~/.weechat/<Skriptsprache>/').
+
+Die Skripten sind mit den anderer IRC-Clients nicht kompatibel.
+
+Anmerkung:
+
+* Skripten, die sich unter '~/.weechat/<Skriptsprache>/autoload/' befinden, werden
+  beim Start von WeeChat automatisch geladen.
+* Eine 'tcl' Erweiterung ist ab version > = 0.3.x verfügbar.
+
+
+[[change_locale_without_quit]]
+Ich möchte die Sprache der Meldungen, die WeeChat ausgibt, ändern ohne WeeChat zu verlassen. Ist dies möglich?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ja, dazu kannst Du das Python-Skript shell.py verwenden (erhältlich auf der
+Internetseite). Nach dem laden des Skripts führe folgende Befehle aus:
+
+  /shell setenv LANG=en_US.UTF-8
+  /upgrade
+
+Hierdurch erhält man für das Terminal englische, UTF-8 kodierte Meldungen.
+Benutzer von ISO-Kodierungen können folgendes eingeben:
+`/shell setenv LANG=en_US`.
+
+
+[[terminal_copy_paste]]
+Wie kann ich einen Text kopieren und einfügen ohne das die Nickliste auch eingefügt wird?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Du kannst hierzu ein Terminal nutzen, welches Block-Selektierung erlaubt
+(wie rxvt-unicode, konsole, gnome-terminal, ...). Im Normalfall erfolgt diese
+mittels der Tasten ctrl + alt in Verbindung mit der Auswahl durch die Maus.
+
+Eine andere Lösung ist, die Nickliste nach oben oder unten zu verschieben, z.B.:
+
+* WeeChat < = 0.2.6: +
+  `set look_nicklist_position = top`
+* WeeChat > = 0.3.x: +
+  `/bar set nicklist position top`
+
+
+[[urls]]
+Wie kann ich eine URL aufrufen, die einen Zeilenumbruch besitzt?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Da WeeChat sowohl die Uhrzeit als auch einen Präfix für jede Zeile darstellt und
+man optional auch noch Bars nutzen kann, die das Chatfenster zusätzlich
+verkleinern, kann es passieren das sehr lange URLs abgeschnitten und nicht mehr
+aufgerufen werden können.
+
+Deshalb sollte man eines der folgenden Skripten nutzen:
+
+urlbar.py::
+    stellt die URL in einer Bar dar.
+
+urlgrab.py::
+    protokolliert URLs und öffnet diese im Standardbrowser.
+
+url_shorten.rb::
+tinyurl.py::
+shortenurl.py::
+    URLs werden durch einen Internet-Dienst gekürzt.
+
+Liste der Skripten die sich mit URLs befassen: http://www.weechat.org/scripts/stable/tag/url
+
+
+[[highlight_notification]]
+Wie kann ich informiert werden, wenn jemand in einem Channel highlightet
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+((A.d.Ü) highlight bedeutet, dass der eigene Nick z.B. im Channel genannt wird,
+der Nick dessen der ihn schrieb wird farblich hervorgehoben)
+
+Abhängig der WeeChat Version:
+
+* WeeChat < = 0.2.6: nutze das Skript 'sound.pl' (verfügbar auf der Skript-Site),
+  und nehme Einstellungen für einen System-Befehl (um einen Klang zu spielen,
+  eine Meldung anzuzeigen, ...) mit folgendem Befehl vor: +
+  `/setp perl.sound.cmd_highlight = "/path/to/command arguments"`
+* WeeChat > = 0.3.x: nutze das Skript 'launcher.pl' (verfügbar auf der Skript-Site),
+  und nehme Einstellungen für einen System-Befehl (um einen Klang zu spielen,
+  eine Meldung anzuzeigen, ...) mit folgendem Befehl vor: +
+  `/set plugins.var.perl.launcher.signal.weechat_highlight "/path/to/command arguments"`
+
+Es gibt noch andere Skripten, die über solche Ereignisse informieren , bitte
+besuche dazu die Skripten-Webseite: http://www.weechat.org/scripts/
+
+
+[[filter_irc_join_part_quit]]
+Wie kann ich join/part/quit Meldungen der IRC Channels filtern (A.d.ü.: unterdrücken)?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Entsprechend der WeeChat-Version:
+
+* WeeChat < = 0.2.6: +
+  `/ignore * join #weechat freenode` +
+  `/ignore * part #weechat freenode` +
+  `/ignore * quit #weechat freenode` +
+  (Channel und/oder Server können durch "*" ersetzt werden, Hilfe mit: `/help ignore`)
+
+* WeeChat > = 0.3.x:
+
+** Intelligenter Filter (erhalte join/part/quit der User, mit denen Du kürzlich gesprochen hast): +
+   `/set irc.look.smart_filter on` +
+   `/filter add irc_smart * irc_smart_filter *` +
+   (Hilfe mit: `/help irc.look.smart_filter` und `/help filter`)
+
+** globaler Filter (unterdrückt *alle* join/part/quit): +
+   `/filter add jpk * irc_join,irc_part,irc_quit *` +
+   (Hilfe mit: `/help filter`)
+
+[[ignore_vs_filter]]
+Was ist der Unterschied zwischen den Befehlen /ignore und /filter?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Der Befehl `/ignore` ist ein IRC-Befehl und beeinflußt somit nur die IRC-Buffer
+(Server und Channel).
+Durch den Befehl kann man bestimmte Nicks oder Hostnamen von Usern eines Servers oder
+Channels ignorieren (Der Befehl wird nicht auf den Inhalt der Meldung angewandt).
+Passende Meldungen werden von dem IRC-Plugin vor der Anzeige gelöscht (Du wirst
+sie niemals zu Gesicht bekommen).
+
+Der Befehl `/filter` ist ein Kern-Befehl (A.d.Ü.: wird in WeeChat ausgeführt und
+nicht an den Server gesendet) und beeinflußt somit jeden Buffer.
+Dieser Befehl eröffnet die Möglichkeit bestimmte Zeilen in Buffern, mittels Tags und
+regulären Ausdrücken nach Präfix und Zeileninhalt zu filtern.
+Gefilterte Zeilen werden nur unsichtbar - nicht gelöscht. Sehen kannst Du sie
+wenn Du den Filter deaktivierst (Voreinstellung zum Aktivieren/Deaktivieren der
+Filter: Alt-Taste + "=").
+
+
+Entwicklung
+-----------
+
+
+[[bug_task_patch]]
+Was mache ich um Fehler zu melden, nach neuen Funktionen zu fragen oder Patches einzusenden?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Es gibt drei Möglichkeiten:
+
+. Du kannst zu uns in den IRC kommen: 'irc.freenode.net', channel '#weechat'
+. Du kannst die Internetseite savannah nutzen:
+  * Fehler melden: https://savannah.nongnu.org/bugs/?group=weechat
+  * Nach einer neuen Funktion fragen: https://savannah.nongnu.org/task/?group=weechat
+  * Patch senden: https://savannah.nongnu.org/patch/?group=weechat
+. Du kannst den Entwicklern mailen, entsprechende Mail-Adressen auf der Supportseite:
+  http://www.weechat.org/about
+  (Um emails an die "support" Mailing-Liste zu schicken, kannst Du diese abonnieren)
+
+
+[[supported_os]]
+Auf welchen Plattformen läuft WeeChat? Wird es noch auf anderen Betriebssystemen portiert?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Die gesamte Liste gibt es unter: http://www.weechat.org/download
+
+Wir geben unser Bestes um WeeChat auf möglichst vielen Plattformen lauffähig zu
+machen. Um WeeChat auf Betriebssystemen zu testen, zu denen wir keinen Zugang
+haben, ist Hilfe willkommenen.
+
+
+[[help_developers]]
+Ich möchte den Entwicklern von WeeChat helfen. Was kann ich tun?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Es gibt einiges zu tun z.B. Testen, Programmieren, Dokumentation, ...
+
+Bitte kontaktiere uns via IRC oder email, schaue auf die Support-Seite:
+http://www.weechat.org/about
+
+
+[[donate]]
+Kann ich Geld oder Anderes an die Entwickler von WeeChat spenden? 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Du kannst uns Geld zur Unterstützung der weitern Entwicklung spenden.
+Details hierzu gibt es auf: http://www.weechat.org/donate
@@ -0,0 +1,265 @@
+WeeChat Quick Start Guide
+=========================
+FlashCode <flashcode@flashtux.org>
+
+
+[[start]]
+Start von WeeChat
+-----------------
+
+Der bevorzugte Terminal-Emulator für X (aber nicht obligatorisch) ist
+rxvt-unicode (er hat eine gute Unterstützung für UTF-8 und keine Probleme mit der
+Standard Tastaturbelegung).
+
+Starte "weechat-curses" aus Deiner shell.
+
+
+[[help_options]]
+Online-Hilfe / Optionen
+-----------------------
+
+WeeChat enthält Hilfetexte für alle Befehle, erreichbar über `/help`.
+Um Hilfe zu einen bestimmten Befehl zu bekommen kann man einfach `/help Befehl`
+ausführen.
+
+Um Optionen zu setzen benutzt man `/set config.section.option value`.
+(dabei ist 'config' der Konfigurationsname ('weechat' für den Kern von weechat,
+oder ein Plugin-Name), 'section' ein Abschnitt dieser Konfiguration und 'option'
+der Name der Option).
+
+WeeChat benutzt den neuen Wert sofort (*Niemals* muss WeeChat neu gestartet
+werden nach dem die Konfiguration geändert wurde).
+
+Du kannst die Option `/set` mit teilweise ausgeschriebenen Namen und dem
+Platzhalter "*" am Beginn oder Ende verwenden um alle Optionen anzuzeigen, die
+die Zeichenkette enthalten.
+
+Zum Beispiel:
+
+`/set`::
+    Anzeige aller Optionen (WeeChat und Plugins)
+
+`/set weechat.*`::
+    Anzeige der WeeChat Optionen
+
+`/set irc.*`::
+    Anzeige der Optionen des IRC-Plugins
+
+Du kannst mit `/help` Hilfe für Optionen auflisten lassen, z.B.:
+`/help weechat.look.highlight`.
+
+Beim beenden von WeeChat werden alle Einstellungen gespeichert (mittels `/save`
+kann das Schreiben der Optionen erzwungen werden).
+
+Konfigurations-Dateien (*.conf) können auch per Hand editiert und mit dem Befehl
+`/reload` neu eingelesen werden (falls man z.B. den `/set` Befehl nicht
+verwenden möchte).
+
+
+[[core_vs_plugins]]
+Kern (Core) vs Plugins
+----------------------
+
+Der Kern (core) von WeeChat ist ausschließlich dazu da, Daten auf dem Bildschirm
+darzustellen um mit dem Benutzer zu interagieren, dies bedeutet, WeeChat an sich
+-also nur WeeChat core- ohne jegliche Plugins ist unbrauchbar.
+(an die treuen User: IRC war ein Teil des Kerns bei Versionen <= 0.2.6)
+
+Alle Netzwerkprotokolle, z.B. IRC, werden als separates Plugin bereit gestellt.
+
+Benutze den Befehl `/plugin` um alle Plugins aufzulisten, "irc" sowie andere
+Plugins sollten aufgelistet werden.
+
+
+[[create_irc_server]]
+Einen IRC-Server erstellen
+--------------------------
+
+Du kannst einen IRC-Server mit dem Befehl `/server` hinzufügen, z.B.:
+
+  /server add oftc irc.oftc.org/6667
+
+Wie immer, wenn Du nicht mehr weiter weißt, kannst Du mit `/help server` Hilfe
+erlangen.
+
+
+[[irc_server_options]]
+Setzen eigener IRC-Server Optionen
+----------------------------------
+
+WeeChat verwendet Vorgabewerte für alle Server (so genannte "fall backs") falls
+Du keine eigenen Werte für entsprechende Server-Optionen bestimmst.
+Diese Vorgabeoptionen sind "irc.server_default.*". 
+
+Für jede Server-Option benutzt WeeChat den entsprechend gesetzten Wert - falls
+definiert (nicht "null"). Andernfalls verwendet WeeChat Vorgabewerte
+("irc.server_default.xxx"). 
+
+Als Beispiel erwähnt seien die Vorgabe (default) nicks, die auf dem Un*x Login
+basieren. Diese können nun für oftc-Server mittels folgendem Befehl
+überschrieben werden:
+
+  /set irc.server.oftc.nicks "mynick1,mynick2,mynick3,mynick4,mynick5"
+
+Um den User-Namen und wirklichen Namen zu setzen:
+
+  /set irc.server.oftc.username "Mein User-Name"
+  /set irc.server.oftc.realname "Mein wirklicher Name"
+
+Aktivieren des automatischen Verbindens mit dem Server beim Start von WeeChat:
+
+  /set irc.server.oftc.autoconnect on
+
+Um einen Befehl nach der Verbindung zum Server auszuführen, z.B. identifizieren
+beim nickserv:
+
+  /set irc.server.oftc.command "/msg nickserv identify xxxxxx"
+
+Hinweis: Mehrere Befehle können mittels ';' (Semikolon) getrennt werden.
+
+Um ein auto-join (automatisches 'betreten') von Channels (Räumen) nach der
+Verbindung zum Server zu erreichen:
+
+  /set irc.server.oftc.autojoin "#channel1,#channel2"
+
+Um einen Wert der Server-Optionen zu entfernen und stattdessen wieder den
+Vorgabewert (default) zu nutzen, z.B. Nutzung der Vorgabe-Nicks
+(irc.server_default.nicks):
+
+  /set irc.server.oftc.nicks null
+
+Andere Optionen: Du kannst andere Optionen mit folgendem Befehl setzen ("xxx"
+ist der Optionsname):
+
+  /set irc.server.oftc.xxx value
+
+
+[[connect_to_irc_server]]
+Verbinden mit dem IRC-Server und auto-join der Channel
+------------------------------------------------------
+
+  /connect oftc
+
+[NOTE]
+Dieser Befehl kann dazu benutzt werden um einen neuen Server zu erstellen und
+sich mit ihm zu verbinden ohne den Befehl `/server` zu benutzen (sollte ich
+wiederholen, dass Du die Hilfe zu diesem Befehl mit `/help connect` aufrufen
+kannst?).
+
+Generell werden die Server-Puffer und der Puffer des Kerns von WeeChat -der
+core-Puffer- zusammengelegt. Um zwischen den core-Puffer und den Server-Puffern
+umzuschalten kannst Du ctrl-X benutzen.
+
+Es ist möglich das automatische Zusammenlegen der Server-Puffer zu deaktivieren
+um eigenständig Puffer zu haben:
+
+  /set irc.look.server_buffer independent
+
+
+[[join_part_irc_channels]]
+Betreten/verlassen der IRC-Channel
+----------------------------------
+
+`/join #channel`::
+    Einen Channel betreten
+
+`/part [quit message]`::
+    Einen Channel verlassen (der Puffer bleibt geöffnet)
+
+`/close [quit message]`::
+    Schließen eines Server- oder Channel-Puffers (`/close` ist ein Alias für `/buffer close`)
+
+
+[[buffer_window]]
+Puffer/Fenster Verwaltung
+-------------------------
+
+Ein Puffer ist eine, zu einem Plugin mit einer Nummer, einer Kategorie und einem
+Namen, verbundene Komponente. Ein Puffer beinhaltet die auf dem Bildschirm
+dargestellten Daten.
+
+Ein Fenster ist die Ansicht eines Puffers. Standard ist ein Fenster, das einen
+Puffer darstellt. Wenn Du den Bildschirm aufteilst, wirst Du mehrere Fenster mit
+mehreren Puffer gleichzeitig sehen.
+
+Befehle, welche Puffer und Fenster verwalten:
+
+  /buffer
+  /window
+
+(Ich will jetzt nicht wiederholen, dass Du zu diesen Befehlen Hilfe mit /help
+erhalten kannst)
+
+Ein Beispiel, um Deinen Bildschirm vertikal in ein kleines Fenster (1/3 Höhe)
+und ein großes Fenster (2/3 Höhe) aufzuteilen, benutze diesen Befehl:
+
+  /window splitv 33
+
+
+[[key_bindings]]
+Tastaturbelegung
+----------------
+
+WeeChat verwendet viele Standardtasten. Alle diese Belegungen sind in der
+Dokumentation beschrieben, doch solltest Du mindestens einige wesentliche
+Belegungen kennen:
+
+- 'alt + linker/rechter Pfeil' (oder 'F5'/'F6'): umschalten zum
+  vorherigen/nächsten Puffer
+- 'F7'/'F8': umschalten zum vorherigen/nächsten Fenster (falls der Bildschirm
+  aufgeteilt ist)
+- 'F9'/'F10': scrolle die Titleleiste
+- 'F11'/'F12': scrolle die Liste der Nicks
+- 'tab': komplettiere den Text in der Eingabeleiste, ähnlich Deiner shell
+- 'Seite rauf/runter': scrolle den Text im aktiven Puffer
+- 'alt + A': springe zum Puffer mit Aktivität (aus der Hotlist)
+
+Gemäß Deiner Tastatur und/oder Deinen Bedürfnissen kannst Du jede Taste mittels
+des Befehls `/key` neu mit einem Befehl belegen. 
+Eine nützliche Tastenkombination um Tastencodes zu ermitteln ist meta-k (alt-k).
+
+Beispiel, Belegung von meta-y (alt-y) mit dem Befehl `/buffer close`:
+
+  /key bind (drücke meta-k) (drücke meta-y) /buffer close
+
+Du wirst folgende Befehlszeile erhalten:
+
+  /key bind meta-y /buffer close
+
+Entfernen der Belegung:
+
+  /key unbind meta-y
+
+
+[[plugins_scripts]]
+Plugins/Scripte
+---------------
+
+Bei einige Distributionen wie Debian, sind Plugins über separate Pakete
+erhältlich (z.B. weechat-plugins).
+Plugins werden -falls gefunden- automatisch geladen (Bitte beachte die
+Dokumentation zum Laden/Entladen von Plugins oder Skripten).
+
+Einige Plugins ermöglichen die Verwendung von Scripten in WeeChat (in mehreren
+Sprachen wie Perl, Python, Ruby, Lua und TCL). Diese Plugins müssen mit dem
+Befehl `/plugin` geladen werden und verfügen ihrerseits über Befehle wie z.B.
+`/perl` um Scripte zu laden.
+
+Viele externe Plugins/Scripte (der Mitarbeitenden) sind für WeeChat verfügbar,
+siehe: http://www.weechat.org/scripts
+
+Der einfachste Weg um Scripte zu installieren ist die verwendung von 'weeget.py':
+
+. herunterladen und kopieren von 'weeget.py' nach ~/.weechat/python/autoload/
+. laden des  Scriptes: `/python autoload`
+. Liste der Scripte: `/weeget list` (Hilfe mit: `/help weeget`)
+
+
+[[more_doc]]
+Weitere Dokumentation
+---------------------
+
+Nun kannst Du WeeChat nutzen, für weitere Fragen lese die FAQ/Dokumentation:
+http://www.weechat.org/doc
+
+Viel Spass mit WeeChat!
@@ -0,0 +1,146 @@
+WeeChat Tester's Guide
+======================
+FlashCode <flashcode@flashtux.org>
+
+
+[[purpose]]
+Intention
+---------
+
+Viele dankbare Anwender fragen uns wie sie bei der Entwicklung von WeeChat
+helfen können. Der einfachste (aber auch der kniffligste) Weg uns zu helfen ist:
+Testen!
+
+Testen ist ein sehr wichtiger Teil der Programmentwicklung und sollte daher
+nicht unterbewertet werden. Wenn neue Features implementiert wurden, sollten sie
+getestet werden. Für einige Features gibt es aber zu viele Möglichkeiten - oder
+diese Möglichkeiten sind komplex und die Entwickler können nicht jede Variante
+ausprobieren.
+
+Ein Beispiel: Ein berüchtigtes Zeichensatz-Plugin wurde in WeeChat 0.2.2
+eingeführt: Keiner von uns (Entwickler, Mithelfende und Tester) nutzen Channels
+in den länderspezifische Zeichen in den Namen vorkamen, und als 0.2.2
+freigegeben wurde, wurden wir überschwemmt von russischen Usern, die uns dies
+vorwarfen. Hätten wir mehr Tester, dann  sollte so etwas nicht mehr passieren.
+
+Eine stabile Version von WeeChat zu testen ist nutzlos, da die Entwickler
+die ganze Zeit fleißig neues Zeug implementieren (und alte Bugs fixen).
+
+
+[[prepare_system]]
+Bereite Dein System vor
+-----------------------
+
+Sehr helfen würde uns, wenn Du Linuxs 'core' Dateien aktivieren würdest: wenn
+WeeChat crasht wird Linux eine Datei Namens 'core' erzeugen. Diese Datei
+beinhaltet viele nützliche Debug-Informationen um das genaue Problem in WeeChat
+zu lokalisieren.
+
+Falls Du die 'bash' als shell benutzt, ergänze Deine `~/.bashrc` mit folgender
+Zeile:
+
+  ulimit -c unlimited
+
+
+[[download]]
+Besorge Dir die Entwickler-Version
+----------------------------------
+
+Frischer Code (mit den letzten Bugs und Features) ist im GIT Repository
+gespeichert.
+
+Du könntest Dich ja dazu entscheiden es manuell zu bauen (empfohlen):
+
+* die GIT Version kann parallel zur stabilen Version gebaut und installiert
+  werden.
+* Du benötigst keine Root-Rechte, und opfern brauchst Du Deine stabile Version
+  von WeeChat auch nicht. 
+
+[[get_sources]]
+Beschaffe und baue die Quellen
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Erstelle zuerst einen neuen Ordner, z.B. 'weechat-git':
+
+---------------------
+$ mkdir ~/weechat-git
+$ cd ~/weechat-git
+---------------------
+
+Falls Du git installiert hast, clone das git Repository (empfohlen):
+
+--------------------------------------------
+$ git clone git://git.sv.gnu.org/weechat.git
+$ cd weechat
+--------------------------------------------
+
+NOTE: Um auf den neuesten Stand zukommen verwendest Du z.B. "`git pull`" in
+diesem Ordner.
+
+Ansonsten kannst Du das 'Entwickler-Paket' herunterladen und entpacken:
+
+-----------------------------------------------------------------
+$ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2
+$ tar xvjf weechat-devel.tar.bz2
+$ cd weechat-devel
+-----------------------------------------------------------------
+
+Um die Quellen zu übersetzen, wird cmake empfohlen:
+
+--------------------------------------------------------------
+$ mkdir build
+$ cd build
+$ cmake .. -DPREFIX=$HOME/weechat-git -DCMAKE_BUILD_TYPE=Debug
+$ make
+$ make install
+--------------------------------------------------------------
+
+Falls Du cmake nicht hast, ist es auch möglich die autotools zu nutzen:
+
+----------------------------------------------------------
+$ ./autogen.sh       # (nur bei geklontem git Repository)
+$ ./configure --prefix=$HOME/weechat-git
+$ make
+$ make install
+----------------------------------------------------------
+
+[[install_binary_package]]
+Installieren des Programm-Paketes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Abhängig Deiner Linux Distribution:
+
+* Debian: http://debian.flashtux.org/
+* Gentoo: http://www.weechat.org/download
+* ArchLinux: PKGBUILD von http://aur.archlinux.org/
+* andere: Wissen wir nicht! Eheh.
+
+
+[[run]]
+WeeChat starten
+---------------
+
+Es wird empfohlen WeeChat durch die Option `--dir` mit einem anderen Ordner zu
+starten (nicht mit dem der stabilen Version).
+
+Die Befehlszeile lautet:
+
+  ~/weechat-git/bin/weechat-curses --dir ~/.weechat-dev
+
+Immer noch munter? Dann solltest Du jetzt das bekannte Interface sehen, und nun
+prahle vor Anderen, dass Du die neueste WeeChat-Version verwendest :)
+
+Solltest Du nun ein merkwürdiges Verhalten bemerken (es könnte Probleme machen
+oder crashen oder Dein Bier kochen) zögere nicht, komme in den Channel
+`#weechat` auf `irc.freenode.net` (A.d.Ü.: englischsprachig) und berichte uns
+darüber.
+
+Auch wenn es nicht crasht - gib uns trotzdem Bescheid, wir brauchen Deine
+Rückmeldung!
+
+[[links]]
+Nützliche Links
+---------------
+
+* GIT repository: http://git.savannah.gnu.org/gitweb/?p=weechat.git
+* Bug tracker: https://savannah.nongnu.org/bugs/?group=weechat
+* WeeChat commits RSS feed: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=rss
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008-2009 by FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2008-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #

-# Documentation generator for WeeChat: build XML include files with commands,
+# Documentation generator for WeeChat: build include files with commands,
 # options, infos and completions for WeeChat core and plugins.
 #
 # Instructions to build config files yourself in WeeChat directories (replace
@@ -26,7 +26,7 @@
 #           /set plugins.var.perl.docgen.path "~/src/weechat/doc"
 #     3.  run docgen command:
 #           /docgen
-# XML files should be in ~/src/weechat/doc/xx/autogen/ (where xx is language)
+# Files should be in ~/src/weechat/doc/xx/autogen/ (where xx is language)
 #
 # Script written on 2008-08-22 by FlashCode <flashcode@flashtux.org>
 #
@@ -53,7 +53,7 @@ my $version = "0.1";
 my $default_path = "~/src/weechat/doc";

 # list of locales for which we want to build XML doc files to include
-my @locale_list = qw(en_US fr_FR);
+my @locale_list = qw(en_US fr_FR it_IT);

 # all commands/options/.. of following plugins will produce a file
 # non-listed plugins will be ignored
@@ -75,10 +75,14 @@ my %plugin_list = ("weechat" => "co", "alias"   => "",
 my @ignore_options = ("aspell\\.dict\\..*",
                      "charset\\.decode\\..*",
                      "charset\\.encode\\..*",
+                      "irc\\.msgbuffer\\..*",
+                      "irc\\.ctcp\\..*",
+                      "irc\\.ignore\\..*",
                      "irc\\.server\\..*",
                      "jabber\\.server\\..*",
                      "logger\\.level\\..*",
                      "logger\\.mask\\..*",
+                      "relay\\.port\\..*",
                      "weechat\\.proxy\\..*",
                      "weechat\\.bar\\..*",
                      "weechat\\.debug\\..*",
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_user.en.html"
 )
 ADD_CUSTOM_TARGET(doc-user-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # plugin API reference
 ADD_CUSTOM_COMMAND(
@@ -36,7 +36,7 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_plugin_api.en.html"
 )
 ADD_CUSTOM_TARGET(doc-plugin-api-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # scripting guide
 ADD_CUSTOM_COMMAND(
@@ -47,7 +47,7 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_scripting.en.html"
 )
 ADD_CUSTOM_TARGET(doc-scripting-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # FAQ
 ADD_CUSTOM_COMMAND(
@@ -58,7 +58,7 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_faq.en.html"
 )
 ADD_CUSTOM_TARGET(doc-faq-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # quickstart
 ADD_CUSTOM_COMMAND(
@@ -69,7 +69,7 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_quickstart.en.html"
 )
 ADD_CUSTOM_TARGET(doc-quickstart-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # tester's guide
 ADD_CUSTOM_COMMAND(
@@ -80,4 +80,4 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_tester.en.html"
 )
 ADD_CUSTOM_TARGET(doc-tester-en ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1,7 +1,7 @@
 [width="65%",cols="^1,^2,8",options="header"]
 |========================================
 | Plugin | Name | Description
-| alias | alias | list of alias
+| alias | alias | list of aliases

 | aspell | aspell_langs | list of supported langs for aspell

@@ -11,20 +11,24 @@

 | irc | irc_channel_topic | topic of current IRC channel

-| irc | irc_channels | IRC channels (on all servers)
+| irc | irc_channels | channels on all IRC servers

 | irc | irc_ignores_numbers | numbers for defined ignores

 | irc | irc_msg_part | default part message for IRC channel

-| irc | irc_privates | IRC privates (on all servers)
+| irc | irc_privates | privates on all IRC servers

 | irc | irc_server | current IRC server

+| irc | irc_server_channels | channels on current IRC server
+
 | irc | irc_server_nick | nick on current IRC server

 | irc | irc_server_nicks | nicks on all channels of current IRC server

+| irc | irc_server_privates | privates on current IRC server
+
 | irc | irc_servers | IRC servers (internal names)

 | irc | nick | nicks of current IRC channel
@@ -35,6 +39,12 @@

 | python | python_script | list of scripts

+| relay | relay_free_port | first free port for relay plugin
+
+| relay | relay_protocol_name | all possible protocol.name for relay plugin
+
+| relay | relay_relays | protocol.name of current relays for relay plugin
+
 | ruby | ruby_script | list of scripts

 | tcl | tcl_script | list of scripts
@@ -1,7 +1,7 @@
 [width="65%",cols="^1,^2,8",options="header"]
 |========================================
 | Plugin | Name | Description
-| alias | alias | list of alias
+| alias | alias | list of aliases

 | irc | irc_channel | list of channels for an IRC server

@@ -13,17 +13,17 @@

 | logger | logger_buffer | list of logger buffers

-| lua | lua_script | list of lua scripts
+| lua | lua_script | list of scripts

-| perl | perl_script | list of perl scripts
+| perl | perl_script | list of scripts

-| python | python_script | list of python scripts
+| python | python_script | list of scripts

 | relay | relay | list of relay clients

-| ruby | ruby_script | list of ruby scripts
+| ruby | ruby_script | list of scripts

-| tcl | tcl_script | list of tcl scripts
+| tcl | tcl_script | list of scripts

 | weechat | bar | list of bars

@@ -9,6 +9,8 @@

 | irc | irc_nick | get current nick on a server

+| irc | irc_nick_color | get nick color
+
 | irc | irc_nick_from_host | get nick from IRC host

 | weechat | charset_internal | WeeChat internal charset
@@ -33,4 +35,8 @@

 | weechat | weechat_sharedir | WeeChat "share" directory

+| weechat | weechat_site | WeeChat site
+
+| weechat | weechat_site_download | WeeChat site, download page
+
 |========================================
@@ -3,13 +3,21 @@
 ........................................
  create an alias for a command

-  alias_name: name of alias
+  alias_name: name of alias (can start or end with "*" for alias listing)
     command: command name (many commands can be separated by semicolons)
   arguments: arguments for command
  
  Without argument, this command lists all defined alias.
  
-  Note: in command, special variables $1, $2,..,$9 are replaced by arguments given by user, and $* is replaced by all arguments.
-  Variables $nick, $channel and $server are replaced by current nick/channel/server.
+  Note: in command, special variables are replaced:
+          $n: argument 'n' (between 1 and 9)
+         $-m: arguments from 1 to 'm'
+         $n-: arguments from 'n' to last
+        $n-m: arguments from 'n' to 'm'
+          $*: all arguments
+          $~: last argument
+       $nick: current nick
+    $channel: current channel
+     $server: current server
 ........................................

@@ -4,7 +4,7 @@
 ** values: any string (default value: "ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic")

 * *aspell.check.default_dict*
-** description: default dictionary (or comma separated list of dictionaries) to use when buffer has no dictionary defined (leave blank to disable aspell on buffers for which you didn't explicitely enabled it)
+** description: default dictionary (or comma separated list of dictionaries) to use when buffer has no dictionary defined (leave blank to disable aspell on buffers for which you didn't explicitly enabled it)
 ** type: string
 ** values: any string (default value: "")

@@ -24,7 +24,7 @@
 ** values: 0 .. 2147483647 (default value: 2)

 * *aspell.look.color*
-** description: color used for mispelled words
+** description: color used for misspelled words
 ** type: color
 ** values: a color name (default value: lightred)

@@ -35,7 +35,7 @@
 &bull; *`/demo_printf`* `[text]`::

 ........................................
-  print some messages on current ubffer
+  print some messages on current buffer

  text: write this text
 ........................................
@@ -6,20 +6,39 @@
  target: server
 ........................................

-&bull; *`/ame`* `message`::
+&bull; *`/allchan`* `[-current] [-exclude=channel[,channel...]] command [arguments]`::

 ........................................
-  send a CTCP action to all channels of all connected servers
+  execute a command on all channels of all connected servers

-  message: message to send
+   -current: execute command for channels of current server only
+   -exclude: exclude some channels ('*' is allowed at beginning or end of channel name, to exclude many channels)
+    command: command to execute
+  arguments: arguments for command
+  
+  Examples:
+    execute '/me is testing' on all channels:
+      /allchan me is testing
+    say 'hello' everywhere but not on #weechat:
+      /allchan -exclude=#weechat msg * hello
+    say 'hello' everywhere but not on #weechat and channels beginning with #linux:
+      /allchan -exclude=#weechat,#linux* msg * hello
 ........................................

-&bull; *`/amsg`* `text`::
+&bull; *`/allserv`* `[-exclude=server[,server...]] command [arguments]`::

 ........................................
-  send message to all channels of all connected servers
+  execute a command on all connected servers

-  text: text to send
+   -exclude: exclude some servers ('*' is allowed at beginning or end of server name, to exclude many servers)
+    command: command to execute
+  arguments: arguments for command
+  
+  Examples:
+    change nick on all servers:
+      /allserv nick newnick
+    set away on all servers:
+      /allserv away I'm away
 ........................................

 &bull; *`/away`* `[-all] [message]`::
@@ -40,18 +59,25 @@
  nickname: user or host to ban
 ........................................

-&bull; *`/connect`* `[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname [-port port] [-ipv6] [-ssl]]`::
+&bull; *`/connect`* `[-all [-nojoin] | servername [servername ...] [-nojoin] | hostname[/port] [-option[=value]] [-nooption]]`::

 ........................................
  connect to IRC server(s)

        -all: connect to all servers
-  servername: internal server name to connect
+  servername: internal server name to connect (server must have been created by /server add)
     -nojoin: do not join any channel (even if autojoin is enabled on server)
-    hostname: hostname to connect
-        port: port for server (integer, default is 6667)
-        ipv6: use IPv6 protocol
-         ssl: use SSL protocol
+    hostname: hostname (or IP) of a server
+        port: port for server (6667 by default)
+      option: set option for server (for boolean option, value can be omitted)
+    nooption: set boolean option to 'off' (for example: -nossl)
+  
+  Examples:
+    /connect freenode
+    /connect irc.oftc.net/6667
+    /connect irc6.oftc.net/6667 -ipv6
+    /connect irc6.oftc.net/6697 -ipv6 -ssl
+    /connect my.server.org/6697 -ssl -password=test
 ........................................

 &bull; *`/ctcp`* `receiver type [arguments]`::
@@ -170,7 +196,7 @@
  nickname: nickname
 ........................................

-&bull; *`/join`* `channel[,channel] [key[,key]]`::
+&bull; *`/join`* `[channel[,channel] [key[,key]]]`::

 ........................................
  join a channel
@@ -197,6 +223,10 @@
   channel: channel where user is
  nickname: nickname to kick and ban
   comment: comment for kick
+  
+  It is possible to kick/ban with a mask, nick will be extracted from mask and replaced by "*", for example:
+    /kickban toto!*@host.com
+    will ban "*!*@host.com" and then kick "toto".
 ........................................

 &bull; *`/kill`* `nickname comment`::
@@ -385,10 +415,12 @@
     -nojoin: do not join any channel (even if autojoin is enabled on server)
 ........................................

-&bull; *`/rehash`*::
+&bull; *`/rehash`* `[option]`::

 ........................................
  tell the server to reload its config file
+
+  option: extra option, for some servers
 ........................................

 &bull; *`/restart`*::
@@ -397,7 +429,52 @@
  tell the server to restart itself
 ........................................

-&bull; *`/server`* `[list [servername]] | [listfull [servername]] | [add servername hostname[/port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername] | [deloutq] | [jump] | [raw]`::
+&bull; *`/sajoin`* `nickname channel[,channel]`::
+
+........................................
+  forces a user to join channel(s)
+
+  nickname: nickname
+   channel: channel name
+........................................
+
+&bull; *`/samode`* `channel mode`::
+
+........................................
+  change mode on channel, without having operator status
+
+  channel: channel name
+     mode: mode for channel
+........................................
+
+&bull; *`/sanick`* `nickname new_nickname`::
+
+........................................
+  forces a user to use another nick
+
+      nickname: nickname
+  new_nickname: new nickname
+........................................
+
+&bull; *`/sapart`* `nickname channel[,channel]`::
+
+........................................
+  forces a user to leave channel(s)
+
+  nickname: nickname
+   channel: channel name
+........................................
+
+&bull; *`/saquit`* `nickname reason`::
+
+........................................
+  forces a user to quit server with a reason
+
+  nickname: nickname
+    reason: reason
+........................................
+
+&bull; *`/server`* `[list [servername]] | [listfull [servername]] | [add servername hostname[/port] [-temp] [-option[=value]] [-nooption]] | [copy servername newservername] | [rename servername newservername] | [keep servername] | [del servername] | [deloutq] | [jump] | [raw]`::

 ........................................
  list, add or remove IRC servers
@@ -407,10 +484,9 @@
         add: create a new server
  servername: server name, for internal and display use
    hostname: name or IP address of server, with optional port (default: 6667)
-        auto: automatically connect to server when WeeChat starts
-      noauto: do not connect to server when WeeChat starts (default)
-        ipv6: use IPv6 protocol
-         ssl: use SSL protocol
+        temp: create temporary server (not saved)
+      option: set option for server (for boolean option, value can be omitted)
+    nooption: set boolean option to 'off' (for example: -nossl)
        copy: duplicate a server
      rename: rename a server
        keep: keep server in config file (for temporary servers only)
@@ -421,7 +497,7 @@
  
  Examples:
    /server listfull
-    /server add oftc irc.oftc.net/6697 -ssl
+    /server add oftc irc.oftc.net/6697 -ssl -autoconnect
    /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
    /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
    /server copy oftc oftcbis
@@ -33,6 +33,11 @@
 ** type: boolean
 ** values: on, off (default value: on)

+* *irc.look.color_pv_nick_like_channel*
+** description: use same nick color for channel and private
+** type: boolean
+** values: on, off (default value: on)
+
 * *irc.look.display_away*
 ** description: display message when (un)marking as away
 ** type: integer
@@ -43,6 +48,21 @@
 ** type: boolean
 ** values: on, off (default value: on)

+* *irc.look.display_ctcp_blocked*
+** description: display CTCP message even if it is blocked
+** type: boolean
+** values: on, off (default value: on)
+
+* *irc.look.display_ctcp_reply*
+** description: display CTCP reply sent by WeeChat
+** type: boolean
+** values: on, off (default value: on)
+
+* *irc.look.display_ctcp_unknown*
+** description: display CTCP message even if it is unknown CTCP
+** type: boolean
+** values: on, off (default value: on)
+
 * *irc.look.display_nick_modes*
 ** description: display nick modes in "input_prompt" bar item
 ** type: boolean
@@ -68,6 +88,11 @@
 ** type: integer
 ** values: buffer_plugin, buffer_name (default value: buffer_plugin)

+* *irc.look.msgbuffer_fallback*
+** description: default target buffer for msgbuffer options when target is private and that private buffer is not found
+** type: integer
+** values: current, server (default value: current)
+
 * *irc.look.nick_completion_smart*
 ** description: smart completion for nicks (completes first with last speakers)
 ** type: integer
@@ -128,10 +153,15 @@
 ** type: boolean
 ** values: on, off (default value: off)

-* *irc.network.anti_flood*
-** description: anti-flood: # seconds between two user messages (0 = no anti-flood)
+* *irc.network.anti_flood_prio_high*
+** description: anti-flood for high priority queue: number of seconds between two user messages or commands sent to IRC server (0 = no anti-flood)
 ** type: integer
-** values: 0 .. 5 (default value: 2)
+** values: 0 .. 60 (default value: 2)
+
+* *irc.network.anti_flood_prio_low*
+** description: anti-flood for low priority queue: number of seconds between two messages sent to IRC server (messages like automatic CTCP replies) (0 = no anti-flood)
+** type: integer
+** values: 0 .. 60 (default value: 2)

 * *irc.network.away_check*
 ** description: interval between two checks for away (in minutes, 0 = never check)
@@ -141,7 +171,7 @@
 * *irc.network.away_check_max_nicks*
 ** description: do not check away nicks on channels with high number of nicks (0 = unlimited)
 ** type: integer
-** values: 0 .. 2147483647 (default value: 0)
+** values: 0 .. 2147483647 (default value: 25)

 * *irc.network.colors_receive*
 ** description: when off, colors codes are ignored in incoming messages
@@ -209,10 +239,15 @@
 ** values: 0 .. 65535 (default value: 30)

 * *irc.server_default.autorejoin*
-** description: automatically rejoin channels when kicked
+** description: automatically rejoin channels after kick
 ** type: boolean
 ** values: on, off (default value: off)

+* *irc.server_default.autorejoin_delay*
+** description: delay (in seconds) before autorejoin (after kick)
+** type: integer
+** values: 0 .. 86400 (default value: 30)
+
 * *irc.server_default.command*
 ** description: command(s) to run when connected to server (many commands should be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value)
 ** type: string
@@ -258,6 +293,21 @@
 ** type: boolean
 ** values: on, off (default value: off)

+* *irc.server_default.ssl_cert*
+** description: ssl certificate file used to automatically identify your nick
+** type: string
+** values: any string (default value: "")
+
+* *irc.server_default.ssl_dhkey_size*
+** description: size of the key used during the Diffie-Hellman Key Exchange
+** type: integer
+** values: 0 .. 2147483647 (default value: 2048)
+
+* *irc.server_default.ssl_verify*
+** description: check that the ssl connection is fully trusted
+** type: boolean
+** values: on, off (default value: on)
+
 * *irc.server_default.username*
 ** description: user name to use on server
 ** type: string
@@ -23,6 +23,11 @@
 ** type: string
 ** values: any string (default value: "%h/logs/")

+* *logger.file.replacement_char*
+** description: replacement char for special chars in filename built with mask (like directory delimiter)
+** type: string
+** values: any string (default value: "_")
+
 * *logger.file.time_format*
 ** description: timestamp used in log files (see man strftime for date/time specifiers)
 ** type: string
@@ -1,4 +1,4 @@
-&bull; *`/lua`* `[list [name]] | [listfull [name]] [load filename] | [autoload] | [reload] | [unload [name]]`::
+&bull; *`/lua`* `[list [name]] | [listfull [name]] | [load filename] | [autoload] | [reload] | [unload [name]]`::

 ........................................
  list/load/unload scripts
@@ -1,4 +1,4 @@
-&bull; *`/perl`* `[list [name]] | [listfull [name]] [load filename] | [autoload] | [reload] | [unload [name]]`::
+&bull; *`/perl`* `[list [name]] | [listfull [name]] | [load filename] | [autoload] | [reload] | [unload [name]]`::

 ........................................
  list/load/unload scripts
@@ -1,4 +1,4 @@
-&bull; *`/python`* `[list [name]] | [listfull [name]] [load filename] | [autoload] | [reload] | [unload [name]]`::
+&bull; *`/python`* `[list [name]] | [listfull [name]] | [load filename] | [autoload] | [reload] | [unload [name]]`::

 ........................................
  list/load/unload scripts
@@ -1,10 +1,16 @@
-&bull; *`/relay`* `[list | listfull]`::
+&bull; *`/relay`* `[list | listfull | add protocol.name port | del protocol.name]`::

 ........................................
  relay control

-      list: list relay clients
-  listfull: list relay clients (verbose)
+           list: list relay clients (only active relays)
+       listfull: list relay clients (verbose, all relays)
+      listrelay: list relays (name and port)
+            add: add relay for a protocol + name
+            del: remove relay for a protocol + name
+  protocol.name: protocol and name to relay
+                 for example: irc.freenode
+           port: port used for relay
  
  Without argument, this command opens buffer with list of relay clients.
 ........................................
@@ -43,13 +43,8 @@
 ** type: boolean
 ** values: on, off (default value: on)

-* *relay.network.enabled*
-** description: enable relay
-** type: boolean
-** values: on, off (default value: off)
-
-* *relay.network.listen_port_range*
-** description: port number (or range of ports) that relay plugin listens on (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, it's recommended to use ports greater than 1024, because only root can use ports below 1024)
-** type: string
-** values: any string (default value: "22373-22400")
+* *relay.network.max_clients*
+** description: maximum number of clients connecting to a port
+** type: integer
+** values: 1 .. 1024 (default value: 5)

@@ -1,4 +1,4 @@
-&bull; *`/ruby`* `[list [name]] | [listfull [name]] [load filename] | [autoload] | [reload] | [unload [name]]`::
+&bull; *`/ruby`* `[list [name]] | [listfull [name]] | [load filename] | [autoload] | [reload] | [unload [name]]`::

 ........................................
  list/load/unload scripts
@@ -1,4 +1,4 @@
-&bull; *`/tcl`* `[list [name]] | [listfull [name]] [load filename] | [autoload] | [reload] | [unload [name]]`::
+&bull; *`/tcl`* `[list [name]] | [listfull [name]] | [load filename] | [autoload] | [reload] | [unload [name]]`::

 ........................................
  list/load/unload scripts
@@ -5,7 +5,7 @@

            add: add a new bar
        barname: name of bar (must be unique)
-           type:   root: outside windows),
+           type:   root: outside windows,
                 window: inside windows, with optional conditions (see below)
      cond1,...: condition(s) for displaying bar (only for type "window"):
                   active: on active window
@@ -13,7 +13,6 @@
                 nicklist: on windows with nicklist
                 without condition, bar is always displayed
       position: bottom, top, left or right
-        filling: horizontal, vertical, columns_horizontal or columns_vertical
           size: size of bar (in chars)
      separator: 1 for using separator (line), 0 or nothing means no separator
      item1,...: items for this bar (items can be separated by comma (space between items) or "+" (glued items))
@@ -92,17 +91,18 @@
  command: command to execute (a '/' is automatically added if not found at beginning of command)
 ........................................

-&bull; *`/debug`* `[list | plugin level | dump | buffer | windows]`::
+&bull; *`/debug`* `[list | set plugin level | dump | buffer | windows | term]`::

 ........................................
  control debug for core/plugins

+      set: set log level for plugin
   plugin: name of plugin ("core" for WeeChat core)
    level: debug level for plugin (0 = disable debug)
     dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)
   buffer: dump buffer content with hexadecimal values in log file
  windows: display windows tree
-     text: send "debug" signal with "text" as argument
+     term: display infos about terminal and available colors
 ........................................

 &bull; *`/filter`* `[list] | [enable|disable|toggle [name]] | [add name plugin.buffer tags regex] | [del name|-all]`::
@@ -120,7 +120,7 @@
           -all: delete all filters
  plugin.buffer: plugin and buffer where filter is active ("*" for all buffers)
           tags: comma separated list of tags, for example: "irc_join,irc_part,irc_quit"
-          regex: regular expression to search in line (use \t to separate prefix from message)
+          regex: regular expression to search in line (use \t to separate prefix from message, special chars like '|' must be escaped: '\|')
  
  The default key alt+'=' toggles filtering on/off.
  
@@ -155,7 +155,7 @@
  value: number of history entries to show
 ........................................

-&bull; *`/input`* `return | complete_next | complete_previous | search_next | delete_previous_char | delete_next_char | delete_previous_word | delete_next_word | delete_beginning_of_line | delete_end_of_line | delete_line | clipboard_paste | transpose_chars | move_beginning_of_line | move_end_of_line | move_previous_char | move_next_char | move_previous_word | move_next_word | history_previous | history_next | history_global_previous | history_global_next | jump_smart | jump_last_buffer | jump_previously_visited_buffer | jump_next_visited_buffer | hotlist_clear | grab_key | scroll_unread | set_unread | set_unread_current_buffer | insert [args]`::
+&bull; *`/input`* `return | complete_next | complete_previous | search_next | delete_previous_char | delete_next_char | delete_previous_word | delete_next_word | delete_beginning_of_line | delete_end_of_line | delete_line | clipboard_paste | transpose_chars | move_beginning_of_line | move_end_of_line | move_previous_char | move_next_char | move_previous_word | move_next_word | history_previous | history_next | history_global_previous | history_global_next | jump_smart | jump_last_buffer | jump_previously_visited_buffer | jump_next_visited_buffer | hotlist_clear | grab_key | grab_key_command | scroll_unread | set_unread | set_unread_current_buffer | insert [args]`::

 ........................................
  functions for command line
@@ -235,10 +235,13 @@
      /proxy del myproxy
 ........................................

-&bull; *`/quit`*::
+&bull; *`/quit`* `[arguments]`::

 ........................................
  quit WeeChat
+
+  arguments: text sent with signal "quit"
+             (for example irc plugin uses this text to send quit message to server)
 ........................................

 &bull; *`/reload`* `[file [file...]]`::
@@ -368,7 +371,8 @@
  For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4
  
  Examples:
-    jump to window displaying buffer #1: /window b1  scroll 2 lines up: /window scroll -2
+    jump to window displaying buffer #1: /window b1
+    scroll 2 lines up: /window scroll -2
    scroll 2 days up: /window scroll -2d
    scroll to beginning of current day: /window scroll -d
 ........................................
@@ -193,11 +193,6 @@
 ** type: color
 ** values: a color name (default value: lightgreen)

-* *weechat.color.input_nick*
-** description: text color for nick name in input line
-** type: color
-** values: a color name (default value: lightcyan)
-
 * *weechat.color.input_text_not_found*
 ** description: text color for unsucessful text search in input line
 ** type: color
@@ -243,11 +238,6 @@
 ** type: color
 ** values: a color name (default value: brown)

-* *weechat.color.nicklist_separator*
-** description: text color for nicklist separator
-** type: color
-** values: a color name (default value: blue)
-
 * *weechat.color.separator*
 ** description: background color for window separators (when split)
 ** type: color
@@ -293,6 +283,11 @@
 ** type: color
 ** values: a color name (default value: yellow)

+* *weechat.color.status_time*
+** description: text color for time (status bar)
+** type: color
+** values: a color name (default value: default)
+
 * *weechat.completion.default_template*
 ** description: default completion template (please see documentation for template codes and values)
 ** type: string
@@ -398,6 +393,11 @@
 ** type: string
 ** values: any string (default value: "")

+* *weechat.look.hline_char*
+** description: char used to draw horizontal lines, note that empty value will draw a real line with ncurses, but may cause bugs with URL selection under some terminals
+** type: string
+** values: any string (default value: "-")
+
 * *weechat.look.hotlist_names_count*
 ** description: max number of names in hotlist (0 = no name displayed, only buffer numbers)
 ** type: integer
@@ -471,13 +471,28 @@
 * *weechat.look.prefix_align_max*
 ** description: max size for prefix (0 = no max size)
 ** type: integer
-** values: 0 .. 64 (default value: 0)
+** values: 0 .. 128 (default value: 0)
+
+* *weechat.look.prefix_align_more*
+** description: display '+' if prefix is truncated
+** type: boolean
+** values: on, off (default value: on)

 * *weechat.look.prefix_buffer_align*
 ** description: prefix alignment for buffer name, when many buffers are merged with same number (none, left, right (default))
 ** type: integer
 ** values: none, left, right (default value: right)

+* *weechat.look.prefix_buffer_align_max*
+** description: max size for buffer name, when many buffers are merged with same number (0 = no max size)
+** type: integer
+** values: 0 .. 128 (default value: 0)
+
+* *weechat.look.prefix_buffer_align_more*
+** description: display '+' if buffer name is truncated (when many buffers are merged with same number)
+** type: boolean
+** values: on, off (default value: on)
+
 * *weechat.look.prefix_error*
 ** description: prefix for error messages
 ** type: string
@@ -528,15 +543,20 @@
 ** type: integer
 ** values: 1 .. 100 (default value: 100)

+* *weechat.look.search_text_not_found_alert*
+** description: alert user when text sought is not found in buffer
+** type: boolean
+** values: on, off (default value: on)
+
 * *weechat.look.set_title*
 ** description: set title for window (terminal for Curses GUI) with name and version
 ** type: boolean
 ** values: on, off (default value: on)

-* *weechat.network.gnutls_dh_prime_bitsmax_lines*
-** description: minimum size in bits for handshake using Diffie Hellman key exchange
-** type: integer
-** values: 0 .. 2147483647 (default value: 512)
+* *weechat.network.gnutls_ca_file*
+** description: file containing the certificate authorities
+** type: string
+** values: any string (default value: "%h/ssl/CAs.pem")

 * *weechat.plugin.autoload*
 ** description: comma separated list of plugins to load automatically at startup, "*" means all plugins found (names may be partial, for example "perl" is ok for "perl.so")
@@ -1,3 +1,11 @@
+&bull; *`/me`* `message`::
+
+........................................
+  send a CTCP action to remote host
+
+  message: message to send
+........................................
+
 &bull; *`/xfer`* `[list | listfull]`::

 ........................................
@@ -31,8 +31,7 @@ Some features (version > = 0.3.x):
 * multi-platform
 * 100% GPL and free

-More info on this page:
-http://weechat.flashtux.org/features.php
+More info on this page: http://www.weechat.org/features


 Compilation / install
@@ -97,6 +96,8 @@ window) or displayed by one or more windows.
 I don't see some chars with accents, what can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+It's common issue, please read carefully and check *ALL* solutions below.
+
 For versions < 0.2.3, please upgrade to the latest stable version.

 For versions > = 0.2.3:
@@ -170,8 +171,10 @@ Under OpenBSD, plugin filenames end with ".so.0.0" (".so" for Linux).

 You must set that up:

-* with WeeChat < = 0.2.6: `/set plugins_extension = ".so.0.0"`
-* with WeeChat > = 0.3.x: `/set weechat.plugin.extension ".so.0.0"`
+* with WeeChat < = 0.2.6: +
+  `/set plugins_extension = ".so.0.0"`
+* with WeeChat > = 0.3.x: +
+  `/set weechat.plugin.extension ".so.0.0"`

 Then: `/plugin autoload`.

@@ -207,32 +210,60 @@ can issue: `/shell setenv LANG=en_US`.


 [[terminal_copy_paste]]
-With the Curses GUI, how can I copy/paste text without pasting nicklist?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How can I copy/paste text without pasting nicklist?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 You can use a terminal with rectangular selection (like rxvt-unicode,
-konsole, ...). Key is usually ctrl + alt + mouse selection.
+konsole, gnome-terminal, ...). Key is usually ctrl + alt + mouse selection.

 Another solution is to move nicklist to top or bottom, for example:

-* with WeeChat < = 0.2.6: `set look_nicklist_position = top`
-* with WeeChat > = 0.3.x: `/bar set nicklist position top`
+* with WeeChat < = 0.2.6: +
+  `set look_nicklist_position = top`
+* with WeeChat > = 0.3.x: +
+  `/bar set nicklist position top`
+
+
+[[urls]]
+How can I click on long URLs (more than one line)?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+WeeChat displays time and prefix for each line and optional bars around chat
+area, so it is not possible to display long URLs without truncating them.
+
+You can use one of following scripts:
+
+urlbar.py::
+    display URLs in a bar
+
+urlgrab.py::
+    logs URLs and open them in browser
+
+url_shorten.rb::
+tinyurl.py::
+shortenurl.py::
+    shorten long URLs
+
+List of scripts about URLs: http://www.weechat.org/scripts/stable/tag/url


 [[highlight_notification]]
 How can I be warned when someone highlights me on a channel?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-You can use the script 'sound.pl' (available on scripts page), and then setup a
-system command (to play sound, display message, ..) with this command:
+According to WeeChat version:

-* with WeeChat < = 0.2.6:
-  `/setp perl.sound.cmd_highlight = "/path/command arguments"`
-* with WeeChat > = 0.3.x:
-  `/set plugins.var.perl.sound.cmd_highlight "/path/command arguments"`
+* with WeeChat < = 0.2.6: use script 'sound.pl' (available on scripts page),
+  and then setup a system command (to play sound, display message, ..) with
+  this command: +
+  `/setp perl.sound.cmd_highlight = "/path/to/command arguments"`
+* with WeeChat > = 0.3.x: use script 'launcher.pl' (available on scripts page),
+  and then setup a system command (to play sound, display message, ..) with
+  this command: +
+  `/set plugins.var.perl.launcher.signal.weechat_highlight "/path/to/command arguments"`

 Many other scripts exist for notification, please look at plugins/scripts page:
-http://weechat.flashtux.org/plugins.php
+http://www.weechat.org/scripts


 [[filter_irc_join_part_quit]]
@@ -293,7 +324,7 @@ There are 3 ways:
  * request a new feature: https://savannah.nongnu.org/task/?group=weechat
  * send a patch: https://savannah.nongnu.org/patch/?group=weechat
 . you can mail developers, look at support page for developer's mails:
-  http://weechat.flashtux.org/support.php
+  http://www.weechat.org/about
  (you can subscribe and send to "support" mailing list)


@@ -301,8 +332,7 @@ There are 3 ways:
 What is the list of supported platforms for WeeChat? Will it be ported to other operating systems?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-The full list is on this page:
-http://weechat.flashtux.org/download.php?view=supported_os
+The full list is on this page: http://www.weechat.org/download

 We do our best to run on as many platforms as possible. Help is welcome for
 some OS' we don't have, to test WeeChat.
@@ -315,7 +345,7 @@ I want to help WeeChat developers. What can I do?
 There's many tasks to do (testing, code, documentation, ...)

 Please contact us via IRC or mail, look at support page:
-http://weechat.flashtux.org/support.php
+http://www.weechat.org/about


 [[donate]]
@@ -323,4 +353,4 @@ Can I give money or other things to WeeChat developers?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 You can give us money to help development.
-Details on http://weechat.flashtux.org/donate.php
+Details on http://www.weechat.org/donate
@@ -129,9 +129,18 @@ Connect to IRC server and auto-join channels

  /connect oftc

-Note: this command can be used to create and connect to a new server
-without using `/server` command (should I repeat you can see help for
-this command with `/help connect` ? ;)
+[NOTE]
+This command can be used to create and connect to a new server without using
+`/server` command (should I repeat you can see help for this command with
+`/help connect` ?).
+
+By default, server buffers are merged with WeeChat 'core' buffer. To switch
+between 'core' buffer and server buffers, you can use ctrl-X.
+
+It is possible to disable auto merge of server buffers to have independent
+server buffers:
+
+  /set irc.look.server_buffer independent


 [[join_part_irc_channels]]
@@ -210,16 +219,21 @@ Plugins/scripts

 On some distros like Debian, plugins are available via a separate package
 (like weechat-plugins).
-Plugins are automatically loaded when found.
+Plugins are automatically loaded when found (please look at the WeeChat
+documentation to load/unload plugins or scripts).

 Some plugins let you use scripts in WeeChat (in many languages like Perl,
 Python, Ruby, Lua and Tcl). These plugins must be loaded with the `/plugin`
 command and they provide commands like `/perl`, used to load scripts.

 Many external plugins/scripts (from contributors) are available for
-WeeChat: http://weechat.flashtux.org/plugins.php
+WeeChat: http://www.weechat.org/scripts

-Please look at the WeeChat documentation to load/unload plugins or scripts.
+Easiest way to install scripts is to use script 'weeget.py':
+
+. download and copy 'weeget.py' to ~/.weechat/python/autoload/
+. load script: `/python autoload`
+. scripts list: `/weeget list` (for help: `/help weeget`)


 [[more_doc]]
@@ -227,6 +241,6 @@ More documentation
 ------------------

 You can now use WeeChat and read FAQ/documentation for any other questions:
-http://weechat.flashtux.org/doc.php
+http://www.weechat.org/doc

 Enjoy using WeeChat!
@@ -6,7 +6,7 @@ FlashCode <flashcode@flashtux.org>
 This manual documents WeeChat chat client, it is part of WeeChat.

 Latest version of this document can be found on this page:
-http://weechat.flashtux.org/doc.php
+http://www.weechat.org/doc


 [[introduction]]
@@ -146,9 +146,9 @@ $ cd ~/.weechat/perl/autoload
 $ ln -s ../script.pl
 ----------------------------------------

-[[script_api]]
-Script API
----------
+[[differences_with_c_api]]
+Differences with C API
+----------------------

 Script API is almost the same as C plugin API.
 You can look at 'WeeChat Plugin API Reference' for detail about each function
@@ -176,6 +176,60 @@ previous path:
 WeeChat core  ------->  python plugin (python.so)  ------->  test.py
 ........................................

+Pointers
+~~~~~~~~
+
+As you probably know, there is not really "pointers" in scripts. So when API
+functions return pointer, it is converted to string for script.
+
+For example, if function return pointer 0x1234ab56, script will get string
+"0x1234ab56".
+
+And when an API function expects a pointer in arguments, script must give that
+string value. C plugin will convert it to real pointer before calling C API
+function.
+
+Empty string or "0x0" are allowed, they means NULL in C.
+For example, to print data on core buffer (WeeChat main buffer), you can do:
+
+[source,python]
+----------------------------------------
+weechat.prnt("", "hi!")
+----------------------------------------
+
+[WARNING]
+In many functions, for speed reasons, WeeChat does not check if your pointer
+is correct or not. It's your job to check you're giving a valid pointer,
+otherwise you may see a nice crash report ;)
+
+Callbacks
+~~~~~~~~~
+
+Almost all WeeChat callbacks must return WEECHAT_RC_OK or WEECHAT_RC_ERROR
+(exception is modifier callback, which returns a string).
+
+C callbacks are using a "data" argument, which is a pointer. In script API,
+this "data" is a string with a any value (it's not a pointer).
+
+For example:
+
+[source,python]
+----------------------------------------
+weechat.hook_timer(1000, 0, 1, "my_timer_cb", "my data")
+
+def my_timer_cb(data, remaining_calls):
+    # this will display: "my data"
+    weechat.prnt("", data)
+    return weechat.WEECHAT_RC_OK
+----------------------------------------
+
+[[script_api]]
+Script API
+----------
+
+For more information about functions in API, please read
+'WeeChat Plugin API Reference'.
+
 Functions
 ~~~~~~~~~

@@ -274,18 +328,21 @@ List of functions in script API:
 ** 'unhook_all'
 * buffers:
 ** 'buffer_new'
-** 'buffer_search'
 ** 'current_buffer'
+** 'buffer_search'
+** 'buffer_search_main'
 ** 'buffer_clear'
 ** 'buffer_close'
+** 'buffer_merge'
+** 'buffer_unmerge'
 ** 'buffer_get_integer'
 ** 'buffer_get_string'
 ** 'buffer_get_pointer'
 ** 'buffer_set'
+** 'buffer_string_replace_local_var'
 * windows:
 ** 'current_window'
 ** 'window_get_integer'
-** 'window_get_string'
 ** 'window_get_pointer'
 ** 'window_set_title'
 * nicklist:
@@ -312,6 +369,7 @@ List of functions in script API:
 ** 'info_get'
 * infolists:
 ** 'infolist_new'
+** 'infolist_new_item'
 ** 'infolist_new_var_integer'
 ** 'infolist_new_var_string'
 ** 'infolist_new_var_pointer'
@@ -319,6 +377,7 @@ List of functions in script API:
 ** 'infolist_get'
 ** 'infolist_next'
 ** 'infolist_prev'
+** 'infolist_reset_item_cursor'
 ** 'infolist_fields'
 ** 'infolist_integer'
 ** 'infolist_string'
@@ -374,53 +433,3 @@ List of constants in script API:
 * 'WEECHAT_HOOK_SIGNAL_STRING'
 * 'WEECHAT_HOOK_SIGNAL_INT'
 * 'WEECHAT_HOOK_SIGNAL_POINTER'
-
-Differences with C API
-~~~~~~~~~~~~~~~~~~~~~~
-
-Pointers
-^^^^^^^^
-
-As you probably know, there is not really "pointers" in scripts. So when API
-functions return pointer, it is converted to string for script.
-
-For example, if function return pointer 0x1234ab56, script will get string
-"0x1234ab56".
-
-And when an API function expects a pointer in arguments, script must give that
-string value. C plugin will convert it to real pointer before calling C API
-function.
-
-Empty string or "0x0" are allowed, they means NULL in C.
-For example, to print data on core buffer (WeeChat main buffer), you can do:
-
-[source,python]
----------------------------------------
-weechat.prnt("", "hi!")
----------------------------------------
-
-[WARNING]
-In many functions, for speed reasons, WeeChat does not check if your pointer
-is correct or not. It's your job to check you're giving a valid pointer,
-otherwise you may see a nice crash report ;)
-
-Callbacks
-^^^^^^^^^
-
-Almost all WeeChat callbacks must return WEECHAT_RC_OK or WEECHAT_RC_ERROR
-(exception is modifier callback, which returns a string).
-
-C callbacks are using a "data" argument, which is a pointer. In script API,
-this "data" is a string with a any value (it's not a pointer).
-
-For example:
-
-[source,python]
----------------------------------------
-weechat.hook_timer(1000, 0, 1, "my_timer_cb", "my data")
-
-def my_timer_cb(data, remaining_calls):
-    # this will display: "my data"
-    weechat.prnt("", data)
-    return weechat.WEECHAT_RC_OK
----------------------------------------
@@ -76,7 +76,7 @@ the latest updates.
 Otherwise you can download and unpack 'devel' package:

 -----------------------------------------------------------------
-$ wget http://weechat.flashtux.org/download/weechat-devel.tar.bz2
+$ wget http://www.weechat.org/files/src/weechat-devel.tar.bz2
 $ tar xvjf weechat-devel.tar.bz2
 $ cd weechat-devel
 -----------------------------------------------------------------
@@ -107,7 +107,7 @@ Install binary package
 According to your Linux distribution:

 * Debian: http://debian.flashtux.org/
-* Gentoo: http://weechat.flashtux.org/download.php
+* Gentoo: http://www.weechat.org/download
 * ArchLinux: PKGBUILD from http://aur.archlinux.org/
 * other: we don't know! Eheh.

@@ -6,7 +6,7 @@ FlashCode <flashcode@flashtux.org>
 This manual documents WeeChat chat client, it is part of WeeChat.

 Latest version of this document can be found on this page:
-http://weechat.flashtux.org/doc.php
+http://www.weechat.org/doc


 [[introduction]]
@@ -35,7 +35,7 @@ Main features are:
 * multi-platform (GNU/Linux, *BSD, MacOS X, Windows and other)
 * 100% GPL, free software

-WeeChat homepage is here: http://weechat.flashtux.org/
+WeeChat homepage is here: http://www.weechat.org/

 [[pre-requisites]]
 Pre-requisites
@@ -75,6 +75,7 @@ Source package

 WeeChat can be compiled with cmake or autotools (cmake is recommended way).

+[[compile_with_cmake]]
 With cmake
 ^^^^^^^^^^

@@ -98,6 +99,7 @@ $ make
 $ make install
 ----------------------------------------

+[[compile_with_autotools]]
 With autotools
 ^^^^^^^^^^^^^^

@@ -235,65 +237,65 @@ Screen is composed by following areas:

 Bar 'status' has following default items:

-[width="100%",cols="^3,^3,10",options="header"]
+[width="100%",cols="^3,^3l,10",options="header"]
 |========================================
-| Item                  | Example              | Description
+| Item                  | Example        | Description

-| time                  | `[12:55]`            |
+| time                  | [12:55]        |
  time

-| buffer_count          | `[4]`                |
+| buffer_count          | [4]            |
  number of opened buffers

-| buffer_plugin         | `[irc]`              |
+| buffer_plugin         | [irc/freenode] |
  plugin of current buffer (irc plugin can add IRC server name used by buffer)

-| buffer_number         | `3`                  |
+| buffer_number         | 3              |
  current buffer number

-| buffer_name           | `freenode/#test(+n)` |
+| buffer_name           | #test(+n)      |
  current buffer name

-| buffer_nicklist_count | `{5}`                |
+| buffer_nicklist_count | {5}            |
  number of nicks in nicklist

-| buffer_filter         | `*`                  |
+| buffer_filter         | *              |
  filtering indicator: `*` means some lines are filtered (hidden), empty value
  means all lines are displayed

-| lag                   | `[Lag: 2.5]`         |
+| lag                   | [Lag: 2.5]     |
  lag indicator, in seconds (hidden if lag is low)

-| hotlist               | `[Act: 4,2]`         |
+| hotlist               | [Act: 4,2]     |
  list of buffers with activity (unread messages)

-| completion            | `abc(2) def(5)`      |
+| completion            | abc(2) def(5)  |
  list of words for completion, with number of possible completions for each
  word

-| scroll                | `-MORE(50)-`         |
+| scroll                | -MORE(50)-     |
  scroll indicator, with number of lines below last line displayed
 |========================================

 Bar 'input' has following default items:

-[width="100%",cols="^3,^6,8",options="header"]
+[width="100%",cols="^3,^6m,8",options="header"]
 |========================================
 | Item             | Example | Description

-| input_paste      | `[Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No]` |
+| input_paste      | [Paste 7 lines ? [ctrl-Y] Yes [ctrl-N] No] |
  question to user for pasting lines

-| input_prompt     | `[nick]` |
+| input_prompt     | [nick] |
  input prompt (nick for irc plugin)

-| away             | `(away)` |
+| away             | (away) |
  away indicator

-| input_search     | `[Text search]` |
+| input_search     | [Text search] |
  text search indicator

-| input_text       | `bla bla...` |
+| input_text       | bla bla... |
  input text
 |========================================

@@ -301,6 +303,7 @@ Bar 'input' has following default items:
 Default key bindings
 ~~~~~~~~~~~~~~~~~~~~

+[[key_bindings_command_line]]
 Keys for command line
 ^^^^^^^^^^^^^^^^^^^^^

@@ -437,14 +440,16 @@ Keys for command line
  `/input delete_next_word`

 | Alt + K |
-  Grab a key and insert its code in command line +
-  `/input grab_key`
+  Grab a key and insert its code (and command bound if key exists) in command
+  line +
+  `/input grab_key_command`

-| Alt + R` +
+| Alt + R |
  Delete entire command line +
  `/input delete_line`
 |========================================

+[[key_bindings_buffers_windows]]
 Keys for buffers / windows
 ^^^^^^^^^^^^^^^^^^^^^^^^^^

@@ -505,6 +510,7 @@ Keys for buffers / windows
 | F7 |
  Switch to previous window +
  `/window -1`
+
 | F8 |
  Switch to next window +
  `/window +1`
@@ -591,6 +597,7 @@ Keys for buffers / windows
  `/input jump_next_visited_buffer`
 |========================================

+[[key_bindings_other]]
 Other keys
 ^^^^^^^^^^

@@ -614,6 +621,7 @@ Command line
 WeeChat command line (at the bottom of window) lets you execute commands or
 send text to buffer.

+[[command_line_syntax]]
 Syntax
 ^^^^^^

@@ -638,6 +646,7 @@ For example, to send text '/set' on current buffer:
 //set
 ----------------------------------------

+[[command_line_colors]]
 Colors
 ^^^^^^

@@ -707,6 +716,7 @@ Colors for Curses GUI are:
 |========================================
 | default      | default terminal color (transparent for background)
 | black        | black
+| darkgray     | dark gray
 | red          | dark red
 | lightred     | light red
 | green        | dark green
@@ -792,6 +802,7 @@ Alias plugin
 Alias plugin lets you create alias for commands (from WeeChat or other
 plugins).

+[[alias_commands]]
 Commands
 ^^^^^^^^

@@ -804,11 +815,13 @@ Aspell plugin
 Aspell plugin lets you check spelling in command line. It is possible to use
 many languages by buffer.

+[[aspell_options]]
 Options (aspell.conf)
 ^^^^^^^^^^^^^^^^^^^^^

 include::autogen/user/aspell_options.txt[]

+[[aspell_commands]]
 Commands
 ^^^^^^^^

@@ -851,16 +864,19 @@ For example:
 charset: terminal: ISO-8859-15, internal: UTF-8
 ........................................

+[[charset_options]]
 Options (charset.conf)
 ^^^^^^^^^^^^^^^^^^^^^^

 include::autogen/user/charset_options.txt[]

+[[charset_commands]]
 Commands
 ^^^^^^^^

 include::autogen/user/charset_commands.txt[]

+[[charset_set]]
 Set charset
 ^^^^^^^^^^^

@@ -905,6 +921,7 @@ To see all charsets used, use following command:
 /set charset.*
 ----------------------------------------

+[[charset_troubleshooting]]
 Troubleshooting
 ^^^^^^^^^^^^^^^

@@ -983,6 +1000,7 @@ The IRC plugin is designed to chat through IRC protocol with other people.
 It is multi-servers, and offers all supported IRC commands including DCC chat
 and file transfer (via xfer plugin, see <<xfer_plugin>>).

+[[irc_command_line_options]]
 Command line options
 ^^^^^^^^^^^^^^^^^^^^

@@ -999,16 +1017,187 @@ default port (6667), with nick 'nono':
 $ weechat-curses irc://nono@irc.freenode.net/#weechat,#toto
 ----------------------------------------

+[[irc_options]]
 Options (irc.conf)
 ^^^^^^^^^^^^^^^^^^

 include::autogen/user/irc_options.txt[]

+[[irc_commands]]
 Commands
 ^^^^^^^^

 include::autogen/user/irc_commands.txt[]

+[[irc_ctcp_replies]]
+CTCP replies
+^^^^^^^^^^^^
+
+It is possible to customize CTCP replies, or block some CTCP queries (do not
+reply).
+
+For example, to customize reply to CTCP "VERSION", use following command:
+
+----------------------------------------
+/set irc.ctcp.version "I'm running WeeChat $version, it rocks!"
+----------------------------------------
+
+If you want to block CTCP "VERSION" (do not reply to a query), then set empty
+string:
+
+----------------------------------------
+/set irc.ctcp.version ""
+----------------------------------------
+
+Even unknown CTCP can be customized, for example you can reply to
+CTCP "BLABLA":
+
+----------------------------------------
+/set irc.ctcp.blabla "This is my answer to CTCP BLABLA"
+----------------------------------------
+
+It is possible to customize CTCP for one server only, using its internal name
+before CTCP name:
+
+----------------------------------------
+/set irc.ctcp.freenode.version "WeeChat $version (for freenode)"
+----------------------------------------
+
+If you want to restore standard CTCP reply, then remove option:
+
+----------------------------------------
+/unset irc.ctcp.version
+----------------------------------------
+
+Following codes can be used in strings and are automatically expanded by WeeChat
+when replying to CTCP:
+
+[width="100%",cols="^2l,4,8l",options="header"]
+|========================================
+| Code         | Description                 | Value/example
+| $clientinfo  | list of supported CTCP      | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
+| $version     | WeeChat version             | 0.3.0
+| $compilation | WeeChat compilation date    | Sep 13 2009
+| $osinfo      | info about OS               | Linux 2.6.31 / i686
+| $site        | WeeChat site                | http://www.weechat.org
+| $download    | WeeChat site, download page | http://www.weechat.org/download
+| $time        | current date/time           | Sun Sep 13 15:48:31 2009
+| $username    | username on IRC server      | nick
+| $realname    | realname on IRC server      | My name
+|========================================
+
+If CTCP options are not defined (by default), CTCP replies are:
+
+[width="100%",cols="^2,4l,8l",options="header"]
+|========================================
+| CTCP         | Reply format                    | Example
+| CLIENTINFO   | $clientinfo                     | ACTION DCC CLIENTINFO FINGER PING SOURCE TIME USERINFO VERSION
+| FINGER       | WeeChat $version                | WeeChat 0.3.0
+| SOURCE       | $download                       | http://www.weechat.org/download
+| TIME         | $time                           | Sun Sep 13 15:48:31 2009
+| USERINFO     | $username ($realname)           | nick (My name)
+| VERSION      | WeeChat $version ($compilation) | WeeChat 0.3.0 (Sep 13 2009)
+|========================================
+
+[[irc_target_buffer]]
+Target buffer for IRC messages
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+It is possible to customize target buffer for IRC messages (buffer used to
+display message) with options `irc.msgbuffer.*`.
+
+For some IRC messages (see list below), you can use value:
+
+current::
+    current buffer (if it's IRC buffer, or on server buffer by default)
+
+private::
+    private buffer for nick, or current/server buffer if not found (according
+    to option 'irc.look.msgbuffer_fallback')
+
+weechat::
+    WeeChat "core" buffer
+
+Default is server buffer (when option is not set).
+
+Non-exhaustive list of IRC messages or alias that you can customize:
+
+[width="50%",cols="^1m,^1m,3",options="header"]
+|========================================
+| message | alias  | description
+| invite  |        | invited on a channel
+| notice  |        | notice
+| wallops |        | wallops
+| 221     |        | user mode string
+| 275     | whois  | whois (secure connection)
+| 303     |        | ison
+| 305     | unaway | unaway
+| 306     | away   | away
+| 307     | whois  | whois (registered nick)
+| 310     | whois  | whois (help mode)
+| 311     | whois  | whois (user)
+| 312     | whois  | whois (server)
+| 313     | whois  | whois (operator)
+| 314     | whowas | whowas
+| 315     | who    | who (end)
+| 317     | whois  | whois (idle)
+| 318     | whois  | whois (end)
+| 319     | whois  | whois (channels)
+| 320     | whois  | whois (identified user)
+| 321     | list   | list (start)
+| 322     | list   | list (channel)
+| 323     | list   | list (end)
+| 326     | whois  | whois (has oper privs)
+| 327     | whois  | whois (host)
+| 330     | whois  | whois (logged in as)
+| 335     | whois  | whois (is a bot on)
+| 338     | whois  | whois (host)
+| 341     |        | inviting
+| 344     | reop   | channel reop
+| 345     | reop   | channel reop (end)
+| 351     |        | server version
+| 352     | who    | who
+| 369     | whowas | whowas (end)
+| 378     | whois  | whois (connecting from)
+| 379     | whois  | whois (using modes)
+| 432     |        | erroneous nickname
+| 433     |        | nickname already in use
+| 438     |        | not authorized to change nickname
+| 671     | whois  | whois (secure connection)
+| 901     |        | you are now logged in
+|========================================
+
+Other numeric commands can be customized as well.
+
+Message can be prefixed by server name to be specific to an irc server
+(for example: `freenode.whois`).
+
+Some examples:
+
+* display result of `/whois` on private buffer:
+
+----------------------------------------
+/set irc.msgbuffer.whois private
+----------------------------------------
+
+* restore default buffer for whois (server buffer):
+
+----------------------------------------
+/unset irc.msgbuffer.whois
+----------------------------------------
+
+* display invitation on current buffer, only for "freenode" server:
+
+----------------------------------------
+/set irc.msgbuffer.freenode.invite current
+----------------------------------------
+
+* display message "303" (ison) on WeeChat "core" buffer:
+
+----------------------------------------
+/set irc.msgbuffer.303 weechat
+----------------------------------------
+
 [[logger_plugin]]
 Logger plugin
 ~~~~~~~~~~~~~
@@ -1016,16 +1205,19 @@ Logger plugin
 The Logger plugin lets you save content of buffers to files, with options
 about what and how it is saved.

+[[logger_options]]
 Options (logger.conf)
 ^^^^^^^^^^^^^^^^^^^^^

 include::autogen/user/logger_options.txt[]

+[[logger_commands]]
 Commands
 ^^^^^^^^

 include::autogen/user/logger_commands.txt[]

+[[logger_log_levels]]
 Log levels
 ^^^^^^^^^^

@@ -1073,6 +1265,7 @@ Some examples:
 /set logger.level.irc 2
 ----------------------------------------

+[[logger_filenames_masks]]
 Filenames masks
 ^^^^^^^^^^^^^^^

@@ -1116,29 +1309,33 @@ These plugins can load, execute and unload scripts for these languages.
 For more information about how to write scripts, or WeeChat API for
 scripts, please read 'WeeChat Scripting Guide'.

-You can find some scripts for WeeChat here:
-http://weechat.flashtux.org/plugins.php
+You can find some scripts for WeeChat here: http://www.weechat.org/scripts

+[[perl_commands]]
 Perl commands
 ^^^^^^^^^^^^^

 include::autogen/user/perl_commands.txt[]

+[[python_commands]]
 Python commands
 ^^^^^^^^^^^^^^^

 include::autogen/user/python_commands.txt[]

+[[ruby_commands]]
 Ruby commands
 ^^^^^^^^^^^^^

 include::autogen/user/ruby_commands.txt[]

+[[lua_commands]]
 Lua commands
 ^^^^^^^^^^^^

 include::autogen/user/lua_commands.txt[]

+[[tcl_commands]]
 Tcl commands
 ^^^^^^^^^^^^

@@ -1154,11 +1351,13 @@ Xfer plugin brings:
  IRC plugin
 * file transfer, for example "DCC" via IRC plugin

+[[xfer_options]]
 Options (xfer.conf)
 ^^^^^^^^^^^^^^^^^^^^^

 include::autogen/user/xfer_options.txt[]

+[[xfer_commands]]
 Commands
 ^^^^^^^^

@@ -1176,43 +1375,52 @@ Developers
 FlashCode (Sébastien Helleu)::
    main developer

-Kolter (Emmanuel Bouthenot)::
-    developer, debian packager
-
 [[contributors]]
 Contributors
 ~~~~~~~~~~~~

+Kolter (Emmanuel Bouthenot)::
+    debian packager
+
 Ptitlouis::
-    first debian packager
+    old debian packager

 Jiri Golembiovsky::
    czech translation, patches

+soltys::
+    polish translation
+
+Nils Görs::
+rettub::
+Frank Zacharias::
+    german translation
+
 Pavel Shevchuk::
    russian translation

-Frank Zacharias::
-    german translation
+m4v::
+    spanish translation

 Voroskoi::
    hungarian translation

-Rudolf Polzer::
-    patches
+Marco Paolone::
+    italian translation

+Dmitry Kobylin::
+    tcl plugin
+
+Rudolf Polzer::
 Jim Ramsay::
+Pistos::
+Gwenn::
+Dominik Honnef::
    patches

 Odin::
    SuSE RPM

-Pistos::
-    patches
-
-Gwenn::
-    patches
-

 [[support]]
 Support
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,26 +17,26 @@
 # user's guide
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
  COMMENT "Building weechat_user.fr.html"
 )
 ADD_CUSTOM_TARGET(doc-user-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # plugin API reference
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.txt
  COMMENT "Building weechat_plugin_api.fr.html"
 )
 ADD_CUSTOM_TARGET(doc-plugin-api-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # scripting guide
 ADD_CUSTOM_COMMAND(
@@ -47,37 +47,37 @@ ADD_CUSTOM_COMMAND(
  COMMENT "Building weechat_scripting.fr.html"
 )
 ADD_CUSTOM_TARGET(doc-scripting-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # FAQ
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.txt
  COMMENT "Building weechat_faq.fr.html"
 )
 ADD_CUSTOM_TARGET(doc-faq-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # quickstart
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.txt
  COMMENT "Building weechat_quickstart.fr.html"
 )
 ADD_CUSTOM_TARGET(doc-quickstart-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})

 # tester's guide
 ADD_CUSTOM_COMMAND(
  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
+  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="${VERSION}" -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
  DEPENDS
  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.txt
  COMMENT "Building weechat_tester.fr.html"
 )
 ADD_CUSTOM_TARGET(doc-tester-fr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html DESTINATION share/doc/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
@@ -1,4 +1,4 @@
-# Copyright (c) 2003-2009 FlashCode <flashcode@flashtux.org>
+# Copyright (c) 2003-2010 by FlashCode <flashcode@flashtux.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,27 +35,27 @@ all-local: weechat_user.fr.html \

 # user's guide
 weechat_user.fr.html: weechat_user.fr.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_user.fr.html weechat_user.fr.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_user.fr.html weechat_user.fr.txt

 # plugin API reference
 weechat_plugin_api.fr.html: weechat_plugin_api.fr.txt $(wildcard autogen/plugin_api/*.txt)
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_plugin_api.fr.html weechat_plugin_api.fr.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_plugin_api.fr.html weechat_plugin_api.fr.txt

 # scripting guide
 weechat_scripting.fr.html: weechat_scripting.fr.txt
-	$(ASCIIDOC) -a toc -a toclevels=3 -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_scripting.fr.html weechat_scripting.fr.txt
+	$(ASCIIDOC) -a toc -a toclevels=3 -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_scripting.fr.html weechat_scripting.fr.txt

 # FAQ
 weechat_faq.fr.html: weechat_faq.fr.txt
-	$(ASCIIDOC) -a toc -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_faq.fr.html weechat_faq.fr.txt
+	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_faq.fr.html weechat_faq.fr.txt

 # quickstart
 weechat_quickstart.fr.html: weechat_quickstart.fr.txt
-	$(ASCIIDOC) -a toc -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_quickstart.fr.html weechat_quickstart.fr.txt
+	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_quickstart.fr.html weechat_quickstart.fr.txt

 # tester's guide
 weechat_tester.fr.html: weechat_tester.fr.txt
-	$(ASCIIDOC) -a toc -a toc_title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_tester.fr.html weechat_tester.fr.txt
+	$(ASCIIDOC) -a toc -a toc-title='Table des matières' -a date=`date "+%F"` -a revision="$(VERSION)" -n -o weechat_tester.fr.html weechat_tester.fr.txt

 # install docs

@@ -11,20 +11,24 @@

 | irc | irc_channel_topic | titre du canal IRC courant

-| irc | irc_channels | canaux IRC (sur tous les serveurs)
+| irc | irc_channels | canaux sur tous les serveurs IRC

 | irc | irc_ignores_numbers | numéros pour les ignores définis

 | irc | irc_msg_part | message de fin par défaut pour le canal IRC

-| irc | irc_privates | canaux IRC (sur tous les serveurs)
+| irc | irc_privates | privés sur tous les serveurs IRC

 | irc | irc_server | serveur IRC courant

+| irc | irc_server_channels | canaux sur le serveur IRC courant
+
 | irc | irc_server_nick | pseudo sur le serveur IRC courant

 | irc | irc_server_nicks | pseudos sur tous les canaux du serveur IRC courant

+| irc | irc_server_privates | privés sur le serveur IRC courant
+
 | irc | irc_servers | serveurs IRC (noms internes)

 | irc | nick | pseudos du canal IRC courant
@@ -35,6 +39,12 @@

 | python | python_script | liste des scripts

+| relay | relay_free_port | premier port libre pour l'extension relay
+
+| relay | relay_protocol_name | tous les protocole.nom possible pour l'extension relay
+
+| relay | relay_relays | protocole.nom des relais courants pour l'extension relay
+
 | ruby | ruby_script | liste des scripts

 | tcl | tcl_script | liste des scripts
@@ -13,17 +13,17 @@

 | logger | logger_buffer | liste des enregistreurs de tampons (loggers)

-| lua | lua_script | list of lua scripts
+| lua | lua_script | liste des scripts

-| perl | perl_script | list of perl scripts
+| perl | perl_script | liste des scripts

-| python | python_script | list of python scripts
+| python | python_script | liste des scripts

 | relay | relay | liste des clients pour le relai

-| ruby | ruby_script | list of ruby scripts
+| ruby | ruby_script | liste des scripts

-| tcl | tcl_script | list of tcl scripts
+| tcl | tcl_script | liste des scripts

 | weechat | bar | liste des barres

@@ -9,6 +9,8 @@

 | irc | irc_nick | retourne le pseudo utilisé actuellement sur un serveur

+| irc | irc_nick_color | retourne la couleur du pseudo
+
 | irc | irc_nick_from_host | retourne le pseudo à partir d'un host IRC

 | weechat | charset_internal | charset interne à WeeChat
@@ -33,4 +35,8 @@

 | weechat | weechat_sharedir | répertoire "share" de WeeChat

+| weechat | weechat_site | site WeeChat
+
+| weechat | weechat_site_download | site WeeChat, page de téléchargement
+
 |========================================
@@ -3,13 +3,21 @@
 ........................................
  créer un alias pour une commande

-   nom_alias: nom de l'alias
+   nom_alias: nom de l'alias (peut démarrer ou se terminer par "*" pour une liste d'alias)
    commande: nom de la commande (plusieurs commandes peuvent être séparées par des point-virgules)
  paramètres: paramètres pour la commande
  
  Sans paramètre, cette commande liste tous les alias définis.
  
-  Note: dans la commande, les variables spéciales $1, $2,..,$9 sont remplacés par les paramètres donnés par l'utilisateur, et $* est remplacé par tous les paramètres.
-  Les variables $nick, $channel et $server sont remplacées par le pseudo/canal/serveur courant.
+  Note: dans la commande, les variables spéciales sont remplacées :
+          $n: paramètre 'n' (entre 1 et 9)
+         $-m: paramètres de 1 à 'm'
+         $n-: paramètres de 'n' au dernier
+        $n-m: paramètres de 'n' à 'm'
+          $*: tous les paramètres
+          $~: le dernier paramètre
+       $nick: pseudo courant
+    $channel: canal courant
+     $server: serveur courant
 ........................................

@@ -6,20 +6,39 @@
  cible: serveur
 ........................................

-&bull; *`/ame`* `message`::
+&bull; *`/allchan`* `[-current] [-exclude=canal[,canal...]] commande [paramètres]`::

 ........................................
-  envoyer une action CTCP à tous les canaux de tous les serveurs connectés
+  exécuter une commande sur tous les canaux de tous les serveurs connectés

-  message: message à envoyer
+    -current: exécuter la commande pour les canaux du serveur courant seulement
+    -exclude: exclure certains canaux ('*' est autorisé au début ou à la fin du nom du canal, pour exclure plusieurs canaux)
+    commande: commande à exécuter
+  paramètres: paramètres pour la commande
+  
+  Exemples :
+    exécuter '/me teste' sur tous les canaux :
+      /allchan me teste
+    dire 'bonjour' partout sauf sur #weechat :
+      /allchan -exclude=#weechat msg * bonjour
+    dire 'bonjour' partout sauf sur #weechat et les canaux commençant par #linux :
+      /allchan -exclude=#weechat,#linux* msg * bonjour
 ........................................

-&bull; *`/amsg`* `texte`::
+&bull; *`/allserv`* `[-exclude=serveur[,serveur...]] commande [paramètres]`::

 ........................................
-  envoyer un message à tous les canaux de tous les serveurs connectés
+  exécuter une commande sur tous les serveurs connectés

-  texte: texte à envoyer
+    -exclude: exclude certains serveurs ('*' is est autorisé en début ou fin du nom du serveur, pour exclure plusieurs serveurs)
+    commande: commande à exécuter
+  paramètres: paramètres pour la commande
+  
+  Exemples :
+    changer de pseudo sur tous les serveurs :
+      /allserv nick newnick
+    positionner l'absence sur tous les serveurs :
+      /allserv away Je suis absent
 ........................................

 &bull; *`/away`* `[-all] [message]`::
@@ -40,18 +59,25 @@
  pseudo: pseudo ou hôte pour le bannissement
 ........................................

-&bull; *`/connect`* `[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom/IP [-port port] [-ipv6] [-ssl]]`::
+&bull; *`/connect`* `[-all [-nojoin] | nom_serveur [nom_serveur ...] [-nojoin] | nom[/port] [-option[=valeur]] [-nooption]]`::

 ........................................
  se connecter à un/plusieurs serveur(s) IRC

         -all: se reconnecter à tous les serveurs
-  nom_serveur: nom du serveur pour se connecter
+  nom_serveur: nom du serveur interne pour se connecter (le serveur doit avoir été créé par /server add)
      -nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
-       nom/IP: nom/IP pour se connecter
-         port: port pour le serveur (nombre entier, 6667 par défaut)
-         ipv6: utiliser le protocole IPv6
-          ssl: utiliser le protocole SSL
+          nom: nom (ou adresse IP) d'un serveur
+         port: port pour le serveur (6667 par défaut)
+       option: définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
+     nooption: définir l'option booléenne à 'off' (par exemple: -nossl)
+  
+  Exemples:
+    /connect freenode
+    /connect irc.oftc.net/6667
+    /connect irc6.oftc.net/6667 -ipv6
+    /connect irc6.oftc.net/6697 -ipv6 -ssl
+    /connect my.server.org/6697 -ssl -password=test
 ........................................

 &bull; *`/ctcp`* `cible type [arguments]`::
@@ -170,7 +196,7 @@
  pseudo: pseudo
 ........................................

-&bull; *`/join`* `canal[,canal] [clé[,clé]]`::
+&bull; *`/join`* `[canal[,canal] [clé[,clé]]]`::

 ........................................
  joindre un canal
@@ -197,6 +223,10 @@
        canal: canal où l'utilisateur se trouve
       pseudo: pseudo à éliminer et bannir
  commentaire: commentaire pour l'élimination
+  
+  Il est possible d'émiliner/bannir avec un masque, le pseudo sera extrait du masque et remplacé par "*", par exemple :
+    /kickban toto!*@host.com
+    bannira "*!*@host.com" puis éliminera "toto".
 ........................................

 &bull; *`/kill`* `pseudo commentaire`::
@@ -385,10 +415,12 @@
      -nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
 ........................................

-&bull; *`/rehash`*::
+&bull; *`/rehash`* `[option]`::

 ........................................
  demander au serveur de recharger son fichier de configuration
+
+  option: option supplémentaire, pour certains serveurs
 ........................................

 &bull; *`/restart`*::
@@ -397,7 +429,52 @@
  demander au serveur de redémarrer
 ........................................

-&bull; *`/server`* `[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/port] [-temp] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]`::
+&bull; *`/sajoin`* `pseudo canal[,canal]`::
+
+........................................
+  force un utilisateur à rejoindre un ou plusieurs canaux
+
+  pseudo: pseudo
+   canal: canal
+........................................
+
+&bull; *`/samode`* `mode canal`::
+
+........................................
+  changer le mode du canal, sans avoir le statut opérateur
+
+  canal: nom du canal
+   mode: mode pour le canal
+........................................
+
+&bull; *`/sanick`* `pseudo nouveau_pseudo`::
+
+........................................
+  force un utilisateur à utiliser un autre pseudo
+
+          pseudo: pseudo
+  nouveau_pseudo: nouveau pseudo
+........................................
+
+&bull; *`/sapart`* `pseudo canal[,canal]`::
+
+........................................
+  force un utilisateur à quitter un ou plusieurs canaux
+
+  pseudo: pseudo
+   canal: canal
+........................................
+
+&bull; *`/saquit`* `pseudo raison`::
+
+........................................
+  force un utilisateur à quitter le serveur avec une raison
+
+  pseudo: pseudo
+  raison: raison
+........................................
+
+&bull; *`/server`* `[list [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/port] [-temp] [-option[=valeur]] [-nooption]] | [copy nom_serveur nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep nom_serveur] | [del nom_serveur] | [deloutq] | [jump] | [raw]`::

 ........................................
  liste, ajoute ou retire des serveurs IRC
@@ -407,10 +484,9 @@
          add: créer un nouveau serveur
  nom_serveur: nom du serveur, pour usage interne et affichage
          nom: nom ou adresse IP du serveur avec port en option (defaut: 6667)
-         auto: se connecter automatiquement au serveur quand WeeChat démarre
-       noauto: ne pas se connecter au serveur quand WeeChat démarre (par défaut)
-         ipv6: utiliser le protocole IPv6
-          ssl: utiliser le protocole SSL
+         temp: créer un serveur temporaire (non sauvé)
+       option: définir l'option pour le serveur (pour une option booléenne, la valeur peut être omise)
+     nooption: définir l'option booléenne à 'off' (par exemple: -nossl)
         copy: dupliquer un serveur
       rename: renommer un serveur
         keep: garder le serveur dans le fichier de configuration (pour les serveurs temporaires seulement)
@@ -421,7 +497,7 @@
  
  Exemples:
    /server listfull
-    /server add oftc irc.oftc.net/6697 -ssl
+    /server add oftc irc.oftc.net/6697 -ssl -autoconnect
    /server add oftc6 irc6.oftc.net/6697 -ipv6 -ssl
    /server add freenode2 chat.eu.freenode.net/6667,chat.us.freenode.net/6667
    /server copy oftc oftcbis
@@ -33,6 +33,11 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: on)

+* *irc.look.color_pv_nick_like_channel*
+** description: utiliser la même couleur de pseudo pour le canal et le privé
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
 * *irc.look.display_away*
 ** description: affiche un message pour l'absence/le retour
 ** type: entier
@@ -43,6 +48,21 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: on)

+* *irc.look.display_ctcp_blocked*
+** description: afficher le message CTCP même s'il est bloqué
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
+* *irc.look.display_ctcp_reply*
+** description: afficher la réponse CTCP envoyée par WeeChat
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
+* *irc.look.display_ctcp_unknown*
+** description: afficher le message CTCP même si le CTCP est inconnu
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
 * *irc.look.display_nick_modes*
 ** description: affiche les modes du pseudo dans l'objet de barre "input_prompt"
 ** type: booléen
@@ -68,6 +88,11 @@
 ** type: entier
 ** valeurs: buffer_plugin, buffer_name (valeur par défaut: buffer_plugin)

+* *irc.look.msgbuffer_fallback*
+** description: tampon cible par défaut pour les options msgbuffer quand la cible est "private" et que le tampon privé n'est pas trouvé
+** type: entier
+** valeurs: current, server (valeur par défaut: current)
+
 * *irc.look.nick_completion_smart*
 ** description: complétion intelligente pour les pseudos (complète d'abord avec les personnes qui ont parlé récemment)
 ** type: entier
@@ -128,10 +153,15 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: off)

-* *irc.network.anti_flood*
-** description: anti-flood: nombre de secondes entre deux messages utilisateur (0 = pas d'anti-flood)
+* *irc.network.anti_flood_prio_high*
+** description: anti-flood pour la file d'attente haute priorité : nombre de secondes entre deux messages utilisateur ou commandes envoyés au serveur IRC (0 = pas d'anti-flood)
 ** type: entier
-** valeurs: 0 .. 5 (valeur par défaut: 2)
+** valeurs: 0 .. 60 (valeur par défaut: 2)
+
+* *irc.network.anti_flood_prio_low*
+** description: anti-flood pour la file d'attente basse priorité : nombre de secondes entre deux messages envoyés au serveur IRC (messages comme les réponses automatiques aux CTCP) (0 = pas d'anti-flood)
+** type: entier
+** valeurs: 0 .. 60 (valeur par défaut: 2)

 * *irc.network.away_check*
 ** description: intervalle entre deux vérifications des absences (en minutes, 0 = ne jamais vérifier)
@@ -141,7 +171,7 @@
 * *irc.network.away_check_max_nicks*
 ** description: ne pas vérifier les pseudos absents lorsqu'il y a un nombre important de pseudos (0 = pas de limite)
 ** type: entier
-** valeurs: 0 .. 2147483647 (valeur par défaut: 0)
+** valeurs: 0 .. 2147483647 (valeur par défaut: 25)

 * *irc.network.colors_receive*
 ** description: si désactivé, les codes couleurs des messages entrants sont ignorés
@@ -164,7 +194,7 @@
 ** valeurs: toute chaîne (valeur par défaut: "WeeChat %v")

 * *irc.network.lag_check*
-** description: intervalle entre deux vérifications des absences (en secondes, 0 = ne jamais vérifier)
+** description: intervalle entre deux vérifications du lag (en secondes, 0 = ne jamais vérifier)
 ** type: entier
 ** valeurs: 0 .. 2147483647 (valeur par défaut: 60)

@@ -209,10 +239,15 @@
 ** valeurs: 0 .. 65535 (valeur par défaut: 30)

 * *irc.server_default.autorejoin*
-** description: rejoindre automatiquement les canaux quand mis dehors
+** description: rejoindre automatiquement les canaux après un "kick"
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: off)

+* *irc.server_default.autorejoin_delay*
+** description: délai (en secondes) avant de rejoindre automatiquement (après un "kick")
+** type: entier
+** valeurs: 0 .. 86400 (valeur par défaut: 30)
+
 * *irc.server_default.command*
 ** description: commande(s) à exécuter lorsque connecté au serveur (plusieurs commandes doivent être séparées par ";", utilisez "\;" pour un point-virgule, les variables spéciales $nick, $channel et $server sont remplacées par leur valeur)
 ** type: chaîne
@@ -258,6 +293,21 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: off)

+* *irc.server_default.ssl_cert*
+** description: fichier de certificat ssl utilisé pour identifier automatiquement votre pseudo
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: "")
+
+* *irc.server_default.ssl_dhkey_size*
+** description: taille de clé utilisée pour l'échange de clé Diffie-Hellman
+** type: entier
+** valeurs: 0 .. 2147483647 (valeur par défaut: 2048)
+
+* *irc.server_default.ssl_verify*
+** description: vérifier que la connexion ssl est entièrement de confiance
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
 * *irc.server_default.username*
 ** description: nom d'utilisateur pour le serveur
 ** type: chaîne
@@ -23,6 +23,11 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: "%h/logs/")

+* *logger.file.replacement_char*
+** description: caractère de remplacement dans le nom de fichier construit avec le masque (comme le délimiteur de répertoire)
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: "_")
+
 * *logger.file.time_format*
 ** description: format de date/heure utilisé dans les fichiers log (voir strftime(3) pour le format de date/heure)
 ** type: chaîne
@@ -1,10 +1,16 @@
-&bull; *`/relay`* `[list | listfull]`::
+&bull; *`/relay`* `[list | listfull | add protocole.nom port | del protocole.nom]`::

 ........................................
  contrôle du relai

-      list: liste les clients pour le relai
-  listfull: liste les clients pour le relai (verbeux)
+           list: liste les clients pour le relai
+       listfull: liste les clients pour le relai (verbeux)
+      listrelay: liste les relais (nom et port)
+            add: ajoute un relai pour un protocole + nom
+            del: supprime un relai pour un protocole + nom
+  protocole.nom: protocole et nom à relayer
+                 par exemple: irc.freenode
+           port: port utilisé pour le relai
  
  Sans paramètre, cette commande ouvre le tampon avec la liste des clients pour le relai.
 ........................................
@@ -43,13 +43,8 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: on)

-* *relay.network.enabled*
-** description: activer le relai
-** type: booléen
-** valeurs: on, off (valeur par défaut: off)
-
-* *relay.network.listen_port_range*
-** description: restreint les fichiers/discussions sortants à utiliser des ports dans l'intervalle donné (pratique pour le NAT) (syntaxe: un port simple, par exemple 5000, un intervalle de ports, par exemple 5000-5015, si non renseigné tout port peut être utilisé, il est recommandé d'utiliser des ports supérieurs à 1024, car seul root peut utiliser les ports en dessous de 1024)
-** type: chaîne
-** valeurs: toute chaîne (valeur par défaut: "22373-22400")
+* *relay.network.max_clients*
+** description: nombre maximum de clients qui se connectent sur un port
+** type: entier
+** valeurs: 1 .. 1024 (valeur par défaut: 5)

@@ -10,10 +10,9 @@
      cond1,...: condition(s) pour afficher cette barre (seulement pour le type "window"):
                   active: sur la fenêtre active
                 inactive: sur les fenêtres inactives
-                 nicklist: sue les fenêtres avec liste de pseudos
+                 nicklist: sur les fenêtres avec liste de pseudos
                 sans condition, la barre est toujours affichée
       position: bottom (bas), top (haut), left (gauche) ou right (droite)
-    remplissage: horizontal, vertical, columns_horizontal ou columns_vertical
         taille: taille de la barre (en caractères)
     séparateur: 1 pour utiliser un séparateur (ligne), 0 ou rien signifie sans séparateur
     objet1,...: objets pour cette barre (les objets peuvent être séparés par une virgule (espace entre les objets) ou "+" (objets collés))
@@ -92,17 +91,18 @@
   commande: commande à exécuter (un '/' est automatiquement ajouté s'il n'est pas trouvé au début de la commande)
 ........................................

-&bull; *`/debug`* `[list | extension niveau | dump | buffer windows]`::
+&bull; *`/debug`* `[list | set extension niveau | dump | buffer | windows | term]`::

 ........................................
  contrôle du debug pour le coeur/les extensions

+        set: définir le niveau de log pour l'extension
  extension: nom de l'extension ("core" pour le coeur de WeeChat)
     niveau: niveau de debug pour l'extension
       dump: affiche les variables mémoire WeeChat dans le fichier log (les mêmes messages sont affichés lorsque WeeChat plante)
     buffer: affiche le contenu du tampon en valeurs hexadécimales dans le fichier log
    windows: affiche l'arbre des fenêtres<
-      texte: envoie le signal "debug" avec "texte" comme paramètre
+       term: afficher des infos sur le terminal et les couleurs disponibles
 ........................................

 &bull; *`/filter`* `[list] | [enable|disable|toggle [nom]] | [add nom extension.tampon tags regex] | [del nom|-all]`::
@@ -120,7 +120,7 @@
              -all: supprime tous les filtres
  extension.tampon: extension et tampon où le filtre est actif ("*" pour tous les tampons)
              tags: liste de tags, séparés par des virgules, par exemple: "irc_join,irc_part,irc_quit"
-             regex: expressoin régulière à rechercher dans la ligne (utiliser \t pour séparer le préfixe du message)
+             regex: expressoin régulière à rechercher dans la ligne (utiliser \t pour séparer le préfixe du message, les caractères spéciaux comme '|' doivent être échappés: '\|')
  
  La touche par défaut alt+'=' active/désactive le filtrage.
  
@@ -155,7 +155,7 @@
  valeur: nombre d'entrées dans l'historique à afficher
 ........................................

-&bull; *`/input`* `return | complete_next | complete_previous | search_next | delete_previous_char | delete_next_char | delete_previous_word | delete_next_word | delete_beginning_of_line | delete_end_of_line | delete_line | clipboard_paste | transpose_chars | move_beginning_of_line | move_end_of_line | move_previous_char | move_next_char | move_previous_word | move_next_word | history_previous | history_next | history_global_previous | history_global_next | jump_smart | jump_last_buffer | jump_previously_visited_buffer | jump_next_visited_buffer | hotlist_clear | grab_key | scroll_unread | set_unread | set_unread_current_buffer | insert [args]`::
+&bull; *`/input`* `return | complete_next | complete_previous | search_next | delete_previous_char | delete_next_char | delete_previous_word | delete_next_word | delete_beginning_of_line | delete_end_of_line | delete_line | clipboard_paste | transpose_chars | move_beginning_of_line | move_end_of_line | move_previous_char | move_next_char | move_previous_word | move_next_word | history_previous | history_next | history_global_previous | history_global_next | jump_smart | jump_last_buffer | jump_previously_visited_buffer | jump_next_visited_buffer | hotlist_clear | grab_key | grab_key_command | scroll_unread | set_unread | set_unread_current_buffer | insert [args]`::

 ........................................
  fonctions pour la ligne de commande
@@ -235,10 +235,13 @@
      /proxy del myproxy
 ........................................

-&bull; *`/quit`*::
+&bull; *`/quit`* `[paramètres]`::

 ........................................
  quitter WeeChat
+
+  paramètres: texte envoyé avec le signal "quit"
+              (par exemple l'extension irc utilise ce texte pour envoyer le message de quit au serveur)
 ........................................

 &bull; *`/reload`* `[fichier [fichier...]]`::
@@ -193,11 +193,6 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: lightgreen)

-* *weechat.color.input_nick*
-** description: couleur du texte pour le pseudo dans la ligne de saisie
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: lightcyan)
-
 * *weechat.color.input_text_not_found*
 ** description: couleur du texte pour la recherche infructueuse de texte dans la ligne de saisie
 ** type: couleur
@@ -243,11 +238,6 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: brown)

-* *weechat.color.nicklist_separator*
-** description: couleur du texte pour le séparateur de la liste des pseudos
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: blue)
-
 * *weechat.color.separator*
 ** description: couleur du fond pour les séparateurs de fenêtres (quand divisé)
 ** type: couleur
@@ -293,6 +283,11 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: yellow)

+* *weechat.color.status_time*
+** description: couleur du texte pour l'heure (barre de statut)
+** type: couleur
+** valeurs: un nom de couleur (valeur par défaut: default)
+
 * *weechat.completion.default_template*
 ** description: modèle de complétion par défaut (merci de consulter la documentation pour les codes et valeurs du modèle)
 ** type: chaîne
@@ -319,7 +314,7 @@
 ** valeurs: toute chaîne (valeur par défaut: "[]-^")

 * *weechat.completion.partial_completion_alert*
-** description: alterte de l'utilisateur lorsqu'une complétion partielle survient
+** description: alterte l'utilisateur lorsqu'une complétion partielle survient
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: on)

@@ -398,6 +393,11 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: "")

+* *weechat.look.hline_char*
+** description: caractère utilisé pour tracer les lignes horizontales, notez qu'une valeur vide tracera une vraie ligne avec ncurses, mais peut causer des problèmes d'affichage avec la sélection d'URL sous certains terminaux
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: "-")
+
 * *weechat.look.hotlist_names_count*
 ** description: nombre maximum de noms dans la liste d'activité (0 = pas de nom affiché, seulement les numéros de tampons)
 ** type: entier
@@ -471,13 +471,28 @@
 * *weechat.look.prefix_align_max*
 ** description: taille maximum pour le préfixe (0 = pas de taille maximum)
 ** type: entier
-** valeurs: 0 .. 64 (valeur par défaut: 0)
+** valeurs: 0 .. 128 (valeur par défaut: 0)
+
+* *weechat.look.prefix_align_more*
+** description: afficher '+' si le préfixe est tronqué
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)

 * *weechat.look.prefix_buffer_align*
 ** description: alignement de préfixe pour le nom du tampon, quand plusieurs tampons sont mélangés avec le même numéro (none, left, right (par défaut))
 ** type: entier
 ** valeurs: none, left, right (valeur par défaut: right)

+* *weechat.look.prefix_buffer_align_max*
+** description: taille maximum pour le nom du tampon, quand plusieurs tampons sont mélangés avec le même numéro (0 = pas de taille maximum)
+** type: entier
+** valeurs: 0 .. 128 (valeur par défaut: 0)
+
+* *weechat.look.prefix_buffer_align_more*
+** description: afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont mélangés avec le même numéro)
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
 * *weechat.look.prefix_error*
 ** description: préfixe pour les messages d'erreur
 ** type: chaîne
@@ -528,15 +543,20 @@
 ** type: entier
 ** valeurs: 1 .. 100 (valeur par défaut: 100)

+* *weechat.look.search_text_not_found_alert*
+** description: alterte l'utilisateur lorsque le texte cherché n'est pas trouvé dans le tampon
+** type: booléen
+** valeurs: on, off (valeur par défaut: on)
+
 * *weechat.look.set_title*
 ** description: définit le titre de la fenêtre (terminal pour l'interface Curses) avec le nom et la version
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: on)

-* *weechat.network.gnutls_dh_prime_bitsmax_lines*
-** description: taille minimum en bits pour la poignée de main (handshake) utilisant un échange de clé Diffie Hellman
-** type: entier
-** valeurs: 0 .. 2147483647 (valeur par défaut: 512)
+* *weechat.network.gnutls_ca_file*
+** description: fichier contenant les autorités de certification
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: "%h/ssl/CAs.pem")

 * *weechat.plugin.autoload*
 ** description: liste des extensions à charger automatiquement au démarrage, "*" signifie toutes (séparées par des virgules, les noms peuvent être partiels, par exemple "perl" est ok pour "perl.so")
@@ -1,3 +1,11 @@
+&bull; *`/me`* `message`::
+
+........................................
+  envoyer une action CTCP à l'hôte distant
+
+  message: message à envoyer
+........................................
+
 &bull; *`/xfer`* `[list | listfull]`::

 ........................................
@@ -31,8 +31,7 @@ Quelques fonctionnalités (version > = 0.3.x) :
 * multi-platformes
 * 100% GPL et libre

-Plus d'infos sur cette page :
-http://weechat.flashtux.org/features.php
+Plus d'infos sur cette page : http://www.weechat.org/features


 Compilation / installation
@@ -100,6 +99,9 @@ aucune fenêtre) ou affiché par une ou plusieurs fenêtres.
 Je ne vois pas bien certains accents dans WeeChat, que faire ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+C'est un problème courant, merci de lire attentivement et vérifier *TOUS* les
+points ci-dessous.
+
 Pour les versions < 0.2.3, merci d'installer la dernière version stable.

 Pour les versions > = 0.2.3 :
@@ -120,7 +122,7 @@ Pour les versions > = 0.2.3 :
 ** vérifiez que votre terminal est compatible UTF-8
   (un terminal conseillé pour l'UTF-8 est rxvt-unicode)
 ** si vous utilisez screen, vérifiez qu'il est lancé en mode UTF-8
-   ("`defutf8 on`" dans ~/.screnrc ou `screen -U` pour lancer screen)
+   ("`defutf8 on`" dans ~/.screenrc ou `screen -U` pour lancer screen)

 [NOTE]
 La locale UTF-8 est recommandée pour WeeChat. Si vous utilisez ISO ou une autre
@@ -176,8 +178,10 @@ Linux).

 Vous devez configurer ça :

-* avec WeeChat < = 0.2.6 : `/set plugins_extension = ".so.0.0"`
-* avec WeeChat > = 0.3.x : `/set weechat.plugin.extension ".so.0.0"`
+* avec WeeChat < = 0.2.6 : +
+  `/set plugins_extension = ".so.0.0"`
+* avec WeeChat > = 0.3.x : +
+  `/set weechat.plugin.extension ".so.0.0"`

 Puis: `/plugin autoload`.

@@ -213,36 +217,64 @@ utilisateurs en ISO, vous pouvez taper : `/shell setenv LANG=fr_FR`.


 [[terminal_copy_paste]]
-Avec l'interface Curses, comment puis-je copier/coller du texte sans coller la liste des pseudos ?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Comment puis-je copier/coller du texte sans coller la liste des pseudos ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Vous pouvez utiliser un terminal qui propose la sélection rectangulaire (comme
-rxvt-unicode, konsole, etc...). La touche est habituellement ctrl + alt +
-sélection à la souris.
+rxvt-unicode, konsole, gnome-terminal, etc...). La touche est habituellement
+ctrl + alt + sélection à la souris.

 Une autre solution est de déplacer la liste des pseudos en haut ou en bas, par
 exemple :

-* avec WeeChat < = 0.2.6 : `/set look_nicklist_position = top`
-* avec WeeChat > = 0.3.x : `/bar set nicklist position top`
+* avec WeeChat < = 0.2.6 : +
+  `/set look_nicklist_position = top`
+* avec WeeChat > = 0.3.x : +
+  `/bar set nicklist position top`
+
+
+[[urls]]
+Comment puis-je cliquer sur les longs URLs (plus d'une ligne) ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+WeeChat affiche l'heure et un préfixe pour chaque ligne avec des barres
+optionnelles autour de la zone de discussion, donc il n'est pas possible
+d'afficher les longs URLs sans les tronquer.
+
+Vous pouvez utiliser un des scripts suivants :
+
+urlbar.py::
+    affiche les URLs dans une barre
+
+urlgrab.py::
+    enregistre les URLs et les ouvre dans un navigateur
+
+url_shorten.rb::
+tinyurl.py::
+shortenurl.py::
+    réduit les URLs longs
+
+Liste des scripts manipulant des URLs :
+http://www.weechat.org/scripts/stable/tag/url


 [[highlight_notification]]
 Comment être averti lorsque quelqu'un prononce mon pseudo sur un canal ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Vous pouvez utiliser le script 'sound.pl' (disponible sur la page des scripts),
-puis configurer une commande système (jouant un son, affichant un message à
-l'écran, etc...) comme ceci :
+Selon la version de WeeChat :

-* avec WeeChat < = 0.2.6 :
-  `/setp perl.sound.cmd_highlight = "/chemin/commande parametres"`
-* avec WeeChat > = 0.3.x :
-  `/set plugins.var.perl.sound.cmd_highlight "/chemin/commande parametres"`
+* avec WeeChat < = 0.2.6 : utilisez le script 'sound.pl' (disponible sur la
+  page des scripts), puis configurez une commande système (jouant un son,
+  affichant un message à l'écran, etc...) comme ceci : +
+  `/setp perl.sound.cmd_highlight = "/chemin/vers/commande parametres"`
+* avec WeeChat > = 0.3.x : utilisez le script 'launcher.pl' (disponible sur la
+  page des scripts), puis configurez une commande système (jouant un son,
+  affichant un message à l'écran, etc...) comme ceci : +
+  `/set plugins.var.perl.launcher.signal.weechat_highlight "/chemin/vers/commande parametres"`

 De nombreux autres scripts de notification existent, merci de consulter la
-liste des extensions/scripts :
-http://weechat.flashtux.org/plugins.php
+liste des extensions/scripts : http://www.weechat.org/scripts


 [[filter_irc_join_part_quit]]
@@ -259,8 +291,8 @@ Selon la version de WeeChat :

 * avec WeeChat > = 0.3.x :

-** filtre interlligent (pour garder les join/part/quit des utilisateurs qui
-   ont parlé récemment) : +
+** filtre intelligent (pour garder les join/part/quit des utilisateurs qui ont
+   parlé récemment) : +
   `/set irc.look.smart_filter on` +
   `/filter add irc_smart * irc_smart_filter *` +
    (`/help irc.look.smart_filter` et `/help filter` pour l'aide)
@@ -306,8 +338,7 @@ Il y a 3 possibilités :
  * demander une nouvelle fonctionnalité: https://savannah.nongnu.org/task/?group=weechat
  * envoyer un patch: https://savannah.nongnu.org/patch/?group=weechat
 . vous pouvez envoyer un mail aux développeurs, consultez la page support
-  pour les mails des développeurs :
-  http://weechat.flashtux.org/support.php
+  pour les mails des développeurs : http://www.weechat.org/about
  (vous pouvez souscrire et envoyer à la liste de diffusion nommée "support")


@@ -315,8 +346,7 @@ Il y a 3 possibilités :
 Quelle est la liste des plate-formes supportées par WeeChat ? Sera-t-il porté sur d'autres systèmes d'exploitation ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-La liste complète est sur cette page :
-http://weechat.flashtux.org/download.php?view=supported_os
+La liste complète est sur cette page : http://www.weechat.org/download

 Nous faisons le maximum pour supporter le plus de plate-formes possible.
 Toute aide est la bienvenue pour les systèmes que nous n'avons pas, pous y
@@ -330,8 +360,7 @@ Je souhaiterai aider les développeurs WeeChat. Que puis-je faire ?
 Il y a plusieurs choses à faire (test, code, documentation, etc...)

 Merci de prendre contact avec nous par IRC ou mail, consultez la page
-support :
-http://weechat.flashtux.org/support.php
+support : http://www.weechat.org/about


 [[donate]]
@@ -339,4 +368,4 @@ Puis-je donner de l'argent ou d'autres choses aux développeurs WeeChat ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 Vous pouvez donner de l'argent pour aider le développement.
-Plus de détails sur http://weechat.flashtux.org/donate.php
+Plus de détails sur http://www.weechat.org/donate
@@ -136,9 +136,19 @@ Se connecter au serveur IRC et rejoindre les canaux

  /connect oftc

-Note : cette commande peut aussi être utilisée pour créer et se connecter
-au serveur sans utiliser la commande `/server` (devrais-je répéter que vous
-pouvez voir l'aide pour cette commande avec `/help connect` ? ;)
+[NOTE]
+Cette commande peut aussi être utilisée pour créer et se connecter au serveur
+sans utiliser la commande `/server` (devrais-je répéter que vous pouvez voir
+l'aide pour cette commande avec `/help connect` ?).
+
+Par défaut, les tampons des serveurs sont mélangés avec le tampon 'core'
+WeeChat. Pour basculer entre le tampon 'core' et les tampons des serveurs, il
+faut utiliser la touche ctrl-X.
+
+Il est possible de désactiver le mélange des tampons serveurs pour avoir un
+tampon distinct par serveur :
+
+  /set irc.look.server_buffer independent


 [[join_part_irc_channels]]
@@ -220,7 +230,9 @@ Extensions/scripts

 Sur certaines distributions comme Debian, les extensions sont disponibles
 via un paquet séparé (par exemple weechat-plugins).
-Les extensions sont automatiquement chargées lorsqu'elles sont trouvées.
+Les extensions sont automatiquement chargées lorsqu'elles sont trouvées
+(merci de regarder la documentation WeeChat pour charger/décharger des
+extensions ou des scripts).

 Des extensions permettent d'utiliser des scripts dans WeeChat (dans
 différent langages comme Perl, Python, Ruby, Lua et Tcl). Ces extensions
@@ -228,10 +240,14 @@ doivent être chargées avec la commande `/plugin` et elles fournissent des
 commandes telles que `/perl`, utilisées pour charger les scripts.

 Plusieurs extensions/scripts (de contributeurs) sont disponibles pour
-WeeChat : http://weechat.flashtux.org/plugins.php
+WeeChat : http://www.weechat.org/scripts

-Merci de regarder la documentation WeeChat pour charger/décharger des
-extensions ou des scripts.
+La manière la plus simple pour installer des scripts consiste à utiliser le
+script 'weeget.py' :
+
+. téléchargez et copiez 'weeget.py' dans ~/.weechat/python/autoload/
+. chargez le script : `/python autoload`
+. liste des scripts : `/weeget list` (pour l'aide: `/help weeget`)


 [[more_doc]]
@@ -239,6 +255,6 @@ Plus de documentation
 ---------------------

 Vous pouvez maintenant utiliser WeeChat et lire la FAQ/documentation pour
-toute autre question : http://weechat.flashtux.org/doc.php
+toute autre question : http://www.weechat.org/doc

 Bon WeeChat !
--- a/Show More
+++ b/Show More