[Bf-docboard-svn] bf-manual: [8757] trunk/blender_docs/manual/files: Merge branch 'blender-3.0-release'

[Aaron Carlisle]

Revision: 8757
          https://developer.blender.org/rBM8757
Author:   Blendify
Date:     2021-12-04 01:24:41 +0100 (Sat, 04 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/asset_browser.rst
    trunk/blender_docs/manual/files/asset_libraries/introduction.rst
    trunk/blender_docs/manual/files/index.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-12-03 16:47:28 UTC (rev 8756)
+++ trunk/blender_docs	2021-12-04 00:24:41 UTC (rev 8757)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /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-8750
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8756
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst	2021-12-03 16:47:28 UTC (rev 8756)
+++ trunk/blender_docs/manual/editors/asset_browser.rst	2021-12-04 00:24:41 UTC (rev 8757)
@@ -243,7 +243,8 @@
 name ends in ``_bundle.blend``. Any textures and other external files need to be
 :doc:`packed </files/blend/packed_data>` into the current blend file.
 
-Asset Bundles can be installed via the :ref:`Asset Browser <bpy.ops.asset.bundle_install>`:
+Asset Bundles can be copied to an asset library via the
+:ref:`Asset Browser <bpy.ops.asset.bundle_install>`:
 
 - Open the asset bundle blend-file.
 - Switch its Asset Browser to Current File (if it's not set at that already).
@@ -255,3 +256,11 @@
 - The blend-file will be saved at the chosen location, and any
   :doc:`catalogs </files/asset_libraries/catalogs>` of the asset bundle will be
   merged into the target asset library.
+
+
+.. note::
+   Both the word "asset" and the word "bundle" are commonly used, and not
+   necessarily with the same meaning as described here. Not everything that's
+   presented as an "asset bundle" will have the "Copy to Asset Library"
+   functionality available; for that, the bundle file needs to adhere to the
+   definition above.

Modified: trunk/blender_docs/manual/files/asset_libraries/introduction.rst
===================================================================
--- trunk/blender_docs/manual/files/asset_libraries/introduction.rst	2021-12-03 16:47:28 UTC (rev 8756)
+++ trunk/blender_docs/manual/files/asset_libraries/introduction.rst	2021-12-04 00:24:41 UTC (rev 8757)
@@ -28,13 +28,12 @@
 What is an Asset?
 =================
 
-   | **An asset is a data-block with meaning.**
-   | *Ton Roosendaal*
+**An asset is a data-block with meaning.**
 
 A blend-file is a database with multiple :doc:`/files/data_blocks`: objects, textures,
 materials, etc. When planning to re-use or share these, the data needs a
 meaning. What is this? What is this for? **Assets are curated data-blocks that
-are meant for reuse.**
+are meant for easy reuse.**
 
 .. note::
 
@@ -199,11 +198,12 @@
    *Clear Asset* in the Asset Browser.
 
 Clear Asset
-   Removes the asset metadata (catalog, description, author, preview, tags),
+   Removes the asset metadata (catalog, description, author, tags),
    effectively turning an asset into a regular data-block. As such, the same
    removal rules apply as with other data-blocks. For example, if a mesh object
    is still placed in the scene, *Clear Asset* will not remove it from the
-   scene. See :ref:`data-system-datablock-life-time`.
+   scene. See :ref:`data-system-datablock-life-time`. The preview will be kept
+   inside the data-block and not be removed.
 
 Clear Asset (Set Fake User)
    Performs the same operation as *Clear Asset*, and then marks the data-block

Modified: trunk/blender_docs/manual/files/index.rst
===================================================================
--- trunk/blender_docs/manual/files/index.rst	2021-12-03 16:47:28 UTC (rev 8756)
+++ trunk/blender_docs/manual/files/index.rst	2021-12-04 00:24:41 UTC (rev 8757)
@@ -11,6 +11,5 @@
    data_blocks.rst
    linked_libraries/index.rst
    asset_libraries/index.rst
-   asset_libraries/catalogs.rst
    media/index.rst
    import_export.rst