diff --git a/doc/de/weechat_scripting.de.asciidoc b/doc/de/weechat_scripting.de.asciidoc
index f677995d3..d1d675cb1 100644
--- a/doc/de/weechat_scripting.de.asciidoc
+++ b/doc/de/weechat_scripting.de.asciidoc
@@ -395,85 +395,235 @@ lesen Sie bitte _WeeChat Plugin API Reference_.
 
 Liste der Skript API Funktionen:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Kategorie           | Funktionen
-| Allgemein           |
+| Kategorie | Funktionen
+
+| Allgemein |
   register
-| Erweiterungen       |
+
+| Erweiterungen |
   plugin_get_name
-| Strings             |
-  charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
-  strlen_screen, string_match, string_has_highlight, string_has_highlight_regex,
-  string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer, string_eval_expression, string_eval_path_home
-| Verzeichnisse       |
-  mkdir_home, mkdir, mkdir_parents
-| sortierte Listen    |
-  list_new, list_add, list_search, list_search_pos, list_casesearch,
-  list_casesearch_pos, list_get, list_set, list_next, list_prev, list_string,
-  list_size, list_remove, list_remove_all, list_free
+
+| Strings |
+  charset_set +
+  iconv_to_internal +
+  iconv_from_internal +
+  gettext +
+  ngettext +
+  strlen_screen +
+  string_match +
+  string_has_highlight +
+  string_has_highlight_regex +
+  string_mask_to_regex +
+  string_remove_color +
+  string_is_command_char +
+  string_input_for_buffer +
+  string_eval_expression +
+  string_eval_path_home
+
+| Verzeichnisse |
+  mkdir_home +
+  mkdir +
+  mkdir_parents
+
+| sortierte Listen |
+  list_new +
+  list_add +
+  list_search +
+  list_search_pos +
+  list_casesearch +
+  list_casesearch_pos +
+  list_get +
+  list_set +
+  list_next +
+  list_prev +
+  list_string +
+  list_size +
+  list_remove +
+  list_remove_all +
+  list_free
+
 | Konfigurationsdatei |
-  config_new, config_new_section, config_search_section, config_new_option,
-  config_search_option, +
-  config_string_to_boolean, config_option_reset, config_option_set,
-  config_option_set_null, config_option_unset, config_option_rename,
-  config_option_is_null, config_option_default_is_null, +
-  config_boolean, config_boolean_default, config_integer, config_integer_default,
-  config_string, config_string_default, config_color, config_color_default, +
-  config_write_option, config_write_line, config_write, config_read,
-  config_reload, +
-  config_option_free, config_section_free_options, config_section_free,
-  config_free, +
-  config_get, config_get_plugin, config_is_set_plugin, config_set_plugin,
-  config_set_desc_plugin, config_unset_plugin
-| Tastenbelegung      |
-  key_bind, key_unbind
-| Ausgabe             |
-  prefix, color, print (für Python: prnt), print_date_tags (für Python:
-  prnt_date_tags), print_y (für Python: prnt_y), log_print
-| Hooks               |
-  hook_command, hook_command_run, hook_timer, hook_fd, hook_process,
-  hook_process_hashtable, hook_connect, hook_print, hook_signal,
-  hook_signal_send, hook_hsignal, hook_hsignal_send, hook_config,
-  hook_completion, hook_completion_list_add, hook_modifier, hook_modifier_exec,
-  hook_info, hook_info_hashtable, hook_infolist, hook_focus, hook_set, unhook,
+  config_new +
+  config_new_section +
+  config_search_section +
+  config_new_option +
+  config_search_option +
+  config_string_to_boolean +
+  config_option_reset +
+  config_option_set +
+  config_option_set_null +
+  config_option_unset +
+  config_option_rename +
+  config_option_is_null +
+  config_option_default_is_null +
+  config_boolean +
+  config_boolean_default +
+  config_integer +
+  config_integer_default +
+  config_string +
+  config_string_default +
+  config_color +
+  config_color_default +
+  config_write_option +
+  config_write_line +
+  config_write +
+  config_read +
+  config_reload +
+  config_option_free +
+  config_section_free_options +
+  config_section_free +
+  config_free +
+  config_get +
+  config_get_plugin +
+  config_is_set_plugin +
+  config_set_plugin +
+  config_set_desc_plugin +
+  config_unset_plugin
+
+| Tastenbelegung |
+  key_bind +
+  key_unbind
+
+| Ausgabe |
+  prefix +
+  color +
+  print (für Python: prnt) +
+  print_date_tags (für Python:
+  prnt_date_tags) +
+  print_y (für Python: prnt_y) +
+  log_print
+
+| Hooks |
+  hook_command +
+  hook_command_run +
+  hook_timer +
+  hook_fd +
+  hook_process +
+  hook_process_hashtable +
+  hook_connect +
+  hook_print +
+  hook_signal +
+  hook_signal_send +
+  hook_hsignal +
+  hook_hsignal_send +
+  hook_config +
+  hook_completion +
+  hook_completion_list_add +
+  hook_modifier +
+  hook_modifier_exec +
+  hook_info +
+  hook_info_hashtable +
+  hook_infolist +
+  hook_focus +
+  hook_set +
+  unhook +
   unhook_all
-| Buffer              |
-  buffer_new, 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, buffer_match_list
-| Fenster             |
-  current_window, window_search_with_buffer, window_get_integer,
-  window_get_string, window_get_pointer, window_set_title
-| Nickliste           |
-  nicklist_add_group, nicklist_search_group, nicklist_add_nick,
-  nicklist_search_nick, nicklist_remove_group, nicklist_remove_nick,
-  nicklist_remove_all, nicklist_group_get_integer, nicklist_group_get_string,
-  nicklist_group_get_pointer, nicklist_group_set, nicklist_nick_get_integer,
-  nicklist_nick_get_string, nicklist_nick_get_pointer, nicklist_nick_set
-| Bars                |
-  bar_item_search, bar_item_new, bar_item_update, bar_item_remove, bar_search,
-  bar_new, bar_set, bar_update, bar_remove
-| Befehle             |
+
+| Buffer |
+  buffer_new +
+  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 +
+  buffer_match_list
+
+| Fenster |
+  current_window +
+  window_search_with_buffer +
+  window_get_integer +
+  window_get_string +
+  window_get_pointer +
+  window_set_title
+
+| Nickliste |
+  nicklist_add_group +
+  nicklist_search_group +
+  nicklist_add_nick +
+  nicklist_search_nick +
+  nicklist_remove_group +
+  nicklist_remove_nick +
+  nicklist_remove_all +
+  nicklist_group_get_integer +
+  nicklist_group_get_string +
+  nicklist_group_get_pointer +
+  nicklist_group_set +
+  nicklist_nick_get_integer +
+  nicklist_nick_get_string +
+  nicklist_nick_get_pointer +
+  nicklist_nick_set
+
+| Bars |
+  bar_item_search +
+  bar_item_new +
+  bar_item_update +
+  bar_item_remove +
+  bar_search +
+  bar_new +
+  bar_set +
+  bar_update +
+  bar_remove
+
+| Befehle |
   command
-| Informationen       |
-  info_get, info_get_hashtable
-| Infolisten          |
-  infolist_new, infolist_new_item, infolist_new_var_integer,
-  infolist_new_var_string, infolist_new_var_pointer, infolist_new_var_time, +
-  infolist_get, infolist_next, infolist_prev, infolist_reset_item_cursor, +
-  infolist_fields, infolist_integer, infolist_string, infolist_pointer, +
-  infolist_time, infolist_free
-| hdata               |
-  hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
-  hdata_get_var_array_size, hdata_get_var_array_size_string,
-  hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
-  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
-| Upgrade             |
-  upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
+
+| Informationen |
+  info_get +
+  info_get_hashtable
+
+| Infolisten |
+  infolist_new +
+  infolist_new_item +
+  infolist_new_var_integer +
+  infolist_new_var_string +
+  infolist_new_var_pointer +
+  infolist_new_var_time +
+  infolist_get +
+  infolist_next +
+  infolist_prev +
+  infolist_reset_item_cursor +
+  infolist_fields +
+  infolist_integer +
+  infolist_string +
+  infolist_pointer +
+  infolist_time +
+  infolist_free
+
+| hdata |
+  hdata_get +
+  hdata_get_var_offset +
+  hdata_get_var_type_string +
+  hdata_get_var_array_size +
+  hdata_get_var_array_size_string +
+  hdata_get_var_hdata +
+  hdata_get_list +
+  hdata_check_pointer +
+  hdata_move +
+  hdata_search +
+  hdata_char +
+  hdata_integer +
+  hdata_long +
+  hdata_string +
+  hdata_pointer +
+  hdata_time +
+  hdata_hashtable +
+  hdata_update +
+  hdata_get_string
+
+| Upgrade |
+  upgrade_new +
+  upgrade_write_object +
+  upgrade_read +
+  upgrade_close
 |===
 
 [[script_api_constants]]
@@ -481,35 +631,63 @@ Liste der Skript API Funktionen:
 
 Liste der Konstanten in Skript API:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Kategorie           | Konstanten
-| return codes        |
-  WEECHAT_RC_OK, WEECHAT_RC_OK_EAT, WEECHAT_RC_ERROR
+| Kategorie | Konstanten
+
+| return codes |
+  WEECHAT_RC_OK +
+  WEECHAT_RC_OK_EAT +
+  WEECHAT_RC_ERROR
+
 | Konfigurationsdatei |
