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

Eitan noreply at blender.org
Tue Mar 23 18:32:43 CET 2021 

Revision: 7885
          https://developer.blender.org/rBM7885
Author:   EitanSomething
Date:     2021-03-23 18:32:43 +0100 (Tue, 23 Mar 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/about/contribute/translations/add_language.rst
    trunk/blender_docs/manual/addons/import_export/scene_obj.rst
    trunk/blender_docs/manual/addons/object/carver.rst
    trunk/blender_docs/manual/advanced/app_templates.rst
    trunk/blender_docs/manual/animation/drivers/workflow_examples.rst
    trunk/blender_docs/manual/compositing/types/filter/inpaint.rst
    trunk/blender_docs/manual/conf.py
    trunk/blender_docs/manual/editors/dope_sheet/action.rst
    trunk/blender_docs/manual/editors/preferences/interface.rst
    trunk/blender_docs/manual/editors/preferences/navigation.rst
    trunk/blender_docs/manual/files/import_export/alembic.rst
    trunk/blender_docs/manual/interface/keymap/blender_default.rst
    trunk/blender_docs/manual/interface/selecting.rst
    trunk/blender_docs/manual/modeling/empties.rst
    trunk/blender_docs/manual/movie_clip/tracking/clip/sidebar/track/track.rst
    trunk/blender_docs/manual/scene_layout/object/tools/tool_settings.rst
    trunk/blender_docs/manual/sculpt_paint/weight_paint/introduction.rst
    trunk/blender_docs/tools_maintenance/change_placeholders.sh
    trunk/blender_docs/tools_rst/rst_remap.py

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs	2021-03-23 17:32:43 UTC (rev 7885)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7881
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7884
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/translations/add_language.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/translations/add_language.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/about/contribute/translations/add_language.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -103,7 +103,7 @@
    This will download all language sets available in the repository into the ``locale`` directory of your drive.
    You can go to the ``locale`` directory to see the hidden subdirectory ``.svn`` within it,
    together with directories of languages.
-   You'll need to add your own set of files for the language you're trying to translating to.
+   You'll need to add your own set of files for the language you are trying to translating to.
 
 #. From the ``blender_docs`` directory to generate a set of files for ``fr`` language::
 

Modified: trunk/blender_docs/manual/addons/import_export/scene_obj.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_obj.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/addons/import_export/scene_obj.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -124,7 +124,7 @@
    Global scale to use on export.
 Path Mode
    When referencing paths in exported files you may want some control as to the method used since absolute paths
-   may only be correct on you're own system. Relative paths on the other hand are more portable
+   may only be correct on you are own system. Relative paths on the other hand are more portable
    but mean you have to keep your files grouped when moving about on your local file system.
    In some cases the path doesn't matter since the target application will search
    a set of predefined paths anyway so you have the option to strip the path too.

Modified: trunk/blender_docs/manual/addons/object/carver.rst
===================================================================
--- trunk/blender_docs/manual/addons/object/carver.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/addons/object/carver.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -75,7 +75,7 @@
 When in profile mode, flat objects are present by default.
 You can add your own with the ``ProfilCreate.py`` file that will be explain after (ToDo).
 
-:kbd:`B` to enter this mode when you're in basic Boolean operations.
+:kbd:`B` to enter this mode when you are in basic Boolean operations.
 If you move your mouse over the object, you will see an overview of the pattern that
 you can use and a preview at the bottom right.
 

Modified: trunk/blender_docs/manual/advanced/app_templates.rst
===================================================================
--- trunk/blender_docs/manual/advanced/app_templates.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/advanced/app_templates.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -157,7 +157,7 @@
 On activation a ``register`` function is called, ``unregister`` is called when another template is selected.
 
 As these only run once, any changes to defaults must be made via handler.
-Two handlers you're likely to use are:
+Two handlers you are likely to use are:
 
 - ``bpy.app.handlers.load_factory_preferences_post``
 - ``bpy.app.handlers.load_factory_startup_post``

Modified: trunk/blender_docs/manual/animation/drivers/workflow_examples.rst
===================================================================
--- trunk/blender_docs/manual/animation/drivers/workflow_examples.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/animation/drivers/workflow_examples.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -155,9 +155,9 @@
       under which the shape key should be activated.
 
       #. In the Drivers tab, select the *Averaged Value* of the rotation of
-         the bone you're posing.
+         the bone you are posing.
 
-         Understand the rotation axis that you're interested in by enabling axes display
+         Understand the rotation axis that you are interested in by enabling axes display
          in the armature or by observing the bone's transform values in the Properties.
 
          Select the rotation channel and set it to local, meaning, the bone's
@@ -187,7 +187,7 @@
          "TAR-" (target) or "COR-" (corrective).
 
       #. In the Drivers tab, select the *Averaged Value* of the rotational difference
-         between the bone you're rotating and the target bone.
+         between the bone you are rotating and the target bone.
          A rotational difference is the minimum angle between two objects in World Space.
          It is therefore important that the bones have the same root,
          so that the only thing affecting the angle between the bones is the rotation of one of them.

Modified: trunk/blender_docs/manual/compositing/types/filter/inpaint.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/filter/inpaint.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/compositing/types/filter/inpaint.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -37,7 +37,7 @@
 Examples
 ========
 
-The left image shows the "wire" in place and after chroma keying has been applied. You will see you're left
+The left image shows the "wire" in place and after chroma keying has been applied. You will see you are left
 with a blank space -- it's shown as a black line here but it will be alpha in your Blender output.
 
 .. figure:: /images/compositing_types_filter_inpaint_example.jpg

Modified: trunk/blender_docs/manual/conf.py
===================================================================
--- trunk/blender_docs/manual/conf.py	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/conf.py	2021-03-23 17:32:43 UTC (rev 7885)
@@ -105,7 +105,7 @@
 copyright = ': This page is licensed under a CC-BY-SA 4.0 Int. License'
 author = 'Blender Documentation Team'
 
-# The version info for the project you're documenting, acts as replacement for
+# The version info for the project you are documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #

Modified: trunk/blender_docs/manual/editors/dope_sheet/action.rst
===================================================================
--- trunk/blender_docs/manual/editors/dope_sheet/action.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/editors/dope_sheet/action.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -50,11 +50,11 @@
 
    .. note::
 
-      These still work when you're not editing the action used by an NLA Strip.
-      If you're just animating a new action normally,
+      These still work when you are not editing the action used by an NLA Strip.
+      If you are just animating a new action normally,
       it is possible to use the "down arrow" to temporarily jump down to the previous action
-      without losing the new action you're working on, and then use the "up arrow" to get back to
-      it once you're done checking the other action(s).
+      without losing the new action you are working on, and then use the "up arrow" to get back to
+      it once you are done checking the other action(s).
 
 .. _dopesheet-action-action:
 

Modified: trunk/blender_docs/manual/editors/preferences/interface.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/interface.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/editors/preferences/interface.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -78,7 +78,7 @@
 
    .. note::
 
-      If you're familiar with navigation key shortcuts, this can be disabled.
+      If you are familiar with navigation key shortcuts, this can be disabled.
 
 .. _prefs-interface-color-picker-type:
 

Modified: trunk/blender_docs/manual/editors/preferences/navigation.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/navigation.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/editors/preferences/navigation.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -14,7 +14,7 @@
 ===========
 
 Orbit Method
-   Choose you're preferred method of interactively rotating the 3D Viewport.
+   Choose you are preferred method of interactively rotating the 3D Viewport.
 
    Turntable
       Rotates the view keeping the horizon horizontal.

Modified: trunk/blender_docs/manual/files/import_export/alembic.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/alembic.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/files/import_export/alembic.rst	2021-03-23 17:32:43 UTC (rev 7885)
@@ -20,7 +20,7 @@
    Alembic will not attempt to store a representation of the network of computations (rigs, basically)
    which are required to produce the final, animated vertex positions and animated transforms.
 
-:abbr:`TL;DR (Too long; didn't read.)`: Alembic can be used to write an animated mesh to a drive, and
+:abbr:`TL;DR (Too long; did not read.)`: Alembic can be used to write an animated mesh to a drive, and
 read it back quickly and efficiently. This means that a mesh can be animated with a very CPU-intensive rig,
 'baked' to an Alembic file, and loaded into the shot file for shading and lighting
 with only moderate CPU usage.

Modified: trunk/blender_docs/manual/interface/keymap/blender_default.rst
===================================================================
--- trunk/blender_docs/manual/interface/keymap/blender_default.rst	2021-03-23 17:29:35 UTC (rev 7884)
+++ trunk/blender_docs/manual/interface/keymap/blender_default.rst	2021-03-23 17:32:43 UTC (rev 7885)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list