[Bf-docboard-svn] bf-manual: [9018] trunk/blender_docs/manual: Merge branch 'blender-3.1-release'

[Aaron Carlisle]

Revision: 9018
          https://developer.blender.org/rBM9018
Author:   Blendify
Date:     2022-02-24 16:52:52 +0100 (Thu, 24 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/preferences/editing.rst
    trunk/blender_docs/manual/files/introduction.rst
    trunk/blender_docs/manual/scene_layout/object/introduction.rst
    trunk/blender_docs/manual/scene_layout/scene/introduction.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-02-24 15:48:37 UTC (rev 9017)
+++ trunk/blender_docs	2022-02-24 15:52:52 UTC (rev 9018)

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-9012
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-9017
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/preferences/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/editing.rst	2022-02-24 15:48:37 UTC (rev 9017)
+++ trunk/blender_docs/manual/editors/preferences/editing.rst	2022-02-24 15:52:52 UTC (rev 9018)
@@ -19,8 +19,8 @@
    To understand this option properly, you need to understand how Blender works with Objects.
    Almost everything in Blender is organized in a hierarchy of data-blocks.
    A data-block can be thought of as containers for certain pieces of information. For example,
-   the Object data-block contains information about the Object's location while the Object Data
-   "ObData" data-block contains information about the mesh.
+   the Object data-block contains information about the Object's location, rotation, and scale
+   while the associated linked Object Data data-block contains information about the mesh.
 
    .. figure:: /images/editors_preferences_editing_data-blocks-hierarchy.png
 

Modified: trunk/blender_docs/manual/files/introduction.rst
===================================================================
--- trunk/blender_docs/manual/files/introduction.rst	2022-02-24 15:48:37 UTC (rev 9017)
+++ trunk/blender_docs/manual/files/introduction.rst	2022-02-24 15:52:52 UTC (rev 9018)
@@ -6,7 +6,8 @@
 Each blend-file contains a database.
 This database contains all scenes, objects, meshes, textures, etc. that are in the file.
 
-A file can contain multiple scenes and each scene can contain multiple objects.
+A file can contain multiple :doc:`Scenes </scene_layout/scene/introduction>`
+and each scene can contain multiple :doc:`Objects </scene_layout/object/introduction>`.
 Objects can contain multiple materials which can contain many textures.
 It is also possible to create links between different objects, or share data between objects.
 A file can link data from other Blender files.

Modified: trunk/blender_docs/manual/scene_layout/object/introduction.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/object/introduction.rst	2022-02-24 15:48:37 UTC (rev 9017)
+++ trunk/blender_docs/manual/scene_layout/object/introduction.rst	2022-02-24 15:52:52 UTC (rev 9018)
@@ -8,7 +8,7 @@
 armatures to animate those models, to cameras to take pictures or make video of it all.
 
 Each Blender :doc:`object type </scene_layout/object/types>` (mesh, light, curve, camera, etc.)
-is composed from two parts an *Object* and *Object Data* (sometimes abbreviated to "ObData"):
+is composed from two parts: an *Object* and *Object Data* (sometimes abbreviated to "ObData"):
 
 Object
    Holds information about the position, rotation and size of a particular element.

Modified: trunk/blender_docs/manual/scene_layout/scene/introduction.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/scene/introduction.rst	2022-02-24 15:48:37 UTC (rev 9017)
+++ trunk/blender_docs/manual/scene_layout/scene/introduction.rst	2022-02-24 15:52:52 UTC (rev 9018)
@@ -11,10 +11,7 @@
 so it is a good idea to read that manual page first,
 if you are not familiar with the basics of that system.
 
-You can select and create scenes with the *Scene* data-block menu
-in the :doc:`Topbar </interface/window_system/topbar>`.
 
-
 Controls
 ========
 
@@ -22,6 +19,9 @@
 
    :Menu:      :menuselection:`Topbar --> Scene`
 
+You can select and create scenes with the *Scene* data-block menu
+in the :doc:`Topbar </interface/window_system/topbar>`.
+
 .. figure:: /images/scene-layout_scene_introduction_menu.png
    :align: right