-  WEECHAT_CONFIG_READ_OK, WEECHAT_CONFIG_READ_MEMORY_ERROR,
-  WEECHAT_CONFIG_READ_FILE_NOT_FOUND, WEECHAT_CONFIG_WRITE_OK,
-  WEECHAT_CONFIG_WRITE_ERROR, WEECHAT_CONFIG_WRITE_MEMORY_ERROR, +
-  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED, WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE,
-  WEECHAT_CONFIG_OPTION_SET_ERROR, WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET, WEECHAT_CONFIG_OPTION_UNSET_OK_RESET,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED, WEECHAT_CONFIG_OPTION_UNSET_ERROR
-| sortierte Listen    |
-  WEECHAT_LIST_POS_SORT, WEECHAT_LIST_POS_BEGINNING, WEECHAT_LIST_POS_END
-| Hotlist             |
-  WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE, WEECHAT_HOTLIST_PRIVATE,
+  WEECHAT_CONFIG_READ_OK +
+  WEECHAT_CONFIG_READ_MEMORY_ERROR +
+  WEECHAT_CONFIG_READ_FILE_NOT_FOUND +
+  WEECHAT_CONFIG_WRITE_OK +
+  WEECHAT_CONFIG_WRITE_ERROR +
+  WEECHAT_CONFIG_WRITE_MEMORY_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED +
+  WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE +
+  WEECHAT_CONFIG_OPTION_SET_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED +
+  WEECHAT_CONFIG_OPTION_UNSET_ERROR
+
+| sortierte Listen |
+  WEECHAT_LIST_POS_SORT +
+  WEECHAT_LIST_POS_BEGINNING +
+  WEECHAT_LIST_POS_END
+
+| Hotlist |
+  WEECHAT_HOTLIST_LOW +
+  WEECHAT_HOTLIST_MESSAGE +
+  WEECHAT_HOTLIST_PRIVATE +
   WEECHAT_HOTLIST_HIGHLIGHT
-| hook Prozesse       |
-  WEECHAT_HOOK_PROCESS_RUNNING, WEECHAT_HOOK_PROCESS_ERROR
-| hook Connect        |
-  WEECHAT_HOOK_CONNECT_OK, WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND,
-  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
-  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
-  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+
+| hook Prozesse |
+  WEECHAT_HOOK_PROCESS_RUNNING +
+  WEECHAT_HOOK_PROCESS_ERROR
+
+| hook Connect |
+  WEECHAT_HOOK_CONNECT_OK +
+  WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED +
+  WEECHAT_HOOK_CONNECT_PROXY_ERROR +
+  WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR +
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR +
+  WEECHAT_HOOK_CONNECT_TIMEOUT +
   WEECHAT_HOOK_CONNECT_SOCKET_ERROR
-| hook Signal         |
-  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
+
+| hook Signal |
+  WEECHAT_HOOK_SIGNAL_STRING +
+  WEECHAT_HOOK_SIGNAL_INT +
+  WEECHAT_HOOK_SIGNAL_POINTER
 |===
 
 [[common_tasks]]
diff --git a/doc/en/weechat_scripting.en.asciidoc b/doc/en/weechat_scripting.en.asciidoc
index 10ecb0c7a..2deff4bed 100644
--- a/doc/en/weechat_scripting.en.asciidoc
+++ b/doc/en/weechat_scripting.en.asciidoc
@@ -382,85 +382,235 @@ _WeeChat Plugin API Reference_.
 
 List of functions in script API:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Category            | Functions
-| general             |
+| Category | Functions
+
+| general |
   register
-| plugins             |
+
+| plugins |
   plugin_get_name
-| strings             |
-  charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
-  strlen_screen, string_match, string_has_highlight, string_has_highlight_regex,
-  string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer, string_eval_expression, string_eval_path_home
-| directories         |
-  mkdir_home, mkdir, mkdir_parents
-| sorted lists        |
-  list_new, list_add, list_search, list_search_pos, list_casesearch,
-  list_casesearch_pos, list_get, list_set, list_next, list_prev, list_string,
-  list_size, list_remove, list_remove_all, list_free
+
+| strings |
+  charset_set +
+  iconv_to_internal +
+  iconv_from_internal +
+  gettext +
+  ngettext +
+  strlen_screen +
+  string_match +
+  string_has_highlight +
+  string_has_highlight_regex +
+  string_mask_to_regex +
+  string_remove_color +
+  string_is_command_char +
+  string_input_for_buffer +
+  string_eval_expression +
+  string_eval_path_home
+
+| directories |
+  mkdir_home +
+  mkdir +
+  mkdir_parents
+
+| sorted lists |
+  list_new +
+  list_add +
+  list_search +
+  list_search_pos +
+  list_casesearch +
+  list_casesearch_pos +
+  list_get +
+  list_set +
+  list_next +
+  list_prev +
+  list_string +
+  list_size +
+  list_remove +
+  list_remove_all +
+  list_free
+
 | configuration files |
-  config_new, config_new_section, config_search_section, config_new_option,
-  config_search_option, +
-  config_string_to_boolean, config_option_reset, config_option_set,
-  config_option_set_null, config_option_unset, config_option_rename,
-  config_option_is_null, config_option_default_is_null, +
-  config_boolean, config_boolean_default, config_integer, config_integer_default,
-  config_string, config_string_default, config_color, config_color_default, +
-  config_write_option, config_write_line, config_write, config_read,
-  config_reload, +
-  config_option_free, config_section_free_options, config_section_free,
-  config_free, +
-  config_get, config_get_plugin, config_is_set_plugin, config_set_plugin,
-  config_set_desc_plugin, config_unset_plugin
-| key bindings        |
-  key_bind, key_unbind
-| display             |
-  prefix, color, print (for python: prnt), print_date_tags (for python:
-  prnt_date_tags), print_y (for python: prnt_y), log_print
-| hooks               |
-  hook_command, hook_command_run, hook_timer, hook_fd, hook_process,
-  hook_process_hashtable, hook_connect, hook_print, hook_signal,
-  hook_signal_send, hook_hsignal, hook_hsignal_send, hook_config,
-  hook_completion, hook_completion_list_add, hook_modifier, hook_modifier_exec,
-  hook_info, hook_info_hashtable, hook_infolist, hook_focus, hook_set, unhook,
+  config_new +
+  config_new_section +
+  config_search_section +
+  config_new_option +
+  config_search_option +
+  config_string_to_boolean +
+  config_option_reset +
+  config_option_set +
+  config_option_set_null +
+  config_option_unset +
+  config_option_rename +
+  config_option_is_null +
+  config_option_default_is_null +
+  config_boolean +
+  config_boolean_default +
+  config_integer +
+  config_integer_default +
+  config_string +
+  config_string_default +
+  config_color +
+  config_color_default +
+  config_write_option +
+  config_write_line +
+  config_write +
+  config_read +
+  config_reload +
+  config_option_free +
+  config_section_free_options +
+  config_section_free +
+  config_free +
+  config_get +
+  config_get_plugin +
+  config_is_set_plugin +
+  config_set_plugin +
+  config_set_desc_plugin +
+  config_unset_plugin
+
+| key bindings |
+  key_bind +
+  key_unbind
+
+| display |
+  prefix +
+  color +
+  print (for python: prnt) +
+  print_date_tags (for python:
+  prnt_date_tags) +
+  print_y (for python: prnt_y) +
+  log_print
+
+| hooks |
+  hook_command +
+  hook_command_run +
+  hook_timer +
+  hook_fd +
+  hook_process +
+  hook_process_hashtable +
+  hook_connect +
+  hook_print +
+  hook_signal +
+  hook_signal_send +
+  hook_hsignal +
+  hook_hsignal_send +
+  hook_config +
+  hook_completion +
+  hook_completion_list_add +
+  hook_modifier +
+  hook_modifier_exec +
+  hook_info +
+  hook_info_hashtable +
+  hook_infolist +
+  hook_focus +
+  hook_set +
+  unhook +
   unhook_all
-| buffers             |
-  buffer_new, 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, buffer_match_list
-| windows             |
-  current_window, window_search_with_buffer, window_get_integer,
-  window_get_string, window_get_pointer, window_set_title
-| nicklist            |
-  nicklist_add_group, nicklist_search_group, nicklist_add_nick,
-  nicklist_search_nick, nicklist_remove_group, nicklist_remove_nick,
-  nicklist_remove_all, nicklist_group_get_integer, nicklist_group_get_string,
-  nicklist_group_get_pointer, nicklist_group_set, nicklist_nick_get_integer,
-  nicklist_nick_get_string, nicklist_nick_get_pointer, nicklist_nick_set
-| bars                |
-  bar_item_search, bar_item_new, bar_item_update, bar_item_remove, bar_search,
-  bar_new, bar_set, bar_update, bar_remove
-| commands            |
+
+| buffers |
+  buffer_new +
+  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 +
+  buffer_match_list
+
+| windows |
+  current_window +
+  window_search_with_buffer +
+  window_get_integer +
+  window_get_string +
+  window_get_pointer +
+  window_set_title
+
+| nicklist |
+  nicklist_add_group +
+  nicklist_search_group +
+  nicklist_add_nick +
+  nicklist_search_nick +
+  nicklist_remove_group +
+  nicklist_remove_nick +
+  nicklist_remove_all +
+  nicklist_group_get_integer +
+  nicklist_group_get_string +
+  nicklist_group_get_pointer +
+  nicklist_group_set +
+  nicklist_nick_get_integer +
+  nicklist_nick_get_string +
+  nicklist_nick_get_pointer +
+  nicklist_nick_set
+
+| bars |
+  bar_item_search +
+  bar_item_new +
+  bar_item_update +
+  bar_item_remove +
+  bar_search +
+  bar_new +
+  bar_set +
+  bar_update +
+  bar_remove
+
+| commands |
   command
