[Bf-docboard-svn] bf-manual: [8783] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Alaska
noreply at blender.org
Sat Dec 18 11:30:47 CET 2021
Revision: 8783
https://developer.blender.org/rBM8783
Author: Alaska
Date: 2021-12-18 11:30:47 +0100 (Sat, 18 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/about/contribute/index.rst
trunk/blender_docs/manual/about/index.rst
trunk/blender_docs/manual/addons/import_export/scene_fbx.rst
trunk/blender_docs/manual/addons/import_export/scene_obj.rst
trunk/blender_docs/manual/addons/rigging/rigify/metarigs.rst
trunk/blender_docs/manual/editors/geometry_node.rst
trunk/blender_docs/manual/editors/properties_editor.rst
trunk/blender_docs/manual/editors/video_sequencer/introduction.rst
trunk/blender_docs/manual/editors/video_sequencer/sequencer_preview.rst
trunk/blender_docs/manual/files/data_blocks.rst
trunk/blender_docs/manual/modeling/geometry_nodes/input/boolean.rst
trunk/blender_docs/manual/modeling/geometry_nodes/mesh/split_edges.rst
trunk/blender_docs/manual/modeling/meshes/editing/face/intersect_boolean.rst
trunk/blender_docs/manual/modeling/meshes/selecting/introduction.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs 2021-12-18 10:30:47 UTC (rev 8783)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/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-8778
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8782
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/index.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/index.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/about/contribute/index.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -61,7 +61,7 @@
A mailing list for discussing ideas, and keeping track of progress.
`Devtalk <https://devtalk.blender.org/c/documentation/12>`__
A forum based discussions on writing and translating documentation.
- This includes the user manual, wiki, release notes, and code docs.
+ This includes the user manual, Wiki, release notes, and code docs.
:ref:`blender-chat`
``#docs`` channel for informal discussions in real-time.
`Project Workboard <https://developer.blender.org/project/board/53/>`__
Modified: trunk/blender_docs/manual/about/index.rst
===================================================================
--- trunk/blender_docs/manual/about/index.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/about/index.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -65,7 +65,7 @@
A mailing list for discussing ideas, and keeping track of progress.
`Devtalk <https://devtalk.blender.org/c/documentation/12>`__
A forum based discussions on writing and translating documentation.
- This includes the user manual, wiki, release notes, and code docs.
+ This includes the user manual, Wiki, release notes, and code docs.
:ref:`blender-chat`
``#docs`` channel for informal discussions in real-time.
`Project Workboard <https://developer.blender.org/project/board/53/>`__
Modified: trunk/blender_docs/manual/addons/import_export/scene_fbx.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_fbx.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/addons/import_export/scene_fbx.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -135,7 +135,7 @@
:Auto: Uses relative paths for files which are in a subdirectory of the exported location,
absolute for any directories outside that.
:Absolute: Uses full paths.
- :Relative: Uses relative paths in every case (except when on a different drive on windows).
+ :Relative: Uses relative paths in every case (except when on a different drive on Windows).
:Match: Uses relative / absolute paths based on the paths used in Blender.
:Strip Path: Only write the filename and omit the path component.
:Copy: Copy the file on exporting and reference it with a relative path.
Modified: trunk/blender_docs/manual/addons/import_export/scene_obj.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_obj.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/addons/import_export/scene_obj.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -30,7 +30,7 @@
.. warning::
- Importing very large OBJ-files (over a few 100mb), can use a lot of RAM.
- - OBJ's export using Unix line endings ``\n`` even on windows,
+ - OBJ's export using Unix line endings ``\n`` even on Windows,
if you open the files in a text editor it must recognize ``\n`` line endings.
@@ -132,7 +132,7 @@
:Auto: Uses relative paths for files which are in a subdirectory of the exported location,
absolute for any directories outside that.
:Absolute: Uses full paths.
- :Relative: Uses relative paths in every case (except when on a different drive on windows).
+ :Relative: Uses relative paths in every case (except when on a different drive on Windows).
:Match: Uses relative / absolute paths based on the paths used in Blender.
:Strip Path: Only write the filename and omit the path component.
:Copy: Copy the file on exporting and reference it with a relative path.
Modified: trunk/blender_docs/manual/addons/rigging/rigify/metarigs.rst
===================================================================
--- trunk/blender_docs/manual/addons/rigging/rigify/metarigs.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/addons/rigging/rigify/metarigs.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -184,7 +184,7 @@
Bone Groups can be added and deleted as done in the general Bone Group panel
by clicking on the ``+`` or ``-`` buttons.
-All Bone Groups can be deleted at once by clicking on the specials menu.
+All Bone Groups can be deleted at once by clicking on the Specials menu.
To add the predefined Rigify Default Bone Groups list click on *Add Standard* button.
Modified: trunk/blender_docs/manual/editors/geometry_node.rst
===================================================================
--- trunk/blender_docs/manual/editors/geometry_node.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/editors/geometry_node.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -50,7 +50,7 @@
Toolbar
-------
-The Geometry Node editor has several tools to work with tools that can be accessed from the toolbar.
+The Geometry Node editor has several tools to work with tools that can be accessed from the Toolbar.
Sidebar
Modified: trunk/blender_docs/manual/editors/properties_editor.rst
===================================================================
--- trunk/blender_docs/manual/editors/properties_editor.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/editors/properties_editor.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -147,6 +147,6 @@
Sync tabs with the Outliner data-block selection.
See :ref:`editors-outliner-properties-sync` for more information.
- :Always: Always, when possible, change Property editor tabs when clicking an icon in an outliner.
- :Never: Never change Property editor tabs when clicking an icon in an outliner.
- :Auto: Change tabs only when the Property editor editor shares a border with a outliner.
+ :Always: Always, when possible, change Property editor tabs when clicking an icon in an Outliner.
+ :Never: Never change Property editor tabs when clicking an icon in an Outliner.
+ :Auto: Change tabs only when the Property editor editor shares a border with an Outliner.
Modified: trunk/blender_docs/manual/editors/video_sequencer/introduction.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/introduction.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/editors/video_sequencer/introduction.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -34,7 +34,7 @@
This region displays menus and buttons for interacting with the editor.
The header changes slightly depending on the selected view type (see below).
Preview
- This region shows the output of the sequencer at the time of the playhead.
+ This region shows the output of the Sequencer at the time of the Playhead.
Sequencer
This region shows timeline for managing the montage of strips.
Properties
Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer_preview.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer_preview.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer_preview.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -8,7 +8,7 @@
(but without the File Browser, Properties and Timeline editor).
It is however only one instance of the Video Sequence Editor with the View Type Sequencer & Preview,
while the workspace contains two instances.
-As a result the combi-view has only one sidebar and one toolbar with all the tools and properties of both view types.
+As a result the combi-view has only one Sidebar and one Toolbar with all the tools and properties of both view types.
.. figure:: /images/editors_vse_combi-sequencer-preview.png
@@ -15,13 +15,13 @@
Figure 1: Combined Sequencer & Preview
Some users prefer working in this view because all the tools are available.
-On the other hand, the toolbar and sidebar occupy the whole screen and so,
-it is not possible to have the sequencer timeline full width without
-also hiding the sidebar and toolbar for the preview and vice versa.
+On the other hand, the toolbar and Sidebar occupy the whole screen and so,
+it is not possible to have the Sequencer timeline full width without
+also hiding the Sidebar and Toolbar for the preview and vice versa.
It's also more difficult to add a small window.
One common used technique in the workspace is to replace
-the file browser window (temporarily) with another editor, eg. dope sheet.
+the File Browser window (temporarily) with another editor, e.g. Dope Sheet.
And of course, it's also not possible to have the Sequencer timeline
or the Preview alone in fullscreen (:kbd:`Ctrl-Spacebar`); eventually on a second monitor.
Modified: trunk/blender_docs/manual/files/data_blocks.rst
===================================================================
--- trunk/blender_docs/manual/files/data_blocks.rst 2021-12-13 23:46:00 UTC (rev 8782)
+++ trunk/blender_docs/manual/files/data_blocks.rst 2021-12-18 10:30:47 UTC (rev 8783)
@@ -401,7 +401,7 @@
:Integer: A numeric value without any decimals e.g. 1, 2, 3, or 4.
:Integer Array: A collection of multiple integer data types e.g. ``[1, 2, 3, 4]`` .
:String: A sequence of characters such as "Some Text".
- :Python: Edit a python data type directly, used for unsupported data types.
+ :Python: Edit a Python data type directly, used for unsupported data types.
.. note::
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/input/boolean.rst
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list