[Bf-blender-cvs] [4a1ba155d5c] master: Merge branch 'blender-v2.93-release'

[Aaron Carlisle]

Commit: 4a1ba155d5c470f625f9f71ba262ae5fb7d5c4f5
Author: Aaron Carlisle
Date:   Thu May 27 21:27:48 2021 -0400
Branches: master
https://developer.blender.org/rB4a1ba155d5c470f625f9f71ba262ae5fb7d5c4f5

Merge branch 'blender-v2.93-release'

===================================================================



===================================================================

diff --cc release/scripts/modules/rna_manual_reference.py
index 7e2d09efcd4,6d345e87d93..552f7eeb4f3
--- a/release/scripts/modules/rna_manual_reference.py
+++ b/release/scripts/modules/rna_manual_reference.py
@@@ -1852,9 -1902,10 +1907,11 @@@ url_manual_mapping = 
  	("bpy.types.wipesequence*", "video_editing/sequencer/strips/transitions/wipe.html#bpy-types-wipesequence"),
  	("bpy.ops.clip.prefetch*", "movie_clip/tracking/clip/editing/clip.html#bpy-ops-clip-prefetch"),
  	("bpy.ops.clip.set_axis*", "movie_clip/tracking/clip/editing/reconstruction.html#bpy-ops-clip-set-axis"),
 +	("bpy.ops.file.pack_all*", "files/blend/packed_data.html#bpy-ops-file-pack-all"),
  	("bpy.ops.gpencil.paste*", "grease_pencil/modes/edit/grease_pencil_menu.html#bpy-ops-gpencil-paste"),
  	("bpy.ops.image.project*", "sculpt_paint/texture_paint/tool_settings/options.html#bpy-ops-image-project"),
+ 	("bpy.ops.image.replace*", "editors/image/editing.html#bpy-ops-image-replace"),
+ 	("bpy.ops.image.save_as*", "editors/image/editing.html#bpy-ops-image-save-as"),
  	("bpy.ops.material.copy*", "render/materials/assignment.html#bpy-ops-material-copy"),
  	("bpy.ops.mesh.decimate*", "modeling/meshes/editing/mesh/cleanup.html#bpy-ops-mesh-decimate"),
  	("bpy.ops.mesh.dissolve*", "modeling/meshes/editing/mesh/delete.html#bpy-ops-mesh-dissolve"),