-| infos               |
-  info_get, info_get_hashtable
-| infolists           |
-  infolist_new, infolist_new_item, infolist_new_var_integer,
-  infolist_new_var_string, infolist_new_var_pointer, infolist_new_var_time, +
-  infolist_get, infolist_next, infolist_prev, infolist_reset_item_cursor, +
-  infolist_fields, infolist_integer, infolist_string, infolist_pointer, +
-  infolist_time, infolist_free
-| hdata               |
-  hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
-  hdata_get_var_array_size, hdata_get_var_array_size_string,
-  hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
-  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
-| upgrade             |
-  upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
+
+| infos |
+  info_get +
+  info_get_hashtable
+
+| infolists |
+  infolist_new +
+  infolist_new_item +
+  infolist_new_var_integer +
+  infolist_new_var_string +
+  infolist_new_var_pointer +
+  infolist_new_var_time +
+  infolist_get +
+  infolist_next +
+  infolist_prev +
+  infolist_reset_item_cursor +
+  infolist_fields +
+  infolist_integer +
+  infolist_string +
+  infolist_pointer +
+  infolist_time +
+  infolist_free
+
+| hdata |
+  hdata_get +
+  hdata_get_var_offset +
+  hdata_get_var_type_string +
+  hdata_get_var_array_size +
+  hdata_get_var_array_size_string +
+  hdata_get_var_hdata +
+  hdata_get_list +
+  hdata_check_pointer +
+  hdata_move +
+  hdata_search +
+  hdata_char +
+  hdata_integer +
+  hdata_long +
+  hdata_string +
+  hdata_pointer +
+  hdata_time +
+  hdata_hashtable +
+  hdata_update +
+  hdata_get_string
+
+| upgrade |
+  upgrade_new +
+  upgrade_write_object +
+  upgrade_read +
+  upgrade_close
 |===
 
 [[script_api_constants]]
@@ -468,35 +618,63 @@ List of functions in script API:
 
 List of constants in script API:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Category            | Constants
-| return codes        |
-  WEECHAT_RC_OK, WEECHAT_RC_OK_EAT, WEECHAT_RC_ERROR
+| Category | Constants
+
+| return codes |
+  WEECHAT_RC_OK +
+  WEECHAT_RC_OK_EAT +
+  WEECHAT_RC_ERROR
+
 | configuration files |
-  WEECHAT_CONFIG_READ_OK, WEECHAT_CONFIG_READ_MEMORY_ERROR,
-  WEECHAT_CONFIG_READ_FILE_NOT_FOUND, WEECHAT_CONFIG_WRITE_OK,
-  WEECHAT_CONFIG_WRITE_ERROR, WEECHAT_CONFIG_WRITE_MEMORY_ERROR, +
-  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED, WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE,
-  WEECHAT_CONFIG_OPTION_SET_ERROR, WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET, WEECHAT_CONFIG_OPTION_UNSET_OK_RESET,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED, WEECHAT_CONFIG_OPTION_UNSET_ERROR
-| sorted lists        |
-  WEECHAT_LIST_POS_SORT, WEECHAT_LIST_POS_BEGINNING, WEECHAT_LIST_POS_END
-| hotlist             |
-  WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE, WEECHAT_HOTLIST_PRIVATE,
+  WEECHAT_CONFIG_READ_OK +
+  WEECHAT_CONFIG_READ_MEMORY_ERROR +
+  WEECHAT_CONFIG_READ_FILE_NOT_FOUND +
+  WEECHAT_CONFIG_WRITE_OK +
+  WEECHAT_CONFIG_WRITE_ERROR +
+  WEECHAT_CONFIG_WRITE_MEMORY_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED +
+  WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE +
+  WEECHAT_CONFIG_OPTION_SET_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED +
+  WEECHAT_CONFIG_OPTION_UNSET_ERROR
+
+| sorted lists |
+  WEECHAT_LIST_POS_SORT +
+  WEECHAT_LIST_POS_BEGINNING +
+  WEECHAT_LIST_POS_END
+
+| hotlist |
+  WEECHAT_HOTLIST_LOW +
+  WEECHAT_HOTLIST_MESSAGE +
+  WEECHAT_HOTLIST_PRIVATE +
   WEECHAT_HOTLIST_HIGHLIGHT
-| hook process        |
-  WEECHAT_HOOK_PROCESS_RUNNING, WEECHAT_HOOK_PROCESS_ERROR
-| hook connect        |
-  WEECHAT_HOOK_CONNECT_OK, WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND,
-  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
-  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
-  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+
+| hook process |
+  WEECHAT_HOOK_PROCESS_RUNNING +
+  WEECHAT_HOOK_PROCESS_ERROR
+
+| hook connect |
+  WEECHAT_HOOK_CONNECT_OK +
+  WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED +
+  WEECHAT_HOOK_CONNECT_PROXY_ERROR +
+  WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR +
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR +
+  WEECHAT_HOOK_CONNECT_TIMEOUT +
   WEECHAT_HOOK_CONNECT_SOCKET_ERROR
-| hook signal         |
-  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
+
+| hook signal |
+  WEECHAT_HOOK_SIGNAL_STRING +
+  WEECHAT_HOOK_SIGNAL_INT +
+  WEECHAT_HOOK_SIGNAL_POINTER
 |===
 
 [[common_tasks]]
diff --git a/doc/fr/weechat_scripting.fr.asciidoc b/doc/fr/weechat_scripting.fr.asciidoc
index a84db5773..41f31d3d1 100644
--- a/doc/fr/weechat_scripting.fr.asciidoc
+++ b/doc/fr/weechat_scripting.fr.asciidoc
@@ -393,85 +393,235 @@ _Référence API Extension WeeChat_.
 
 Liste des fonctions de l'API script :
 
-[width="100%",cols="^1,10",options="header"]
+[width="75",cols="1,3",options="header"]
 |===
-| Catégorie                 | Fonctions
-| général                   |
+| Catégorie | Fonctions
+
+| général |
   register
-| extensions                |
+
+| extensions |
   plugin_get_name
-| chaînes                   |
-  charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
-  strlen_screen, string_match, string_has_highlight, string_has_highlight_regex,
-  string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer, string_eval_expression, string_eval_path_home
-| répertoires               |
-  mkdir_home, mkdir, mkdir_parents
-| listes triées             |
-  list_new, list_add, list_search, list_search_pos, list_casesearch,
-  list_casesearch_pos, list_get, list_set, list_next, list_prev, list_string,
-  list_size, list_remove, list_remove_all, list_free
+
+| chaînes |
+  charset_set +
+  iconv_to_internal +
+  iconv_from_internal +
+  gettext +
+  ngettext +
+  strlen_screen +
+  string_match +
+  string_has_highlight +
+  string_has_highlight_regex +
+  string_mask_to_regex +
+  string_remove_color +
+  string_is_command_char +
+  string_input_for_buffer +
+  string_eval_expression +
+  string_eval_path_home
+
+| répertoires |
+  mkdir_home +
+  mkdir +
+  mkdir_parents
+
+| listes triées |
+  list_new +
+  list_add +
+  list_search +
+  list_search_pos +
+  list_casesearch +
+  list_casesearch_pos +
+  list_get +
+  list_set +
+  list_next +
+  list_prev +
+  list_string +
+  list_size +
+  list_remove +
+  list_remove_all +
+  list_free
+
 | fichiers de configuration |
-  config_new, config_new_section, config_search_section, config_new_option,
-  config_search_option, +
-  config_string_to_boolean, config_option_reset, config_option_set,
-  config_option_set_null, config_option_unset, config_option_rename,
-  config_option_is_null, config_option_default_is_null, +
-  config_boolean, config_boolean_default, config_integer, config_integer_default,
-  config_string, config_string_default, config_color, config_color_default, +
-  config_write_option, config_write_line, config_write, config_read,
-  config_reload, +
-  config_option_free, config_section_free_options, config_section_free,
-  config_free, +
-  config_get, config_get_plugin, config_is_set_plugin, config_set_plugin,
-  config_set_desc_plugin, config_unset_plugin
-| associations de touches   |
-  key_bind, key_unbind
-| affichage                 |
-  prefix, color, print (pour python : prnt), print_date_tags (pour python :
-  prnt_date_tags), print_y (pour python : prnt_y), log_print
-| hooks                     |
-  hook_command, hook_command_run, hook_timer, hook_fd, hook_process,
-  hook_process_hashtable, hook_connect, hook_print, hook_signal,
-  hook_signal_send, hook_hsignal, hook_hsignal_send, hook_config,
-  hook_completion, hook_completion_list_add, hook_modifier, hook_modifier_exec,
-  hook_info, hook_info_hashtable, hook_infolist, hook_focus, hook_set, unhook,
+  config_new +
+  config_new_section +
+  config_search_section +
+  config_new_option +
+  config_search_option +
+  config_string_to_boolean +
+  config_option_reset +
+  config_option_set +
+  config_option_set_null +
+  config_option_unset +
+  config_option_rename +
+  config_option_is_null +
+  config_option_default_is_null +
+  config_boolean +
+  config_boolean_default +
+  config_integer +
+  config_integer_default +
+  config_string +
+  config_string_default +
+  config_color +
+  config_color_default +
+  config_write_option +
+  config_write_line +
+  config_write +
+  config_read +
+  config_reload +
+  config_option_free +
+  config_section_free_options +
+  config_section_free +
+  config_free +
+  config_get +
+  config_get_plugin +
+  config_is_set_plugin +
+  config_set_plugin +
+  config_set_desc_plugin +
+  config_unset_plugin
+
+| associations de touches |
+  key_bind +
+  key_unbind
+
+| affichage |
+  prefix +
+  color +
+  print (pour python : prnt) +
+  print_date_tags (pour python :
+  prnt_date_tags) +
+  print_y (pour python : prnt_y) +
+  log_print
+
+| hooks |
+  hook_command +
+  hook_command_run +
+  hook_timer +
+  hook_fd +
+  hook_process +
+  hook_process_hashtable +
+  hook_connect +
+  hook_print +
+  hook_signal +
+  hook_signal_send +
+  hook_hsignal +
+  hook_hsignal_send +
+  hook_config +
+  hook_completion +
+  hook_completion_list_add +
+  hook_modifier +
+  hook_modifier_exec +
+  hook_info +
+  hook_info_hashtable +
+  hook_infolist +
+  hook_focus +
+  hook_set +
+  unhook +
   unhook_all
-| tampons                   |
-  buffer_new, 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, buffer_match_list
-| fenêtres                  |
-  current_window, window_search_with_buffer, window_get_integer,
-  window_get_string, window_get_pointer, window_set_title
-| liste des pseudos         |
-  nicklist_add_group, nicklist_search_group, nicklist_add_nick,
-  nicklist_search_nick, nicklist_remove_group, nicklist_remove_nick,
-  nicklist_remove_all, nicklist_group_get_integer, nicklist_group_get_string,
-  nicklist_group_get_pointer, nicklist_group_set, nicklist_nick_get_integer,
-  nicklist_nick_get_string, nicklist_nick_get_pointer, nicklist_nick_set
-| barres                    |
-  bar_item_search, bar_item_new, bar_item_update, bar_item_remove, bar_search,
-  bar_new, bar_set, bar_update, bar_remove
-| commandes                 |
+
+| tampons |
+  buffer_new +
+  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 +
+  buffer_match_list
+
+| fenêtres |
+  current_window +
+  window_search_with_buffer +
+  window_get_integer +
+  window_get_string +
+  window_get_pointer +
+  window_set_title
+
+| liste des pseudos |
+  nicklist_add_group +
+  nicklist_search_group +
+  nicklist_add_nick +
+  nicklist_search_nick +
+  nicklist_remove_group +
+  nicklist_remove_nick +
+  nicklist_remove_all +
+  nicklist_group_get_integer +
+  nicklist_group_get_string +
+  nicklist_group_get_pointer +
+  nicklist_group_set +
+  nicklist_nick_get_integer +
+  nicklist_nick_get_string +
+  nicklist_nick_get_pointer +
+  nicklist_nick_set
+
+| barres |
+  bar_item_search +
+  bar_item_new +
+  bar_item_update +
+  bar_item_remove +
+  bar_search +
+  bar_new +
+  bar_set +
+  bar_update +
+  bar_remove
+
+| commandes |
   command
+
 | infos                     |
-  info_get, info_get_hashtable
-| infolists                 |
-  infolist_new, infolist_new_item, infolist_new_var_integer,
-  infolist_new_var_string, infolist_new_var_pointer, infolist_new_var_time, +
-  infolist_get, infolist_next, infolist_prev, infolist_reset_item_cursor, +
-  infolist_fields, infolist_integer, infolist_string, infolist_pointer, +
-  infolist_time, infolist_free
-| hdata               |
-  hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
-  hdata_get_var_array_size, hdata_get_var_array_size_string,
-  hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
-  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
-| mise à jour               |
-  upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
+  info_get +
+  info_get_hashtable
+
+| infolists |
+  infolist_new +
+  infolist_new_item +
+  infolist_new_var_integer +
+  infolist_new_var_string +
+  infolist_new_var_pointer +
+  infolist_new_var_time +
+  infolist_get +
+  infolist_next +
+  infolist_prev +
+  infolist_reset_item_cursor +
+  infolist_fields +
+  infolist_integer +
+  infolist_string +
+  infolist_pointer +
+  infolist_time +
+  infolist_free
+
+| hdata |
+  hdata_get +
+  hdata_get_var_offset +
+  hdata_get_var_type_string +
+  hdata_get_var_array_size +
+  hdata_get_var_array_size_string +
+  hdata_get_var_hdata +
+  hdata_get_list +
+  hdata_check_pointer +
+  hdata_move +
+  hdata_search +
+  hdata_char +
+  hdata_integer +
+  hdata_long +
+  hdata_string +
+  hdata_pointer +
+  hdata_time +
+  hdata_hashtable +
+  hdata_update +
+  hdata_get_string
+
+| mise à jour |
+  upgrade_new +
+  upgrade_write_object +
+  upgrade_read +
+  upgrade_close
 |===
 
 [[script_api_constants]]
@@ -479,35 +629,64 @@ Liste des fonctions de l'API script :
 
 Liste des constantes de l'API script :
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Catégorie                 | Constantes
-| codes retour              |
-  WEECHAT_RC_OK, WEECHAT_RC_OK_EAT, WEECHAT_RC_ERROR
+
+| Catégorie | Constantes
+
+| codes retour |
+  WEECHAT_RC_OK +
+  WEECHAT_RC_OK_EAT +
+  WEECHAT_RC_ERROR
+
 | fichiers de configuration |
-  WEECHAT_CONFIG_READ_OK, WEECHAT_CONFIG_READ_MEMORY_ERROR,
-  WEECHAT_CONFIG_READ_FILE_NOT_FOUND, WEECHAT_CONFIG_WRITE_OK,
-  WEECHAT_CONFIG_WRITE_ERROR, WEECHAT_CONFIG_WRITE_MEMORY_ERROR, +
-  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED, WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE,
-  WEECHAT_CONFIG_OPTION_SET_ERROR, WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET, WEECHAT_CONFIG_OPTION_UNSET_OK_RESET,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED, WEECHAT_CONFIG_OPTION_UNSET_ERROR
-| listes triées             |
-  WEECHAT_LIST_POS_SORT, WEECHAT_LIST_POS_BEGINNING, WEECHAT_LIST_POS_END
-| hotlist                   |
-  WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE, WEECHAT_HOTLIST_PRIVATE,
+  WEECHAT_CONFIG_READ_OK +
+  WEECHAT_CONFIG_READ_MEMORY_ERROR +
+  WEECHAT_CONFIG_READ_FILE_NOT_FOUND +
+  WEECHAT_CONFIG_WRITE_OK +
+  WEECHAT_CONFIG_WRITE_ERROR +
+  WEECHAT_CONFIG_WRITE_MEMORY_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED +
+  WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE +
+  WEECHAT_CONFIG_OPTION_SET_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED +
+  WEECHAT_CONFIG_OPTION_UNSET_ERROR
+
+| listes triées |
+  WEECHAT_LIST_POS_SORT +
+  WEECHAT_LIST_POS_BEGINNING +
+  WEECHAT_LIST_POS_END
+
+| hotlist |
+  WEECHAT_HOTLIST_LOW +
+  WEECHAT_HOTLIST_MESSAGE +
+  WEECHAT_HOTLIST_PRIVATE +
   WEECHAT_HOTLIST_HIGHLIGHT
-| hook process              |
-  WEECHAT_HOOK_PROCESS_RUNNING, WEECHAT_HOOK_PROCESS_ERROR
-| hook connect              |
-  WEECHAT_HOOK_CONNECT_OK, WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND,
-  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
-  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
-  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+
+| hook process |
+  WEECHAT_HOOK_PROCESS_RUNNING +
+  WEECHAT_HOOK_PROCESS_ERROR
+
+| hook connect |
+  WEECHAT_HOOK_CONNECT_OK +
+  WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED +
+  WEECHAT_HOOK_CONNECT_PROXY_ERROR +
+  WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR +
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR +
+  WEECHAT_HOOK_CONNECT_TIMEOUT +
   WEECHAT_HOOK_CONNECT_SOCKET_ERROR
-| hook signal               |
-  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
+
+| hook signal |
+  WEECHAT_HOOK_SIGNAL_STRING +
+  WEECHAT_HOOK_SIGNAL_INT +
+  WEECHAT_HOOK_SIGNAL_POINTER
 |===
 
 [[common_tasks]]
diff --git a/doc/it/weechat_scripting.it.asciidoc b/doc/it/weechat_scripting.it.asciidoc
index 5f8eef06f..29e1ae35c 100644
--- a/doc/it/weechat_scripting.it.asciidoc
+++ b/doc/it/weechat_scripting.it.asciidoc
@@ -397,85 +397,235 @@ consultare _Referenze API per Plugin di WeeChat_.
 
 Elenco di funzioni nelle API per gli script:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Categoria              | Funzioni
-| generale               |
+| Categoria | Funzioni
+
+| generale |
   register
-| plugin                 |
+
+| plugin |
   plugin_get_name
