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

[Aaron Carlisle]

Revision: 9259
          https://developer.blender.org/rBM9259
Author:   Blendify
Date:     2022-05-07 04:17:39 +0200 (Sat, 07 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/about/contribute/install/linux.rst
    trunk/blender_docs/manual/about/contribute/install/macos.rst
    trunk/blender_docs/manual/about/contribute/install/windows.rst
    trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/modifiers.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/geometry/merge_by_distance.rst
    trunk/blender_docs/requirements.txt

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs	2022-05-07 02:17:39 UTC (rev 9259)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/blender-2.93-release/blender_docs:7959-8113
 /branches/blender-3.0-release/blender_docs:8543-9034
 /branches/blender-3.1-release/blender_docs:8904-9230
-/branches/blender-3.2-release/blender_docs:9236-9253
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9258
\ No newline at end of property
Modified: trunk/blender_docs/manual/about/contribute/install/linux.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/install/linux.rst	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs/manual/about/contribute/install/linux.rst	2022-05-07 02:17:39 UTC (rev 9259)
@@ -30,11 +30,7 @@
 
       sudo pacman -S python python-pip subversion
 
-.. warning::
 
-   Python 3.10 is not yet support, it is recommended to use Python 3.9 or earlier.
-
-
 Downloading the Repository
 ==========================
 

Modified: trunk/blender_docs/manual/about/contribute/install/macos.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/install/macos.rst	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs/manual/about/contribute/install/macos.rst	2022-05-07 02:17:39 UTC (rev 9259)
@@ -25,11 +25,7 @@
 - `PIP <https://pip.pypa.io/en/latest/installing/>`__
 - `Subversion <https://subversion.apache.org/>`__
 
-.. warning::
 
-   Python 3.10 is not yet support, it is recommended to use Python 3.9 or earlier.
-
-
 Downloading the Repository
 ==========================
 

Modified: trunk/blender_docs/manual/about/contribute/install/windows.rst
===================================================================
--- trunk/blender_docs/manual/about/contribute/install/windows.rst	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs/manual/about/contribute/install/windows.rst	2022-05-07 02:17:39 UTC (rev 9259)
@@ -25,11 +25,7 @@
 
    All other settings can remain as set by default.
 
-.. warning::
 
-   Python 3.10 is not yet support, it is recommended to use Python 3.9 or earlier.
-
-
 Installing SVN and Downloading the Repository
 =============================================
 

Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/modifiers.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/modifiers.rst	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/modifiers.rst	2022-05-07 02:17:39 UTC (rev 9259)
@@ -58,6 +58,15 @@
 Currently, the following modifiers are supported:
 
 
+.. index:: Video Sequencer Modifiers; Bright/Contrast Modifier
+.. _bpy.types.BrightContrastModifier:
+
+Bright/Contrast Modifier
+------------------------
+
+Adjusts the brightness and contrast of the modifier input.
+
+
 .. index:: Video Sequencer Modifiers; Color Balance Modifier
 .. _bpy.types.ColorBalanceModifier:
 
@@ -95,6 +104,7 @@
    Power
       Over-all exponent :math:`p`, which mainly adjusts the midtones.
 
+
 .. index:: Video Sequencer Modifiers; Curves Modifier
 .. _bpy.types.CurvesModifier:
 
@@ -117,15 +127,6 @@
 This modifier works the same as the :doc:`Curves Node </compositing/types/color/hue_correct>`.
 
 
-.. index:: Video Sequencer Modifiers; Bright/Contrast Modifier
-.. _bpy.types.BrightContrastModifier:
-
-Bright/Contrast Modifier
-------------------------
-
-Adjusts the brightness and contrast of the modifier input.
-
-
 .. index:: Video Sequencer Modifiers; Mask Modifier
 
 Mask Modifier
@@ -140,15 +141,6 @@
 This mask will be applied on all the others modifiers below it in the stack.
 
 
-.. index:: Video Sequencer Modifiers; White Balance Modifier
-.. _bpy.types.WhiteBalanceModifier:
-
-White Balance Modifier
-----------------------
-
-Use it to adjust the white balance by choosing the color that should be white.
-
-
 .. index:: Video Sequencer Modifiers; Tone Map Modifier
 
 Tone Map Modifier
@@ -158,3 +150,12 @@
 of high dynamic range images in a medium that has a more limited dynamic range.
 
 This modifier works the same as the :doc:`Tone Map Node </compositing/types/color/tone_map>`.
+
+
+.. index:: Video Sequencer Modifiers; White Balance Modifier
+.. _bpy.types.WhiteBalanceModifier:
+
+White Balance Modifier
+----------------------
+
+Use it to adjust the white balance by choosing the color that should be white.

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/geometry/merge_by_distance.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/geometry/merge_by_distance.rst	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/geometry/merge_by_distance.rst	2022-05-07 02:17:39 UTC (rev 9259)
@@ -39,11 +39,12 @@
 ==========
 
 Mode
+   Method for choosing which vertices are merged.
 
+   :All: Merge includes all geometry including loose parts.
+   :Connected: Merge only includes attached geometry i.e. the modifier will not merge loose parts together.
 
-This node has no properties.
 
-
 Output
 ======
 

Modified: trunk/blender_docs/requirements.txt
===================================================================
--- trunk/blender_docs/requirements.txt	2022-05-07 02:17:10 UTC (rev 9258)
+++ trunk/blender_docs/requirements.txt	2022-05-07 02:17:39 UTC (rev 9259)
@@ -1,11 +1,11 @@
-sphinx==4.1.1
+sphinx==4.5.0
 
 # Sphinx dependencies that are important
-Jinja2==3.0.3
-Pygments==2.11.2
+Jinja2==3.1.2
+Pygments==2.12.0
 docutils==0.17.1
 snowballstemmer==2.2.0
-babel==2.9.1
+babel==2.10.1
 requests==2.27.1
 
 # Only needed for building translations.