Merge pull request #880 from null-a/doc-tweaks

Minor doc fixes.
probmods · Aug 31, 2017 · 0ed18d2 · 0ed18d2
2 parents fd46677 + 3cefb61
commit 0ed18d2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/docs/functions/other.rst b/docs/functions/other.rst
@@ -55,15 +55,15 @@ Other
 .. js:function:: forward(model)
 
    Evaluates function of zero arguments ``model``, ignoring any
-   :ref:`factor <factor>` statements.
+   :ref:`conditioning <conditioning>`.
 
    Also see: :ref:`Forward Sampling <forward_sampling>`
 
 .. js:function:: forwardGuide(model)
 
    Evaluates function of zero arguments ``model``, ignoring any
-   ``factor`` statements, and sampling from the :ref:`guide <guides>`
-   at each random choice.
+   :ref:`conditioning <conditioning>`, and sampling from the
+   :ref:`guide <guides>` at each random choice.
 
    Also see: :ref:`Forward Sampling <forward_sampling>`
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -21,7 +21,6 @@ WebPPL Documentation
    sample
    distributions
    inference/index
-   conditioning
    optimization/index
    functions/index
    globalstore

diff --git a/docs/optimization/default_guides.rst b/docs/optimization/default_guides.rst