-| stringhe               |
-  charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
-  strlen_screen, string_match, string_has_highlight, string_has_highlight_regex,
-  string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer, string_eval_expression, string_eval_path_home
-| directory              |
-  mkdir_home, mkdir, mkdir_parents
-| liste ordinate         |
-  list_new, list_add, list_search, list_search_pos, list_casesearch,
-  list_casesearch_pos, list_get, list_set, list_next, list_prev, list_string,
-  list_size, list_remove, list_remove_all, list_free
+
+| stringhe |
+  charset_set +
+  iconv_to_internal +
+  iconv_from_internal +
+  gettext +
+  ngettext +
+  strlen_screen +
+  string_match +
+  string_has_highlight +
+  string_has_highlight_regex +
+  string_mask_to_regex +
+  string_remove_color +
+  string_is_command_char +
+  string_input_for_buffer +
+  string_eval_expression +
+  string_eval_path_home
+
+| directory |
+  mkdir_home +
+  mkdir +
+  mkdir_parents
+
+| liste ordinate |
+  list_new +
+  list_add +
+  list_search +
+  list_search_pos +
+  list_casesearch +
+  list_casesearch_pos +
+  list_get +
+  list_set +
+  list_next +
+  list_prev +
+  list_string +
+  list_size +
+  list_remove +
+  list_remove_all +
+  list_free
+
 | file di configurazione |
-  config_new, config_new_section, config_search_section, config_new_option,
-  config_search_option, +
-  config_string_to_boolean, config_option_reset, config_option_set,
-  config_option_set_null, config_option_unset, config_option_rename,
-  config_option_is_null, config_option_default_is_null, +
-  config_boolean, config_boolean_default, config_integer, config_integer_default,
-  config_string, config_string_default, config_color, config_color_default, +
-  config_write_option, config_write_line, config_write, config_read,
-  config_reload, +
-  config_option_free, config_section_free_options, config_section_free,
-  config_free, +
-  config_get, config_get_plugin, config_is_set_plugin, config_set_plugin,
-  config_set_desc_plugin, config_unset_plugin
-| combinazione tasti     |
-  key_bind, key_unbind
-| visualizzazione        |
-  prefix, color, print (for python: prnt), print_date_tags (for python:
-  prnt_date_tags), print_y (for python: prnt_y), log_print
-| hook                   |
-  hook_command, hook_command_run, hook_timer, hook_fd, hook_process,
-  hook_process_hashtable, hook_connect, hook_print, hook_signal,
-  hook_signal_send, hook_hsignal, hook_hsignal_send, hook_config,
-  hook_completion, hook_completion_list_add, hook_modifier, hook_modifier_exec,
-  hook_info, hook_info_hashtable, hook_infolist, hook_focus, hook_set, unhook,
+  config_new +
+  config_new_section +
+  config_search_section +
+  config_new_option +
+  config_search_option +
+  config_string_to_boolean +
+  config_option_reset +
+  config_option_set +
+  config_option_set_null +
+  config_option_unset +
+  config_option_rename +
+  config_option_is_null +
+  config_option_default_is_null +
+  config_boolean +
+  config_boolean_default +
+  config_integer +
+  config_integer_default +
+  config_string +
+  config_string_default +
+  config_color +
+  config_color_default +
+  config_write_option +
+  config_write_line +
+  config_write +
+  config_read +
+  config_reload +
+  config_option_free +
+  config_section_free_options +
+  config_section_free +
+  config_free +
+  config_get +
+  config_get_plugin +
+  config_is_set_plugin +
+  config_set_plugin +
+  config_set_desc_plugin +
+  config_unset_plugin
+
+| combinazione tasti |
+  key_bind +
+  key_unbind
+
+| visualizzazione |
+  prefix +
+  color +
+  print (for python: prnt) +
+  print_date_tags (for python:
+  prnt_date_tags) +
+  print_y (for python: prnt_y) +
+  log_print
+
+| hook |
+  hook_command +
+  hook_command_run +
+  hook_timer +
+  hook_fd +
+  hook_process +
+  hook_process_hashtable +
+  hook_connect +
+  hook_print +
+  hook_signal +
+  hook_signal_send +
+  hook_hsignal +
+  hook_hsignal_send +
+  hook_config +
+  hook_completion +
+  hook_completion_list_add +
+  hook_modifier +
+  hook_modifier_exec +
+  hook_info +
+  hook_info_hashtable +
+  hook_infolist +
+  hook_focus +
+  hook_set +
+  unhook +
   unhook_all
-| buffer                 |
-  buffer_new, 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, buffer_match_list
-| finestre               |
-  current_window, window_search_with_buffer, window_get_integer,
-  window_get_string, window_get_pointer, window_set_title
-| lista nick             |
-  nicklist_add_group, nicklist_search_group, nicklist_add_nick,
-  nicklist_search_nick, nicklist_remove_group, nicklist_remove_nick,
-  nicklist_remove_all, nicklist_group_get_integer, nicklist_group_get_string,
-  nicklist_group_get_pointer, nicklist_group_set, nicklist_nick_get_integer,
-  nicklist_nick_get_string, nicklist_nick_get_pointer, nicklist_nick_set
-| barre                  |
-  bar_item_search, bar_item_new, bar_item_update, bar_item_remove, bar_search,
-  bar_new, bar_set, bar_update, bar_remove
-| comandi                |
+
+| buffer |
+  buffer_new +
+  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 +
+  buffer_match_list
+
+| finestre |
+  current_window +
+  window_search_with_buffer +
+  window_get_integer +
+  window_get_string +
+  window_get_pointer +
+  window_set_title
+
+| lista nick |
+  nicklist_add_group +
+  nicklist_search_group +
+  nicklist_add_nick +
+  nicklist_search_nick +
+  nicklist_remove_group +
+  nicklist_remove_nick +
+  nicklist_remove_all +
+  nicklist_group_get_integer +
+  nicklist_group_get_string +
+  nicklist_group_get_pointer +
+  nicklist_group_set +
+  nicklist_nick_get_integer +
+  nicklist_nick_get_string +
+  nicklist_nick_get_pointer +
+  nicklist_nick_set
+
+| barre |
+  bar_item_search +
+  bar_item_new +
+  bar_item_update +
+  bar_item_remove +
+  bar_search +
+  bar_new +
+  bar_set +
+  bar_update +
+  bar_remove
+
+| comandi |
   comando
-| info                   |
-  info_get, info_get_hashtable
-| liste info             |
-  infolist_new, infolist_new_item, infolist_new_var_integer,
-  infolist_new_var_string, infolist_new_var_pointer, infolist_new_var_time, +
-  infolist_get, infolist_next, infolist_prev, infolist_reset_item_cursor, +
-  infolist_fields, infolist_integer, infolist_string, infolist_pointer, +
-  infolist_time, infolist_free
-| hdata                  |
-  hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
-  hdata_get_var_array_size, hdata_get_var_array_size_string,
-  hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
-  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
-| aggiornamento          |
-  upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
+
+| info |
+  info_get +
+  info_get_hashtable
+
+| liste info |
+  infolist_new +
+  infolist_new_item +
+  infolist_new_var_integer +
+  infolist_new_var_string +
+  infolist_new_var_pointer +
+  infolist_new_var_time +
+  infolist_get +
+  infolist_next +
+  infolist_prev +
+  infolist_reset_item_cursor +
+  infolist_fields +
+  infolist_integer +
+  infolist_string +
+  infolist_pointer +
+  infolist_time +
+  infolist_free
+
+| hdata |
+  hdata_get +
+  hdata_get_var_offset +
+  hdata_get_var_type_string +
+  hdata_get_var_array_size +
+  hdata_get_var_array_size_string +
+  hdata_get_var_hdata +
+  hdata_get_list +
+  hdata_check_pointer +
+  hdata_move +
+  hdata_search +
+  hdata_char +
+  hdata_integer +
+  hdata_long +
+  hdata_string +
+  hdata_pointer +
+  hdata_time +
+  hdata_hashtable +
+  hdata_update +
+  hdata_get_string
+
+| aggiornamento |
+  upgrade_new +
+  upgrade_write_object +
+  upgrade_read +
+  upgrade_close
 |===
 
 [[script_api_constants]]
@@ -483,35 +633,63 @@ Elenco di funzioni nelle API per gli script:
 
 Elenco di costanti nelle API per gli script:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Categoria              | Costanti
-| codici restituiti      |
-  WEECHAT_RC_OK, WEECHAT_RC_OK_EAT, WEECHAT_RC_ERROR
+| Categoria | Costanti
+
+| codici restituiti |
+  WEECHAT_RC_OK +
+  WEECHAT_RC_OK_EAT +
+  WEECHAT_RC_ERROR
+
 | file di configurazione |
-  WEECHAT_CONFIG_READ_OK, WEECHAT_CONFIG_READ_MEMORY_ERROR,
-  WEECHAT_CONFIG_READ_FILE_NOT_FOUND, WEECHAT_CONFIG_WRITE_OK,
-  WEECHAT_CONFIG_WRITE_ERROR, WEECHAT_CONFIG_WRITE_MEMORY_ERROR, +
-  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED, WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE,
-  WEECHAT_CONFIG_OPTION_SET_ERROR, WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET, WEECHAT_CONFIG_OPTION_UNSET_OK_RESET,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED, WEECHAT_CONFIG_OPTION_UNSET_ERROR
-| liste ordinate         |
-  WEECHAT_LIST_POS_SORT, WEECHAT_LIST_POS_BEGINNING, WEECHAT_LIST_POS_END
-| hotlist                |
-  WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE, WEECHAT_HOTLIST_PRIVATE,
+  WEECHAT_CONFIG_READ_OK +
+  WEECHAT_CONFIG_READ_MEMORY_ERROR +
+  WEECHAT_CONFIG_READ_FILE_NOT_FOUND +
+  WEECHAT_CONFIG_WRITE_OK +
+  WEECHAT_CONFIG_WRITE_ERROR +
+  WEECHAT_CONFIG_WRITE_MEMORY_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED +
+  WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE +
+  WEECHAT_CONFIG_OPTION_SET_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED +
+  WEECHAT_CONFIG_OPTION_UNSET_ERROR
+
+| liste ordinate |
+  WEECHAT_LIST_POS_SORT +
+  WEECHAT_LIST_POS_BEGINNING +
+  WEECHAT_LIST_POS_END
+
+| hotlist |
+  WEECHAT_HOTLIST_LOW +
+  WEECHAT_HOTLIST_MESSAGE +
+  WEECHAT_HOTLIST_PRIVATE +
   WEECHAT_HOTLIST_HIGHLIGHT
