diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index 96514ad..4604c6a 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -5,6 +5,7 @@
 ========= ========== ========================================================
 Version   Date       Changes
 ========= ========== ========================================================
+                     * 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
 1.0.2     2013-08-27 Fix incorrect versioning in setuptools
diff --git a/doc/source/concepts.rst b/doc/source/concepts.rst
index 67816d8..76b5818 100644
--- a/doc/source/concepts.rst
+++ b/doc/source/concepts.rst
@@ -25,6 +25,8 @@
 A class consists of zero or more parent classes, zero or more applications,
 and any number of parameters.
 
+A class name must not contain spaces.
+
 A node is almost equivalent to a class, except that it usually does not (but
 can) specify applications.