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

Eitan noreply at blender.org
Tue Mar 23 14:19:44 CET 2021 

Revision: 7882
          https://developer.blender.org/rBM7882
Author:   EitanSomething
Date:     2021-03-23 14:19:44 +0100 (Tue, 23 Mar 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst
    trunk/blender_docs/manual/about/contribute/guides/writing_guide.rst
    trunk/blender_docs/manual/addons/3d_view/blenderkit.rst
    trunk/blender_docs/manual/addons/add_mesh/ant_landscape.rst
    trunk/blender_docs/manual/addons/add_mesh/discombobulator.rst
    trunk/blender_docs/manual/addons/camera/camera_rigs.rst
    trunk/blender_docs/manual/addons/import_export/paper_model.rst
    trunk/blender_docs/manual/addons/import_export/scene_dxf.rst
    trunk/blender_docs/manual/addons/import_export/scene_fbx.rst
    trunk/blender_docs/manual/addons/import_export/scene_gltf2.rst
    trunk/blender_docs/manual/addons/import_export/scene_obj.rst
    trunk/blender_docs/manual/addons/interface/context_menu.rst
    trunk/blender_docs/manual/addons/mesh/edit_mesh_tools.rst
    trunk/blender_docs/manual/addons/mesh/f2.rst
    trunk/blender_docs/manual/addons/object/carver.rst
    trunk/blender_docs/manual/addons/object/cell_fracture.rst
    trunk/blender_docs/manual/addons/object/skinify.rst
    trunk/blender_docs/manual/addons/render/povray.rst
    trunk/blender_docs/manual/addons/rigging/rigify/basics.rst
    trunk/blender_docs/manual/addons/rigging/rigify/bone_positioning.rst
    trunk/blender_docs/manual/addons/rigging/rigify/introduction.rst
    trunk/blender_docs/manual/addons/system/demo_mode.rst
    trunk/blender_docs/manual/advanced/scripting/addon_tutorial.rst
    trunk/blender_docs/manual/animation/armatures/bones/editing/extrude.rst
    trunk/blender_docs/manual/animation/armatures/bones/selecting.rst
    trunk/blender_docs/manual/animation/constraints/transform/limit_location.rst
    trunk/blender_docs/manual/animation/constraints/transform/limit_rotation.rst
    trunk/blender_docs/manual/animation/constraints/transform/limit_scale.rst
    trunk/blender_docs/manual/editors/preferences/addons.rst
    trunk/blender_docs/manual/modeling/meshes/uv/tools/relax.rst
    trunk/blender_docs/manual/modeling/volumes/introduction.rst
    trunk/blender_docs/manual/render/eevee/materials/nodes_support.rst
    trunk/blender_docs/manual/render/output/audio/speaker.rst
    trunk/blender_docs/manual/troubleshooting/gpu/windows/amd.rst
    trunk/blender_docs/manual/troubleshooting/gpu/windows/intel.rst
    trunk/blender_docs/manual/troubleshooting/gpu/windows/nvidia.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs	2021-03-23 13:19:44 UTC (rev 7882)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7863
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7881
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/about/contribute/guides/markup_guide.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -269,7 +269,7 @@
 Usage Guides
 ------------
 
-- Avoid adding videos which rely on voice, as this is difficult to translate.
+- Avoid adding videos that rely on voice, as this is difficult to translate.
 - Do not embed video tutorials as a means of explaining a feature, the writing itself should explain it adequately
   (though you may include a link to the video at the bottom of the page under the heading ``Tutorials``).
 

Modified: trunk/blender_docs/manual/about/contribute/guides/writing_guide.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/guides/writing_guide.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/about/contribute/guides/writing_guide.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -22,7 +22,7 @@
    More background information should be provided when necessary to give deeper understanding of a 3D pipeline.
 Concise
    Computer graphics is an incredibly interesting field,
-   there are many rules, exceptions to the rules and interesting details.
+   there are many rules, exceptions to the rules, and interesting details.
    Expanding into details can add unnecessary content,
    so keep the text concise and relevant to the topic at hand.
 Maintainable
@@ -66,7 +66,7 @@
   Blender often has 100's of bugs fixed between releases, so it is not realistic to reference
   even a fraction of them from the manual, while keeping this list up to date.
 
-  Issues which are known to the developers and are not going to be resolved before the next release
+  Issues that are known to the developers and are not going to be resolved before the next release
   can be documented as *Known Limitations*.
   In some cases, it may be best to include them in the :doc:`troubleshooting </troubleshooting/index>` section.
 - Avoid product placements, i.e. unnecessarily promoting software or hardware brands.

Modified: trunk/blender_docs/manual/addons/3d_view/blenderkit.rst
===================================================================
--- trunk/blender_docs/manual/addons/3d_view/blenderkit.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/3d_view/blenderkit.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -3,7 +3,7 @@
 BlenderKit
 **********
 
-`BlenderKit <https://www.blenderkit.com/>`__ is an online database of materials, brushes and 3D models
+`BlenderKit <https://www.blenderkit.com/>`__ is an online database of materials, brushes, and 3D models
 which you can search, download, upload and rate directly from the add-on.
 
 
@@ -580,7 +580,7 @@
       Change asset status.
 
 Downloads:
-   This panel is visible when there are running downloads.
+   This panel is visible when running downloads.
    You can cancel downloading of assets by pressing the ``X`` button.
    This cancels the download and deletes the file on your computer.
 

Modified: trunk/blender_docs/manual/addons/add_mesh/ant_landscape.rst
===================================================================
--- trunk/blender_docs/manual/addons/add_mesh/ant_landscape.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/add_mesh/ant_landscape.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -28,7 +28,7 @@
 Instructions
 ============
 
-After creating your landscape mesh there's three main areas in
+After creating your landscape mesh there are three main areas in
 the :ref:`ui-undo-redo-adjust-last-operation` panel to design your mesh.
 
 - Main Settings: Object and mesh related settings like size and subdivisions.
@@ -68,7 +68,7 @@
 
 Here we can adjust the noise settings and refresh only those settings.
 
-There are many settings and noise types here which allow you to customize your landscape.
+There are many settings and noise types that allow you to customize your landscape.
 
 
 Landscape Displace

Modified: trunk/blender_docs/manual/addons/add_mesh/discombobulator.rst
===================================================================
--- trunk/blender_docs/manual/addons/add_mesh/discombobulator.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/add_mesh/discombobulator.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -50,7 +50,7 @@
    The negative values will create the protrusions on the opposite side of the selected face(s).
 
 Min/Max Taper
-   Adjust the taper of the protrusions. This will affect the pointiness of the protrusions.
+   Adjust the taper of the protrusions. This will affect the pointyness of the protrusions.
 
 1, 2, 3, 4
    These checkboxes provide options for the subdivision of the faces or the amount of protrusions per face.

Modified: trunk/blender_docs/manual/addons/camera/camera_rigs.rst
===================================================================
--- trunk/blender_docs/manual/addons/camera/camera_rigs.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/camera/camera_rigs.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -173,7 +173,7 @@
 Camera Switching
 ----------------
 
-If you wish to switch cameras during an animation you can do this with the *Add Marker and Bind* button.
+If you wish to switch cameras during an animation, you can do this with the *Add Marker and Bind* button.
 This uses Blender's built-in camera binding tool to a Timeline marker.
 When pressed, it will add a marker to the Timeline and bind it to the camera controlled by the selected rig.
 Go to another frame, select a different camera rig and press it again.

Modified: trunk/blender_docs/manual/addons/import_export/paper_model.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/paper_model.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/import_export/paper_model.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -231,7 +231,7 @@
 
    No Texture
       Just creates the net on a white background (this used to be called "Pure Net").
-      The remaining options invoke texture baking and therefore are noticeable slower.
+      The remaining options invoke texture baking and therefore are noticeably slower.
    From Materials
       Exports the image that is assigned to each of the model's faces in their active material.
    Full Render, Selected to Active

Modified: trunk/blender_docs/manual/addons/import_export/scene_dxf.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_dxf.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/import_export/scene_dxf.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -74,7 +74,7 @@
       such as ``LWPOLYLINE`` and ``POLYLINE``.
    By Layer and Closed No-bulge Polygons
       Closed polylines with no bulge, that is no curved edges, can be merged to one single mesh.
-      This makes sense when the DXF polylines have an extrusion and/or an elevation attribute
+      This makes sense when the DXF polylines have an extrusion and/or an elevation attribute,
       which basically describes a location/rotation/scale transformation.
       If this merge option is chosen, line thickness settings will be ignored/disabled.
    By Layer and DXF-Type and Blocks
@@ -93,7 +93,7 @@
 Represent Line Thickness/Width
    DXF line attributes *thickness* and *width* have an effect on line in Z and X/Y direction respectively.
    A straight line might be turned to a cube by its attributes for instance.
-   Therefore in Blender these attributes are represented with curve extrusion, bevel and taper objects.
+   Therefore, in Blender these attributes are represented with curve extrusion, bevel and taper objects.
 Merge by Attributes
    If both *Merged Objects* and *Represent Line Thickness/Width* are activated
    the object merging needs to be extended to separate all lines width different thickness and width.
@@ -147,7 +147,7 @@
    Pyproj is a Python wrapper to the PROJ library, a well known C library used to
    convert coordinates between different coordinate systems.
    Open source GIS libraries such as PROJ are used directly or indirectly by many authorities and
-   therefore can be considered to be well maintained.
+   therefore can be considered well maintained.
 
    If Pyproj is available the DXF importer shows a selection of national coordinate systems
    but lets the user also to enter a custom EPSG / SRID code.
@@ -183,7 +183,7 @@
       30, newline, whitespace, whitespace, NUMBER
 
    then ``NUMBER`` will be most likely your coordinates.
-   Probably you can tell from the format and/or the range of the coordinates which coordinate system it should be.
+   You can probably tell from the format and/or the range of the coordinates which coordinate system it should be.
 
 
 .. _dxf-export:

Modified: trunk/blender_docs/manual/addons/import_export/scene_fbx.rst
===================================================================
--- trunk/blender_docs/manual/addons/import_export/scene_fbx.rst	2021-03-23 13:09:01 UTC (rev 7881)
+++ trunk/blender_docs/manual/addons/import_export/scene_fbx.rst	2021-03-23 13:19:44 UTC (rev 7882)
@@ -37,7 +37,7 @@
    - Animation support is minimal currently, we read all curves as if they were 'baked' ones
      (i.e. a set of close keyframes with linear interpolation).
    - Imported actions are linked to their related object, bone or shape key, on a 'first one wins' basis.
-     If you export a set of them for a single object you'll have to reassign them yourself.

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list