-| hook su processo       |
-  WEECHAT_HOOK_PROCESS_RUNNING, WEECHAT_HOOK_PROCESS_ERROR
-| hook su connessione    |
-  WEECHAT_HOOK_CONNECT_OK, WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND,
-  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
-  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
-  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+
+| hook su processo |
+  WEECHAT_HOOK_PROCESS_RUNNING +
+  WEECHAT_HOOK_PROCESS_ERROR
+
+| hook su connessione |
+  WEECHAT_HOOK_CONNECT_OK +
+  WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED +
+  WEECHAT_HOOK_CONNECT_PROXY_ERROR +
+  WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR +
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR +
+  WEECHAT_HOOK_CONNECT_TIMEOUT +
   WEECHAT_HOOK_CONNECT_SOCKET_ERROR
-| hook su segnale        |
-  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
+
+| hook su segnale |
+  WEECHAT_HOOK_SIGNAL_STRING +
+  WEECHAT_HOOK_SIGNAL_INT +
+  WEECHAT_HOOK_SIGNAL_POINTER
 |===
 
 [[common_tasks]]
diff --git a/doc/ja/weechat_scripting.ja.asciidoc b/doc/ja/weechat_scripting.ja.asciidoc
index c73885b80..8081c15c5 100644
--- a/doc/ja/weechat_scripting.ja.asciidoc
+++ b/doc/ja/weechat_scripting.ja.asciidoc
@@ -390,85 +390,235 @@ _WeeChat プラグイン API リファレンス_ をご覧ください。.
 
 スクリプト API に含まれる関数のリスト:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| カテゴリ            | 関数
-| 一般                |
+| カテゴリ | 関数
+
+| 一般 |
   register
-| プラグイン          |
+
+| プラグイン |
   plugin_get_name
-| 設定                |
-  charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
-  strlen_screen, string_match, string_has_highlight, string_has_highlight_regex,
-  string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer, string_eval_expression, string_eval_path_home
-| ディレクトリ操作    |
-  mkdir_home, mkdir, mkdir_parents
-| ソート済みリスト    |
-  list_new, list_add, list_search, list_search_pos, list_casesearch,
-  list_casesearch_pos, list_get, list_set, list_next, list_prev, list_string,
-  list_size, list_remove, list_remove_all, list_free
-| 設定ファイル        |
-  config_new, config_new_section, config_search_section, config_new_option,
-  config_search_option, +
-  config_string_to_boolean, config_option_reset, config_option_set,
-  config_option_set_null, config_option_unset, config_option_rename,
-  config_option_is_null, config_option_default_is_null, +
-  config_boolean, config_boolean_default, config_integer, config_integer_default,
-  config_string, config_string_default, config_color, config_color_default, +
-  config_write_option, config_write_line, config_write, config_read,
-  config_reload, +
-  config_option_free, config_section_free_options, config_section_free,
-  config_free, +
-  config_get, config_get_plugin, config_is_set_plugin, config_set_plugin,
-  config_set_desc_plugin, config_unset_plugin
-| キー割り当て        |
-  key_bind, key_unbind
-| 表示                |
-  prefix, color, print (for python: prnt), print_date_tags (for python:
-  prnt_date_tags), print_y (for python: prnt_y), log_print
-| フック              |
-  hook_command, hook_command_run, hook_timer, hook_fd, hook_process,
-  hook_process_hashtable, hook_connect, hook_print, hook_signal,
-  hook_signal_send, hook_hsignal, hook_hsignal_send, hook_config,
-  hook_completion, hook_completion_list_add, hook_modifier, hook_modifier_exec,
-  hook_info, hook_info_hashtable, hook_infolist, hook_focus, hook_set, unhook,
+
+| 設定 |
+  charset_set +
+  iconv_to_internal +
+  iconv_from_internal +
+  gettext +
+  ngettext +
+  strlen_screen +
+  string_match +
+  string_has_highlight +
+  string_has_highlight_regex +
+  string_mask_to_regex +
+  string_remove_color +
+  string_is_command_char +
+  string_input_for_buffer +
+  string_eval_expression +
+  string_eval_path_home
+
+| ディレクトリ操作 |
+  mkdir_home +
+  mkdir +
+  mkdir_parents
+
+| ソート済みリスト |
+  list_new +
+  list_add +
+  list_search +
+  list_search_pos +
+  list_casesearch +
+  list_casesearch_pos +
+  list_get +
+  list_set +
+  list_next +
+  list_prev +
+  list_string +
+  list_size +
+  list_remove +
+  list_remove_all +
+  list_free
+
+| 設定ファイル |
+  config_new +
+  config_new_section +
+  config_search_section +
+  config_new_option +
+  config_search_option +
+  config_string_to_boolean +
+  config_option_reset +
+  config_option_set +
+  config_option_set_null +
+  config_option_unset +
+  config_option_rename +
+  config_option_is_null +
+  config_option_default_is_null +
+  config_boolean +
+  config_boolean_default +
+  config_integer +
+  config_integer_default +
+  config_string +
+  config_string_default +
+  config_color +
+  config_color_default +
+  config_write_option +
+  config_write_line +
+  config_write +
+  config_read +
+  config_reload +
+  config_option_free +
+  config_section_free_options +
+  config_section_free +
+  config_free +
+  config_get +
+  config_get_plugin +
+  config_is_set_plugin +
+  config_set_plugin +
+  config_set_desc_plugin +
+  config_unset_plugin
+
+| キー割り当て |
+  key_bind +
+  key_unbind
+
+| 表示 |
+  prefix +
+  color +
+  print (for python: prnt) +
+  print_date_tags (for python:
+  prnt_date_tags) +
+  print_y (for python: prnt_y) +
+  log_print
+
+| フック |
+  hook_command +
+  hook_command_run +
+  hook_timer +
+  hook_fd +
+  hook_process +
+  hook_process_hashtable +
+  hook_connect +
+  hook_print +
+  hook_signal +
+  hook_signal_send +
+  hook_hsignal +
+  hook_hsignal_send +
+  hook_config +
+  hook_completion +
+  hook_completion_list_add +
+  hook_modifier +
+  hook_modifier_exec +
+  hook_info +
+  hook_info_hashtable +
+  hook_infolist +
+  hook_focus +
+  hook_set +
+  unhook +
   unhook_all
-| バッファ            |
-  buffer_new, 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, buffer_match_list
-| ウィンドウ          |
-  current_window, window_search_with_buffer, window_get_integer,
-  window_get_string, window_get_pointer, window_set_title
+
+| バッファ |
+  buffer_new +
+  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 +
+  buffer_match_list
+
+| ウィンドウ |
+  current_window +
+  window_search_with_buffer +
+  window_get_integer +
+  window_get_string +
+  window_get_pointer +
+  window_set_title
+
 | ニックネームリスト  |
-  nicklist_add_group, nicklist_search_group, nicklist_add_nick,
-  nicklist_search_nick, nicklist_remove_group, nicklist_remove_nick,
-  nicklist_remove_all, nicklist_group_get_integer, nicklist_group_get_string,
-  nicklist_group_get_pointer, nicklist_group_set, nicklist_nick_get_integer,
-  nicklist_nick_get_string, nicklist_nick_get_pointer, nicklist_nick_set
-| バー                |
-  bar_item_search, bar_item_new, bar_item_update, bar_item_remove, bar_search,
-  bar_new, bar_set, bar_update, bar_remove
-| コマンド            |
+  nicklist_add_group +
+  nicklist_search_group +
+  nicklist_add_nick +
+  nicklist_search_nick +
+  nicklist_remove_group +
+  nicklist_remove_nick +
+  nicklist_remove_all +
+  nicklist_group_get_integer +
+  nicklist_group_get_string +
+  nicklist_group_get_pointer +
+  nicklist_group_set +
+  nicklist_nick_get_integer +
+  nicklist_nick_get_string +
+  nicklist_nick_get_pointer +
+  nicklist_nick_set
+
+| バー |
+  bar_item_search +
+  bar_item_new +
+  bar_item_update +
+  bar_item_remove +
+  bar_search +
+  bar_new +
+  bar_set +
+  bar_update +
+  bar_remove
+
+| コマンド |
   command
