diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index 4604c6a..3553051 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -5,6 +5,7 @@
 ========= ========== ========================================================
 Version   Date       Changes
 ========= ========== ========================================================
+                     * Classes and nodes URI must not overlap anymore
                      * Class names must not contain spaces
 1.1       2013-08-28 Salt adapter: fix interface to include minion_id, filter
                      output accordingly; fixes master_tops
diff --git a/doc/source/operations.rst b/doc/source/operations.rst
index 75da3f1..c3439c5 100644
--- a/doc/source/operations.rst
+++ b/doc/source/operations.rst
@@ -10,8 +10,8 @@
 (as suggested by the ``_fs`` postfix).
 
 ``yaml_fs`` works with two directories, one for node definitions, and another
-for class definitions. It is possible to use a single directory for both, but
-that could get messy and is therefore not recommended.
+for class definitions. The two directories must not be the same, nor can one
+be a parent of the other.
 
 Files in those directories are YAML-files, specifying key-value pairs. The
 following three keys are read by |reclass|: