[Bf-docboard-svn] bf-manual: [8930] trunk/blender_docs/manual/scene_layout/collections/collections.rst: Merge branch 'blender-3.1-release'

[Aaron Carlisle]

Revision: 8930
          https://developer.blender.org/rBM8930
Author:   Blendify
Date:     2022-02-07 17:43:32 +0100 (Mon, 07 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/capture_attribute.rst
    trunk/blender_docs/manual/scene_layout/collections/collections.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-02-07 16:42:59 UTC (rev 8929)
+++ trunk/blender_docs	2022-02-07 16:43:32 UTC (rev 8930)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /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-8925
-/branches/blender-3.1-release/blender_docs:8904-8926
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-8929
\ No newline at end of property
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/attribute/capture_attribute.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attribute/capture_attribute.rst	2022-02-07 16:42:59 UTC (rev 8929)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attribute/capture_attribute.rst	2022-02-07 16:43:32 UTC (rev 8930)
@@ -63,7 +63,7 @@
 Here, a noise texture is evaluated in along the path of the curve in one dimension
 and rendered with a shader. The capture node is required because the output of
 the :doc:`/modeling/geometry_nodes/curve/curve_to_mesh` does not have a "curve parameter",
-since it is a mesh and not a curve. So, the :doc:`/modeling/geometry_nodes/curve/curve_parameter`
+since it is a mesh and not a curve. So, the :doc:`/modeling/geometry_nodes/curve/spline_parameter`
 must be evaluated while the geometry is still a curve.
 
 Internally, after the noise texture is evaluated on the curve,

Modified: trunk/blender_docs/manual/scene_layout/collections/collections.rst
===================================================================
--- trunk/blender_docs/manual/scene_layout/collections/collections.rst	2022-02-07 16:42:59 UTC (rev 8929)
+++ trunk/blender_docs/manual/scene_layout/collections/collections.rst	2022-02-07 16:43:32 UTC (rev 8930)
@@ -54,6 +54,8 @@
    Applies a spatial offset of the instanced collections from the original object's origin.
 
 
+.. _scene_layout-collections-line-art:
+
 Line Art
 --------