-| インフォ            |
-  info_get, info_get_hashtable
-| インフォリスト      |
-  infolist_new, infolist_new_item, infolist_new_var_integer,
-  infolist_new_var_string, infolist_new_var_pointer, infolist_new_var_time, +
-  infolist_get, infolist_next, infolist_prev, infolist_reset_item_cursor, +
-  infolist_fields, infolist_integer, infolist_string, infolist_pointer, +
-  infolist_time, infolist_free
-| hdata               |
-  hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
-  hdata_get_var_array_size, hdata_get_var_array_size_string,
-  hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
-  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
-| アップグレード      |
-  upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
+
+| インフォ |
+  info_get +
+  info_get_hashtable
+
+| インフォリスト |
+  infolist_new +
+  infolist_new_item +
+  infolist_new_var_integer +
+  infolist_new_var_string +
+  infolist_new_var_pointer +
+  infolist_new_var_time +
+  infolist_get +
+  infolist_next +
+  infolist_prev +
+  infolist_reset_item_cursor +
+  infolist_fields +
+  infolist_integer +
+  infolist_string +
+  infolist_pointer +
+  infolist_time +
+  infolist_free
+
+| hdata |
+  hdata_get +
+  hdata_get_var_offset +
+  hdata_get_var_type_string +
+  hdata_get_var_array_size +
+  hdata_get_var_array_size_string +
+  hdata_get_var_hdata +
+  hdata_get_list +
+  hdata_check_pointer +
+  hdata_move +
+  hdata_search +
+  hdata_char +
+  hdata_integer +
+  hdata_long +
+  hdata_string +
+  hdata_pointer +
+  hdata_time +
+  hdata_hashtable +
+  hdata_update +
+  hdata_get_string
+
+| アップグレード |
+  upgrade_new +
+  upgrade_write_object +
+  upgrade_read +
+  upgrade_close
 |===
 
 [[script_api_constants]]
@@ -476,35 +626,63 @@ _WeeChat プラグイン API リファレンス_ をご覧ください。.
 
 スクリプト API に含まれる定数のリスト:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
 | カテゴリ            | 定数
-| リターンコード      |
-  WEECHAT_RC_OK, WEECHAT_RC_OK_EAT, WEECHAT_RC_ERROR
-| 設定ファイル        |
-  WEECHAT_CONFIG_READ_OK, WEECHAT_CONFIG_READ_MEMORY_ERROR,
-  WEECHAT_CONFIG_READ_FILE_NOT_FOUND, WEECHAT_CONFIG_WRITE_OK,
-  WEECHAT_CONFIG_WRITE_ERROR, WEECHAT_CONFIG_WRITE_MEMORY_ERROR, +
-  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED, WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE,
-  WEECHAT_CONFIG_OPTION_SET_ERROR, WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET, WEECHAT_CONFIG_OPTION_UNSET_OK_RESET,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED, WEECHAT_CONFIG_OPTION_UNSET_ERROR
-| ソート済みリスト    |
-  WEECHAT_LIST_POS_SORT, WEECHAT_LIST_POS_BEGINNING, WEECHAT_LIST_POS_END
-| ホットリスト        |
-  WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE, WEECHAT_HOTLIST_PRIVATE,
+
+| リターンコード |
+  WEECHAT_RC_OK +
+  WEECHAT_RC_OK_EAT +
+  WEECHAT_RC_ERROR
+
+| 設定ファイル |
+  WEECHAT_CONFIG_READ_OK +
+  WEECHAT_CONFIG_READ_MEMORY_ERROR +
+  WEECHAT_CONFIG_READ_FILE_NOT_FOUND +
+  WEECHAT_CONFIG_WRITE_OK +
+  WEECHAT_CONFIG_WRITE_ERROR +
+  WEECHAT_CONFIG_WRITE_MEMORY_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED +
+  WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE +
+  WEECHAT_CONFIG_OPTION_SET_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED +
+  WEECHAT_CONFIG_OPTION_UNSET_ERROR
+
+| ソート済みリスト |
+  WEECHAT_LIST_POS_SORT +
+  WEECHAT_LIST_POS_BEGINNING +
+  WEECHAT_LIST_POS_END
+
+| ホットリスト |
+  WEECHAT_HOTLIST_LOW +
+  WEECHAT_HOTLIST_MESSAGE +
+  WEECHAT_HOTLIST_PRIVATE +
   WEECHAT_HOTLIST_HIGHLIGHT
-| プロセスのフック    |
-  WEECHAT_HOOK_PROCESS_RUNNING, WEECHAT_HOOK_PROCESS_ERROR
-| 接続のフック        |
-  WEECHAT_HOOK_CONNECT_OK, WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND,
-  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
-  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
-  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+
+| プロセスのフック |
+  WEECHAT_HOOK_PROCESS_RUNNING +
+  WEECHAT_HOOK_PROCESS_ERROR
+
+| 接続のフック |
+  WEECHAT_HOOK_CONNECT_OK +
+  WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED +
+  WEECHAT_HOOK_CONNECT_PROXY_ERROR +
+  WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR +
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR +
+  WEECHAT_HOOK_CONNECT_TIMEOUT +
   WEECHAT_HOOK_CONNECT_SOCKET_ERROR
-| シグナルのフック    |
-  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
+
+| シグナルのフック |
+  WEECHAT_HOOK_SIGNAL_STRING +
+  WEECHAT_HOOK_SIGNAL_INT +
+  WEECHAT_HOOK_SIGNAL_POINTER
 |===
 
 [[common_tasks]]
diff --git a/doc/pl/weechat_scripting.pl.asciidoc b/doc/pl/weechat_scripting.pl.asciidoc
index 9c4eeb057..f5102b538 100644
--- a/doc/pl/weechat_scripting.pl.asciidoc
+++ b/doc/pl/weechat_scripting.pl.asciidoc
@@ -386,85 +386,235 @@ Więcej informacji o funkcjach w API, znajdziesz w _Opisie API wtyczek WeeChat_.
 
 Lista funkcji w API skryptów:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Kategoria           | Funkcje
-| ogólne              |
+| Kategoria | Funkcje
+
+| ogólne |
   register
-| wtyczki             |
+
+| wtyczki |
   plugin_get_name
-| ciągi               |
-  charset_set, iconv_to_internal, iconv_from_internal, gettext, ngettext, +
-  strlen_screen, string_match, string_has_highlight, string_has_highlight_regex,
-  string_mask_to_regex, string_remove_color, string_is_command_char,
-  string_input_for_buffer, string_eval_expression, string_eval_path_home
-| katalogi            |
-  mkdir_home, mkdir, mkdir_parents
+
+| ciągi |
+  charset_set +
+  iconv_to_internal +
+  iconv_from_internal +
+  gettext +
+  ngettext +
+  strlen_screen +
+  string_match +
+  string_has_highlight +
+  string_has_highlight_regex +
+  string_mask_to_regex +
+  string_remove_color +
+  string_is_command_char +
+  string_input_for_buffer +
+  string_eval_expression +
+  string_eval_path_home
+
+| katalogi |
+  mkdir_home +
+  mkdir +
+  mkdir_parents
+
 | przechowywane listy |
-  list_new, list_add, list_search, list_search_pos, list_casesearch,
-  list_casesearch_pos, list_get, list_set, list_next, list_prev, list_string,
-  list_size, list_remove, list_remove_all, list_free
+  list_new +
+  list_add +
+  list_search +
+  list_search_pos +
+  list_casesearch +
+  list_casesearch_pos +
+  list_get +
+  list_set +
+  list_next +
+  list_prev +
+  list_string +
+  list_size +
+  list_remove +
+  list_remove_all +
+  list_free
+
 | pliki konfiguracyjne|
-  config_new, config_new_section, config_search_section, config_new_option,
-  config_search_option, +
-  config_string_to_boolean, config_option_reset, config_option_set,
-  config_option_set_null, config_option_unset, config_option_rename,
-  config_option_is_null, config_option_default_is_null, +
-  config_boolean, config_boolean_default, config_integer, config_integer_default,
-  config_string, config_string_default, config_color, config_color_default, +
-  config_write_option, config_write_line, config_write, config_read,
-  config_reload, +
-  config_option_free, config_section_free_options, config_section_free,
-  config_free, +
-  config_get, config_get_plugin, config_is_set_plugin, config_set_plugin,
-  config_set_desc_plugin, config_unset_plugin
+  config_new +
+  config_new_section +
+  config_search_section +
+  config_new_option +
+  config_search_option +
+  config_string_to_boolean +
+  config_option_reset +
+  config_option_set +
+  config_option_set_null +
+  config_option_unset +
+  config_option_rename +
+  config_option_is_null +
+  config_option_default_is_null +
+  config_boolean +
+  config_boolean_default +
+  config_integer +
+  config_integer_default +
+  config_string +
+  config_string_default +
+  config_color +
+  config_color_default +
+  config_write_option +
+  config_write_line +
+  config_write +
+  config_read +
+  config_reload +
+  config_option_free +
+  config_section_free_options +
+  config_section_free +
+  config_free +
+  config_get +
+  config_get_plugin +
+  config_is_set_plugin +
+  config_set_plugin +
+  config_set_desc_plugin +
+  config_unset_plugin
+
 | przypisania klawiszy|
-  key_bind, key_unbind
-| wyświetlanie        |
-  prefix, color, print (for python: prnt), print_date_tags (for python:
-  prnt_date_tags), print_y (for python: prnt_y), log_print
-| hooks               |
-  hook_command, hook_command_run, hook_timer, hook_fd, hook_process,
-  hook_process_hashtable, hook_connect, hook_print, hook_signal,
-  hook_signal_send, hook_hsignal, hook_hsignal_send, hook_config,
-  hook_completion, hook_completion_list_add, hook_modifier, hook_modifier_exec,
-  hook_info, hook_info_hashtable, hook_infolist, hook_focus, hook_set, unhook,
+  key_bind +
+  key_unbind
+
+| wyświetlanie |
+  prefix +
+  color +
+  print (for python: prnt) +
+  print_date_tags (for python:
+  prnt_date_tags) +
+  print_y (for python: prnt_y) +
+  log_print
+
+| hooks |
+  hook_command +
+  hook_command_run +
+  hook_timer +
+  hook_fd +
+  hook_process +
+  hook_process_hashtable +
+  hook_connect +
+  hook_print +
+  hook_signal +
+  hook_signal_send +
+  hook_hsignal +
+  hook_hsignal_send +
+  hook_config +
+  hook_completion +
+  hook_completion_list_add +
+  hook_modifier +
+  hook_modifier_exec +
+  hook_info +
+  hook_info_hashtable +
+  hook_infolist +
+  hook_focus +
+  hook_set +
+  unhook +
   unhook_all
