[Bf-docboard-svn] bf-manual: [9021] trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst: Merge branch 'blender-3.1-release'

[Aaron Carlisle]

Revision: 9021
          https://developer.blender.org/rBM9021
Author:   Blendify
Date:     2022-02-24 18:37:14 +0100 (Thu, 24 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/scene_layout/object/types.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-02-24 17:35:05 UTC (rev 9020)
+++ trunk/blender_docs	2022-02-24 17:37:14 UTC (rev 9021)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/blender-2.92-release/blender_docs:7610-7921
 /branches/blender-2.93-release/blender_docs:7959-8113
 /branches/blender-3.0-release/blender_docs:8543-8943
-/branches/blender-3.1-release/blender_docs:8904-9017
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-9020
\ No newline at end of property
Modified: trunk/blender_docs/manual/scene_layout/object/types.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/object/types.rst	2022-02-24 17:35:05 UTC (rev 9020)
+++ trunk/blender_docs/manual/scene_layout/object/types.rst	2022-02-24 17:37:14 UTC (rev 9021)
@@ -35,8 +35,9 @@
 :doc:`Volume </modeling/volumes/introduction>`
    Container for OpenVDB files that is generated
    by other software or Blender's :doc:`Fluid Simulator </physics/fluid/index>`.
-:doc:`Grease Pencil </grease_pencil/primitives>`
-   Objects created by painting strokes.
+:doc:`Grease Pencil </grease_pencil/introduction>`
+   Objects created by drawing strokes.
+   See :doc:`Grease Pencil Primitives </grease_pencil/primitives>`
 
 :doc:`Armature </animation/armatures/index>`
    Used for rigging 3D models to make them poseable and animatable.

Modified: trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst
===================================================================
--- trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst	2022-02-24 17:35:05 UTC (rev 9020)
+++ trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst	2022-02-24 17:37:14 UTC (rev 9021)
@@ -50,7 +50,7 @@
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Menu:      :menuselection:`Mask --> Invert Mask`
+   :Menu:      :menuselection:`Mask --> Fill Mask`
 
 Fills the whole mask with a value of 1.
 
@@ -61,7 +61,7 @@
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Menu:      :menuselection:`Mask --> Invert Mask`
+   :Menu:      :menuselection:`Mask --> Clear Mask`
    :Shortcut:  :kbd:`Alt-M`
 
 Fills the mask with a value of 0. To completely remove the mask data, see `Clear Sculpt-Mask Data`_.
@@ -147,7 +147,7 @@
    This operator is meant to be used interactively through the shortcut.
 
 
-.. rubric:: Shortcuts
+.. rubric:: Hotkeys
 
 :Invert: :kbd:`F`
    Flips between expanding a positive mask (value of one) or a negative mask (value of zero).