[Bf-docboard-svn] bf-manual: [9277] Merge branch 'blender-3.2-release'

[Aaron Carlisle]

Revision: 9277
          https://developer.blender.org/rBM9277
Author:   Blendify
Date:     2022-05-11 04:57:38 +0200 (Wed, 11 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/render/color_management.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-11 02:57:24 UTC (rev 9276)
+++ trunk/blender_docs	2022-05-11 02:57:38 UTC (rev 9277)

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-9274
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9276
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/color_management.rst
===================================================================
--- trunk/blender_docs/manual/render/color_management.rst	2022-05-11 02:57:24 UTC (rev 9276)
+++ trunk/blender_docs/manual/render/color_management.rst	2022-05-11 02:57:38 UTC (rev 9277)
@@ -235,7 +235,7 @@
 ``data``
    Color space for non-color data.
 ``aces_interchange``
-   ACES2065-1 color space. Used to derive chromaticites of the *scene_linear* color space, for
+   ACES2065-1 color space. Used to derive chromaticities of the *scene_linear* color space, for
    effects such as blackbody emission.
 ``color_picking``
    Defines the distribution of colors in color pickers. It is expected to
@@ -269,7 +269,17 @@
    :Linear:
       Blender's native linear space meaning there is no gamma mapping,
       using Linear Rec. 709 chromaticities and a D65 white point.
-   :Linear ACES: ACES linear space using AP0 RGB primaries and a white point close to D60.
+   :Linear ACES:
+      Also known as ACES2065-1, which is an ACES color space using the AP0 color primaries,
+      a D60 white point and a linear transfer function.
+      This color space is meant to store and transfer data with the most amount of possible color information.
+   :Linear ACEScg:
+      An ACES color space that is designed to be used for rendering and compositing.
+      It uses the AP1 color primaries, a D60 white point, and a linear transfer function.
+      While similar to ACES2065-1, this color space has a smaller color gamut.
+      The smaller gamut allow it to better represent the colors that fit inside the CIE 1931 chromaticities diagram.
+      Colors that lie outside the CIE 1931 chromaticities are generally not important to rendering and compositing
+      because the human stimulus cannot represent these colors.
    :XYZ: Standard linear XYZ space.
    :Non-Color: Color space used for images which contains non-color data (e.g. normal maps).
    :Raw: Does not automatically convert to linear; same as Non-Color.