-| bufory              |
-  buffer_new, 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, buffer_match_list
-| okna                |
-  current_window, window_search_with_buffer, window_get_integer,
-  window_get_string, window_get_pointer, window_set_title
-| lista nicków        |
-  nicklist_add_group, nicklist_search_group, nicklist_add_nick,
-  nicklist_search_nick, nicklist_remove_group, nicklist_remove_nick,
-  nicklist_remove_all, nicklist_group_get_integer, nicklist_group_get_string,
-  nicklist_group_get_pointer, nicklist_group_set, nicklist_nick_get_integer,
-  nicklist_nick_get_string, nicklist_nick_get_pointer, nicklist_nick_set
-| paski               |
-  bar_item_search, bar_item_new, bar_item_update, bar_item_remove, bar_search,
-  bar_new, bar_set, bar_update, bar_remove
-| komendy             |
+
+| bufory |
+  buffer_new +
+  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 +
+  buffer_match_list
+
+| okna |
+  current_window +
+  window_search_with_buffer +
+  window_get_integer +
+  window_get_string +
+  window_get_pointer +
+  window_set_title
+
+| lista nicków |
+  nicklist_add_group +
+  nicklist_search_group +
+  nicklist_add_nick +
+  nicklist_search_nick +
+  nicklist_remove_group +
+  nicklist_remove_nick +
+  nicklist_remove_all +
+  nicklist_group_get_integer +
+  nicklist_group_get_string +
+  nicklist_group_get_pointer +
+  nicklist_group_set +
+  nicklist_nick_get_integer +
+  nicklist_nick_get_string +
+  nicklist_nick_get_pointer +
+  nicklist_nick_set
+
+| paski |
+  bar_item_search +
+  bar_item_new +
+  bar_item_update +
+  bar_item_remove +
+  bar_search +
+  bar_new +
+  bar_set +
+  bar_update +
+  bar_remove
+
+| komendy |
   command
-| informacje          |
-  info_get, info_get_hashtable
-| infolisty           |
-  infolist_new, infolist_new_item, infolist_new_var_integer,
-  infolist_new_var_string, infolist_new_var_pointer, infolist_new_var_time, +
-  infolist_get, infolist_next, infolist_prev, infolist_reset_item_cursor, +
-  infolist_fields, infolist_integer, infolist_string, infolist_pointer, +
-  infolist_time, infolist_free
-| hdata               |
-  hdata_get, hdata_get_var_offset, hdata_get_var_type_string,
-  hdata_get_var_array_size, hdata_get_var_array_size_string,
-  hdata_get_var_hdata, hdata_get_list, hdata_check_pointer, hdata_move,
-  hdata_search, hdata_char, hdata_integer, hdata_long, hdata_string,
-  hdata_pointer, hdata_time, hdata_hashtable, hdata_update, hdata_get_string
-| uaktualnienie       |
-  upgrade_new, upgrade_write_object, upgrade_read, upgrade_close
+
+| informacje |
+  info_get +
+  info_get_hashtable
+
+| infolisty |
+  infolist_new +
+  infolist_new_item +
+  infolist_new_var_integer +
+  infolist_new_var_string +
+  infolist_new_var_pointer +
+  infolist_new_var_time +
+  infolist_get +
+  infolist_next +
+  infolist_prev +
+  infolist_reset_item_cursor +
+  infolist_fields +
+  infolist_integer +
+  infolist_string +
+  infolist_pointer +
+  infolist_time +
+  infolist_free
+
+| hdata |
+  hdata_get +
+  hdata_get_var_offset +
+  hdata_get_var_type_string +
+  hdata_get_var_array_size +
+  hdata_get_var_array_size_string +
+  hdata_get_var_hdata +
+  hdata_get_list +
+  hdata_check_pointer +
+  hdata_move +
+  hdata_search +
+  hdata_char +
+  hdata_integer +
+  hdata_long +
+  hdata_string +
+  hdata_pointer +
+  hdata_time +
+  hdata_hashtable +
+  hdata_update +
+  hdata_get_string
+
+| uaktualnienie |
+  upgrade_new +
+  upgrade_write_object +
+  upgrade_read +
+  upgrade_close
 |===
 
 [[script_api_constants]]
@@ -472,35 +622,63 @@ Lista funkcji w API skryptów:
 
 Lista stałych w API skryptów:
 
-[width="100%",cols="^1,10",options="header"]
+[width="75%",cols="1,3",options="header"]
 |===
-| Kategoria           | Stałe
-| zwracane kody       |
-  WEECHAT_RC_OK, WEECHAT_RC_OK_EAT, WEECHAT_RC_ERROR
-| pliki konfiguracyjne|
-  WEECHAT_CONFIG_READ_OK, WEECHAT_CONFIG_READ_MEMORY_ERROR,
-  WEECHAT_CONFIG_READ_FILE_NOT_FOUND, WEECHAT_CONFIG_WRITE_OK,
-  WEECHAT_CONFIG_WRITE_ERROR, WEECHAT_CONFIG_WRITE_MEMORY_ERROR, +
-  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED, WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE,
-  WEECHAT_CONFIG_OPTION_SET_ERROR, WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET, WEECHAT_CONFIG_OPTION_UNSET_OK_RESET,
-  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED, WEECHAT_CONFIG_OPTION_UNSET_ERROR
-| posortowane listy   |
-  WEECHAT_LIST_POS_SORT, WEECHAT_LIST_POS_BEGINNING, WEECHAT_LIST_POS_END
-| hotlisty            |
-  WEECHAT_HOTLIST_LOW, WEECHAT_HOTLIST_MESSAGE, WEECHAT_HOTLIST_PRIVATE,
+| Kategoria | Stałe
+
+| zwracane kody |
+  WEECHAT_RC_OK +
+  WEECHAT_RC_OK_EAT +
+  WEECHAT_RC_ERROR
+
+| pliki konfiguracyjne |
+  WEECHAT_CONFIG_READ_OK +
+  WEECHAT_CONFIG_READ_MEMORY_ERROR +
+  WEECHAT_CONFIG_READ_FILE_NOT_FOUND +
+  WEECHAT_CONFIG_WRITE_OK +
+  WEECHAT_CONFIG_WRITE_ERROR +
+  WEECHAT_CONFIG_WRITE_MEMORY_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OK_CHANGED +
+  WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE +
+  WEECHAT_CONFIG_OPTION_SET_ERROR +
+  WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_RESET +
+  WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED +
+  WEECHAT_CONFIG_OPTION_UNSET_ERROR
+
+| posortowane listy |
+  WEECHAT_LIST_POS_SORT +
+  WEECHAT_LIST_POS_BEGINNING +
+  WEECHAT_LIST_POS_END
+
+| hotlisty |
+  WEECHAT_HOTLIST_LOW +
+  WEECHAT_HOTLIST_MESSAGE +
+  WEECHAT_HOTLIST_PRIVATE +
   WEECHAT_HOTLIST_HIGHLIGHT
-| hook process        |
-  WEECHAT_HOOK_PROCESS_RUNNING, WEECHAT_HOOK_PROCESS_ERROR
-| hook connect        |
-  WEECHAT_HOOK_CONNECT_OK, WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND,
-  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND, WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED,
-  WEECHAT_HOOK_CONNECT_PROXY_ERROR, WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR,
-  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR, WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR,
-  WEECHAT_HOOK_CONNECT_MEMORY_ERROR, WEECHAT_HOOK_CONNECT_TIMEOUT,
+
+| hook process |
+  WEECHAT_HOOK_PROCESS_RUNNING +
+  WEECHAT_HOOK_PROCESS_ERROR
+
+| hook connect |
+  WEECHAT_HOOK_CONNECT_OK +
+  WEECHAT_HOOK_CONNECT_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_IP_ADDRESS_NOT_FOUND +
+  WEECHAT_HOOK_CONNECT_CONNECTION_REFUSED +
+  WEECHAT_HOOK_CONNECT_PROXY_ERROR +
+  WEECHAT_HOOK_CONNECT_LOCAL_HOSTNAME_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR +
+  WEECHAT_HOOK_CONNECT_GNUTLS_HANDSHAKE_ERROR +
+  WEECHAT_HOOK_CONNECT_MEMORY_ERROR +
+  WEECHAT_HOOK_CONNECT_TIMEOUT +
   WEECHAT_HOOK_CONNECT_SOCKET_ERROR
-| hook signal         |
-  WEECHAT_HOOK_SIGNAL_STRING, WEECHAT_HOOK_SIGNAL_INT, WEECHAT_HOOK_SIGNAL_POINTER
+
+| hook signal |
+  WEECHAT_HOOK_SIGNAL_STRING +
+  WEECHAT_HOOK_SIGNAL_INT +
+  WEECHAT_HOOK_SIGNAL_POINTER
 |===
 
 [[common_tasks]]