Merge branch '2015.5' into merge-2015.8

No conflicts.

doc/ref/configuration/minion.rst

@@ -360,6 +360,28 @@ executed. By default this feature is disabled, to enable set cache_jobs to
 
     cache_jobs: False
 
+.. conf_minion:: grains
+
+``grains``
+----------
+
+Default: (empty)
+
+.. seealso::
+    :ref:`static-custom-grains`
+
+Statically assigns grains to the minion.
+
+.. code-block:: yaml
+
+    grains:
+      roles:
+        - webserver
+        - memcache
+      deployment: datacenter4
+      cabinet: 13
+      cab_u: 14-15
+
 .. conf_minion:: grains_cache
 
 ``grains_cache``

doc/topics/targeting/grains.rst

@@ -73,7 +73,7 @@ Grains in the Minion Config
 ===========================
 
 Grains can also be statically assigned within the minion configuration file.
-Just add the option ``grains`` and pass options to it:
+Just add the option :conf_minion:`grains` and pass options to it:
 
 .. code-block:: yaml