Merge pull request #20037 from bechtoldt/fix_19262

add missing file_tree and virtkey in pillar index doc, refs #19262
saltstack · Jan 26, 2015 · 5cc9a7c · 5cc9a7c
2 parents ad32a7c + 73cbbf0
commit 5cc9a7c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/doc/ref/pillar/all/index.rst b/doc/ref/pillar/all/index.rst
@@ -16,6 +16,7 @@ Full list of builtin pillar modules
     cobbler
     django_orm
     etcd_pillar
+    file_tree
     foreman
     git_pillar
     hiera
@@ -29,4 +30,5 @@ Full list of builtin pillar modules
     redismod
     s3
     svn_pillar
-    virtkey
+    varstack_pillar
+    virtkey
diff --git a/doc/ref/pillar/all/salt.pillar.file_tree.rst b/doc/ref/pillar/all/salt.pillar.file_tree.rst
@@ -0,0 +1,6 @@
+=====================
+salt.pillar.file_tree
+=====================
+
+.. automodule:: salt.pillar.file_tree
+    :members:
diff --git a/doc/ref/pillar/all/salt.pillar.varstack_pillar.rst b/doc/ref/pillar/all/salt.pillar.varstack_pillar.rst
@@ -0,0 +1,6 @@
+===========================
+salt.pillar.varstack_pillar
+===========================
+
+.. automodule:: salt.pillar.varstack_pillar
+    :members: