[Bf-docboard-svn] bf-manual: [8680] Merge branch 'blender-3.0-release'

[Alaska]

Revision: 8680
          https://developer.blender.org/rBM8680
Author:   Alaska
Date:     2021-11-25 09:52:42 +0100 (Thu, 25 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/render/cycles/gpu_rendering.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-11-25 08:51:33 UTC (rev 8679)
+++ trunk/blender_docs	2021-11-25 08:52:42 UTC (rev 8680)

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-8677
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8679
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/cycles/gpu_rendering.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/gpu_rendering.rst	2021-11-25 08:51:33 UTC (rev 8679)
+++ trunk/blender_docs/manual/render/cycles/gpu_rendering.rst	2021-11-25 08:52:42 UTC (rev 8680)
@@ -92,7 +92,7 @@
 Typically, the GPU can only use the amount of memory that is on the GPU
 (see `Would multiple GPUs increase available memory?`_ for more information).
 This is usually much smaller than the amount of system memory the CPU can access.
-With CUDA and OptiX devices, if the GPU memory is full Blender will automatically try to use system memory.
+With CUDA, OptiX and HIP devices, if the GPU memory is full Blender will automatically try to use system memory.
 This has a performance impact, but will usually still result in a faster render than using CPU rendering.