diff --git a/doc/source/operations.rst b/doc/source/operations.rst
index 98adf57..42e8a86 100644
--- a/doc/source/operations.rst
+++ b/doc/source/operations.rst
@@ -38,6 +38,8 @@
                 parameters:
                   ssh.server:
                     permit_root_login: no
+environment  only relevant for nodes, this allows to specify an "environment"
+             into which the node definition is supposed to be place.
 ============ ================================================================
 
 Nodes may be defined in subdirectories. However, node names (filename) must be
diff --git a/doc/source/salt.rst b/doc/source/salt.rst
index 25bd53f..f0cc733 100644
--- a/doc/source/salt.rst
+++ b/doc/source/salt.rst
@@ -163,6 +163,7 @@
 classes           (none) [#nodegroups]_
 applications      states
 parameters        pillar
+environment       environment
 ================= ================
 
 .. [#nodegroups] See `Salt issue #5787`_ for steps into the direction of letting
diff --git a/doc/source/todo.rst b/doc/source/todo.rst
index 8f87c26..38df768 100644
--- a/doc/source/todo.rst
+++ b/doc/source/todo.rst
@@ -41,16 +41,6 @@
 Ideally, |reclass| could unify the interface so that even templates can be
 shared between the various CMS.
 
-Node environments
------------------
-At least Salt and Puppet support the notion of "environments", but the Salt
-adapter just puts everything into the "base" environment at the moment.
-
-Part of the reason that multiple environments aren't (yet) supported is
-because I don't see the use-case (anymore) with |reclass|. If you still see
-a use-case, then please help me understand it and let's figure out a good way
-to introduce this concept into |reclass|.
-
 Membership information
 ----------------------
 It would be nice if |reclass| could provide e.g. the Nagios master node with