diff --git a/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index c155042962d..0aa7fcfb1b8 100644
--- a/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -484,7 +484,7 @@ def dump_rna_messages(msgs, reports, settings, verbose=False):
 def dump_py_messages_from_files(msgs, reports, files, settings):
     """
     Dump text inlined in the python files given, e.g. "My Name" in:
-        layout.prop("someprop", text="My Name")
+        ``layout.prop("someprop", text="My Name")``
     """
     import ast
 
diff --git a/source/blender/animrig/intern/action.cc b/source/blender/animrig/intern/action.cc
index f39e48d6a0e..b6d959764df 100644
--- a/source/blender/animrig/intern/action.cc
+++ b/source/blender/animrig/intern/action.cc
@@ -532,7 +532,7 @@ Slot &Action::slot_add_for_id(const ID &animated_id)
   Slot &slot = this->slot_add();
   slot.idtype = GS(animated_id.name);
 
-  /* Determine the identifier for this slot, prioritising transparent
+  /* Determine the identifier for this slot, prioritizing transparent
    * auto-selection when toggling between Actions. That's why the last-used slot
    * identifier is used here, and the ID name only as fallback. */
   const AnimData *adt = BKE_animdata_from_id(&animated_id);
diff --git a/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc b/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc
index 2e8aa1b4c64..55311a7ea3e 100644
--- a/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc
@@ -140,7 +140,7 @@ eGPUTextureFormat RenderBuffers::vector_tx_format()
                                      inst_.motion_blur.postfx_enabled()) &&
                                     !inst_.is_viewport();
 
-  /* Only RG16F (motion.prev) for the viewport. */
+  /* Only RG16F (`motion.prev`) for the viewport. */
   return do_full_vector_render_pass ? GPU_RGBA16F : GPU_RG16F;
 }
 
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
index a192aea6a0f..c3a249d0d63 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_downsample_frag.glsl
@@ -45,8 +45,8 @@ void main()
   float coc_near = reduce_max(cocs_near);
   float coc_far = reduce_max(cocs_far);
 
-  /* now we need to write the near-far fields premultiplied by the coc
-   * also use bilateral weighting by each coc values to avoid bleeding. */
+  /* Now we need to write the near-far fields pre-multiplied by the COC
+   * also use bilateral weighting by each COC values to avoid bleeding. */
   vec4 near_weights = step(0.0, cocs_near) * clamp(1.0 - abs(coc_near - cocs_near), 0.0, 1.0);
   vec4 far_weights = step(0.0, cocs_far) * clamp(1.0 - abs(coc_far - cocs_far), 0.0, 1.0);
 
diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc
index 35ea5431a02..92482a08554 100644
--- a/source/blender/editors/interface/interface_icons.cc
+++ b/source/blender/editors/interface/interface_icons.cc
@@ -1470,7 +1470,7 @@ static void icon_draw_size(float x,
   Icon *icon = BKE_icon_get(icon_id);
 
   if (icon->obj_type != ICON_DATA_STUDIOLIGHT) {
-    /* Icon Alpha should not apply to Mapcaps/Studio lighting. #80356. */
+    /* Icon alpha should not apply to MatCap/Studio lighting. #80356. */
     alpha *= btheme->tui.icon_alpha;
   }
 
diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh
index d163fc1fdbc..3179be7458f 100644
--- a/source/blender/gpu/intern/gpu_context_private.hh
+++ b/source/blender/gpu/intern/gpu_context_private.hh
@@ -113,8 +113,8 @@ class Context {
 
   Batch *polyline_batch_get();
 
-  /* When using --debug-gpu, assert that the shader fragments write to all the writtable
-   * attachments of the bound framebuffer. */
+  /* When using `--debug-gpu`, assert that the shader fragments write to all the writable
+   * attachments of the bound frame-buffer. */
   void assert_framebuffer_shader_compatibility(Shader *sh)
   {
     if (!(G.debug & G_DEBUG_GPU)) {
@@ -130,7 +130,7 @@ class Context {
 
     if ((fb_attachments_bits & ~fragment_output_bits) != 0) {
       std::string msg;
-      msg = msg + "Shader (" + sh->name_get() + ") does not write to all framebuffer (" +
+      msg = msg + "Shader (" + sh->name_get() + ") does not write to all frame-buffer (" +
             active_fb->name_get() + ") color attachments";
       BLI_assert_msg(false, msg.c_str());
       std::cerr << msg << std::endl;
diff --git a/source/blender/gpu/intern/gpu_framebuffer_private.hh b/source/blender/gpu/intern/gpu_framebuffer_private.hh
index 87463e5c40f..e42c95eb661 100644
--- a/source/blender/gpu/intern/gpu_framebuffer_private.hh
+++ b/source/blender/gpu/intern/gpu_framebuffer_private.hh
@@ -87,7 +87,7 @@ class FrameBuffer {
   bool dirty_state_ = true;
   /* Flag specifying the current bind operation should use explicit load-store state. */
   bool use_explicit_load_store_ = false;
-  /** Bitset indicating the color attachments slots in use. */
+  /** Bit-set indicating the color attachments slots in use. */
   uint16_t color_attachments_bits_ = 0;
 
  public:
diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh
index 46cd26822be..9654b120fb6 100644
--- a/source/blender/gpu/intern/gpu_shader_private.hh
+++ b/source/blender/gpu/intern/gpu_shader_private.hh
@@ -44,7 +44,7 @@ class Shader {
  public:
   /** Uniform & attribute locations for shader. */
   ShaderInterface *interface = nullptr;
-  /** Bitset indicating the framebuffer color attachments that this shader writes to. */
+  /** Bit-set indicating the frame-buffer color attachments that this shader writes to. */
   uint16_t fragment_output_bits = 0;
 
   /**