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

[Aaron Carlisle]

Revision: 9450
          https://developer.blender.org/rBM9450
Author:   Blendify
Date:     2022-08-04 05:25:22 +0200 (Thu, 04 Aug 2022)
Log Message:
-----------
Merge branch 'blender-3.3-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/image/editing.rst
    trunk/blender_docs/manual/files/media/image_formats.rst
    trunk/blender_docs/manual/render/color_management.rst
    trunk/blender_docs/manual/render/shader_nodes/converter/separate_xyz.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-08-04 03:24:04 UTC (rev 9449)
+++ trunk/blender_docs	2022-08-04 03:25:22 UTC (rev 9450)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,4 ##
 /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-9417
-/branches/blender-3.3-release/blender_docs:9438-9445
\ No newline at end of property
+/branches/blender-3.3-release/blender_docs:9438-9449
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/image/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/image/editing.rst	2022-08-04 03:24:04 UTC (rev 9449)
+++ trunk/blender_docs/manual/editors/image/editing.rst	2022-08-04 03:25:22 UTC (rev 9450)
@@ -119,7 +119,9 @@
    :Menu:      :menuselection:`Image --> Save As`
    :Shortcut:  :kbd:`Shift-Alt-S`
 
-Save the (rendered) image in a separate file.
+Save the (rendered) image in a separate file of any type.
+The image output settings can be configured and are the same as the
+:doc:`Render Output Properties </render/output/properties/output>`.
 
 
 Save a Copy

Modified: trunk/blender_docs/manual/files/media/image_formats.rst
===================================================================
--- trunk/blender_docs/manual/files/media/image_formats.rst	2022-08-04 03:24:04 UTC (rev 9449)
+++ trunk/blender_docs/manual/files/media/image_formats.rst	2022-08-04 03:25:22 UTC (rev 9450)
@@ -161,6 +161,7 @@
 
 File Format
    Choose what format to save the image as.
+
 Color Mode
    Choose the color format to save the image (or video) to.
    Note that *RGBA* is not available for all image formats, check the list above for details.
@@ -201,7 +202,19 @@
    The Copy checkbox will define if the data-block will reference the newly created file
    or the reference will be unchanged, maintaining it with the original one.
 
+Color Space
+   To specify the color space of the source file.
 
+   The list of color spaces depends on the active :ref:`OCIO config <ocio-config>`.
+   The default supported color spaces are described in detail here:
+   :ref:`Default OpenColorIO Configuration <ocio-config-default-color-spaces>`
+
+   .. note::
+
+      Note, *Cineon*, *DPX*, *OpenEXR*, and *Radiance HDR*
+      image types default to being saved in a linear color space.
+
+
 Format Details
 ==============
 

Modified: trunk/blender_docs/manual/render/color_management.rst
===================================================================
--- trunk/blender_docs/manual/render/color_management.rst	2022-08-04 03:24:04 UTC (rev 9449)
+++ trunk/blender_docs/manual/render/color_management.rst	2022-08-04 03:25:22 UTC (rev 9450)
@@ -290,3 +290,4 @@
    :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.
    :Filmic Log: Intermediate log color space of Filmic view transform.
+   :Filmic sRGB: Similar to *sRGB* but uses the Filmic view transform.

Modified: trunk/blender_docs/manual/render/shader_nodes/converter/separate_xyz.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/converter/separate_xyz.rst	2022-08-04 03:24:04 UTC (rev 9449)
+++ trunk/blender_docs/manual/render/shader_nodes/converter/separate_xyz.rst	2022-08-04 03:25:22 UTC (rev 9450)
@@ -1,4 +1,5 @@
-.. index:: Geometry Nodes; Separate XYZ
+.. _bpy.types.ShaderNodeSeparateXYZ:
+.. index:: Shader Nodes; Separate XYZ
 
 *****************
 Separate XYZ Node