[Bf-docboard-svn] bf-manual: [7800] trunk/blender_docs/manual/scene_layout/object/editing/transform/control/axis_locking.rst: Merge branch 'blender-2.92-release'

[Eitan]

Revision: 7800
          https://developer.blender.org/rBM7800
Author:   EitanSomething
Date:     2021-03-03 21:31:34 +0100 (Wed, 03 Mar 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/render/shader_nodes/output/aov.rst
    trunk/blender_docs/manual/scene_layout/object/editing/transform/control/axis_locking.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-03-03 20:28:57 UTC (rev 7799)
+++ trunk/blender_docs	2021-03-03 20:31:34 UTC (rev 7800)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7796
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7799
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/shader_nodes/output/aov.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/output/aov.rst	2021-03-03 20:28:57 UTC (rev 7799)
+++ trunk/blender_docs/manual/render/shader_nodes/output/aov.rst	2021-03-03 20:31:34 UTC (rev 7800)
@@ -3,8 +3,6 @@
 AOV Output Node
 ***************
 
-:guilabel:`Cycles Only`
-
 .. figure:: /images/render_shader-nodes_output_aov_node.png
    :align: right
 

Modified: trunk/blender_docs/manual/scene_layout/object/editing/transform/control/axis_locking.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/object/editing/transform/control/axis_locking.rst	2021-03-03 20:28:57 UTC (rev 7799)
+++ trunk/blender_docs/manual/scene_layout/object/editing/transform/control/axis_locking.rst	2021-03-03 20:31:34 UTC (rev 7800)
@@ -96,10 +96,10 @@
 Axis Locking Modes
 ------------------
 
-A single key press constrains movement to the corresponding *Global* axis.
-A second key press of the *same* key constrains movement to the current transform orientation selection
-(except if it is set to *Global*, in which case the *Local* orientation is used).
-Finally, a third key press of the same key removes constraints.
+A single key press constrains movement to the current transform orientation selection.
+A second key press of the *same* key constrains movement to the corresponding *Global* axis
+(except if the transform orientation is set to *Global*, in which case the *Local* orientation is used).
+A third key press of the same key removes constraints.
 
 The orientation can be set
 in the :doc:`Transform Orientation </editors/3dview/controls/orientation>`
@@ -109,8 +109,8 @@
 
 For example, if the current transform orientation is set to *Normal*,
 pressing :kbd:`G` to start translation, followed by :kbd:`Z` will lock translation
-in the Z direction relative to the *Global* orientation, pressing :kbd:`Z`
-again will lock translation to the Z axis relative to the *Normal* orientation.
+in the Z direction relative to the *Normal* orientation, pressing :kbd:`Z`
+again will lock translation to the Z axis relative to the *Global* orientation.
 Pressing :kbd:`Z` again will remove all constraints.
 The current mode will be displayed in the left-hand side of the *3D Viewport header*.