4 files changed, 33 insertions, 19 deletions
diff --git a/doc/en/autogen/plugin_api/completions.asciidoc b/doc/en/autogen/plugin_api/completions.asciidoc
index f5edac824..a841c5e0d 100644
--- a/doc/en/autogen/plugin_api/completions.asciidoc
+++ b/doc/en/autogen/plugin_api/completions.asciidoc
@@ -114,6 +114,10 @@
 
 | weechat | cursor_areas | areas ("chat" or bar name) for free cursor movement
 
+| weechat | env_value | value of an environment variable
+
+| weechat | env_vars | environment variables
+
 | weechat | filename | filename
 
 | weechat | filters_names | names of filters
diff --git a/doc/en/autogen/user/weechat_commands.asciidoc b/doc/en/autogen/user/weechat_commands.asciidoc
index 2d230f991..f0aff8e79 100644
--- a/doc/en/autogen/user/weechat_commands.asciidoc
+++ b/doc/en/autogen/user/weechat_commands.asciidoc
@@ -755,23 +755,22 @@ Examples:
 ----
 
 [[command_weechat_set]]
-[command]*`set`* set config options::
+[command]*`set`* set config options and environment variables::
 
 ----
 /set  [<option> [<value>]]
       diff [<option> [<option>...]]
+      env [<variable> [<value>]]
 
 option: name of an option (wildcard "*" is allowed)
- value: new value for option
+ value: new value for option, according to type:
+          boolean: on, off or toggle
+          integer: number, ++number or --number
+           string: any string ("" for empty string)
+            color: color name, ++number or --number
+        Note: for all types, you can use null to remove option         value (undefined value). This works only for some special         plugin variables.
   diff: display only changed options
-
-New value can be, according to variable type:
-  boolean: on, off or toggle
-  integer: number, ++number or --number
-   string: any string ("" for empty string)
-    color: color name, ++number or --number
-
-For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
+   env: display or set an environment variable (use value "" to unset a variable)
 
 Examples:
   display options about highlight:
@@ -782,6 +781,13 @@ Examples:
     /set diff
   display changed options in irc plugin:
     /set diff irc.*
+  display value of environment variable LANG:
+    /set env LANG
+  set environment variable LANG and use it:
+    /set env LANG fr_FR.UTF-8
+    /upgrade
+  unset environment variable ABC:
+    /set env ABC ""
 ----
 
 [[command_weechat_unset]]
diff --git a/doc/en/weechat_faq.en.asciidoc b/doc/en/weechat_faq.en.asciidoc
index 7d6b48e71..beb83a355 100644
--- a/doc/en/weechat_faq.en.asciidoc
+++ b/doc/en/weechat_faq.en.asciidoc
@@ -264,16 +264,20 @@ Other solution is to use a script:
 [[change_locale_without_quit]]
 === I want to change the language used by WeeChat for messages, but without exiting WeeChat, is it possible?
 
-Yes, you have to use a python script, 'shell.py' (available on WeeChat website)
-and issue these commands when script is loaded:
+Yes, with WeeChat ≥ 1.0:
 
 ----
-/shell setenv LANG=en_US.UTF-8
+/set env LANG en_US.UTF-8
 /upgrade
 ----
 
-To have English messages with UTF-8 encoding for terminal, for ISO users, you
-can issue: `/shell setenv LANG=en_US`.
+With older WeeChat:
+
+----
+/script install shell.py
+/shell setenv LANG=en_US.UTF-8
+/upgrade
+----
 
 [[use_256_colors]]
 === How can I use 256 colors in WeeChat?
@@ -297,10 +301,10 @@ term screen-256color
 ----
 
 If your 'TERM' variable has wrong value and that WeeChat is already running,
-don't panic! You can change it without restarting, thanks to script 'shell.py':
+you can change it with these two commands (with WeeChat ≥ 1.0):
 
 ----
-/shell setenv TERM=screen-256color
+/set env TERM screen-256color
 /upgrade
 ----
 
diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc
index 00bd52e78..84e9194fd 100644
--- a/doc/en/weechat_user.en.asciidoc
+++ b/doc/en/weechat_user.en.asciidoc
@@ -1441,10 +1441,10 @@ term screen-256color
 ----
 
 If your 'TERM' variable has wrong value and that WeeChat is already running,
-don't panic! You can change it without restarting, thanks to script 'shell.py':
+you can change it with these two commands:
 
 ----
-/shell setenv TERM=screen-256color
+/set env TERM screen-256color
 /upgrade
 ----