diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index e2bec589766..bf3cc38b783 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -4800,7 +4800,7 @@ void BKE_lib_override_library_main_operations_create(Main *bmain,
    * scenes have no master collection yet) are also never expected to be met in this code.
    */
   BLI_assert_msg(resync_success,
-                 "Ensuring that all viewlayers in Main are synced with their collections failed");
+                 "Ensuring that all view-layers in Main are synced with their collections failed");
   UNUSED_VARS_NDEBUG(resync_success);
   BKE_layer_collection_resync_forbid();
 
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc
index b435256f513..3ecdc4c350a 100644
--- a/source/blender/blenkernel/intern/scene.cc
+++ b/source/blender/blenkernel/intern/scene.cc
@@ -877,7 +877,7 @@ static void scene_foreach_id(ID *id, LibraryForeachIDData *data)
 
     /* FIXME: Although ideally this should always have access to synced data, this is not always
      * the case (FOREACH_ID can be called in context where re-syncing is blocked, while effectively
-     * modifying the viewlayer or collections data, see e.g. #id_delete code which remaps all
+     * modifying the view-layer or collections data, see e.g. #id_delete code which remaps all
      * deleted ID usages to null).
      *
      * There is no obvious solution to this problem, so for now working around with some 'band-aid'
@@ -889,7 +889,7 @@ static void scene_foreach_id(ID *id, LibraryForeachIDData *data)
     if (!is_synced) {
       BLI_assert_msg((flag & IDWALK_RECURSE) == 0,
                      "foreach_id should never recurse in case it cannot ensure that all "
-                     "viewlayers are in synced with their collections");
+                     "view-layers are in synced with their collections");
     }
     LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_unsynced_get(view_layer)) {
       BKE_LIB_FOREACHID_PROCESS_IDSUPER(
diff --git a/source/blender/blenloader/intern/versioning_500.cc b/source/blender/blenloader/intern/versioning_500.cc
index 8eb96a4ccd5..2695c07e8dc 100644
--- a/source/blender/blenloader/intern/versioning_500.cc
+++ b/source/blender/blenloader/intern/versioning_500.cc
@@ -2112,7 +2112,7 @@ static void do_version_material_remove_use_nodes(Main *bmain, Material *material
         *ntree, new_output_cycles, SOCK_IN, "NodeSocketVector", "Displacement");
     version_node_add_socket(*ntree, new_output_cycles, SOCK_IN, "NodeSocketFloat", "Thickness");
     /* We don't activate the output explicitly to avoid having two active outputs. We assume
-     * `node_tree.get_output_node('Cycles')` will return this node.  */
+     * `node_tree.get_output_node('Cycles')` will return this node. */
     new_output_cycles.custom1 = SHD_OUTPUT_CYCLES;
 
     bNode &shader_cycles = *blender::bke::node_add_static_node(
diff --git a/source/blender/compositor/COM_result.hh b/source/blender/compositor/COM_result.hh
index c6a985b76a5..677fcffe36f 100644
--- a/source/blender/compositor/COM_result.hh
+++ b/source/blender/compositor/COM_result.hh
@@ -279,7 +279,7 @@ class Result {
   void steal_data(Result &source);
 
   /* Similar to the Result variant of steal_data, but steals from a raw data buffer. The buffer is
-   * assumed to be allocated using Blender's guarded allocator.  */
+   * assumed to be allocated using Blender's guarded allocator. */
   void steal_data(void *data, int2 size);
 
   /* Set up the result to wrap an external GPU texture that is not allocated nor managed by the
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobe_volume.cc b/source/blender/draw/engines/eevee/eevee_lightprobe_volume.cc
index c5dffde41f6..67a21b6af67 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobe_volume.cc
+++ b/source/blender/draw/engines/eevee/eevee_lightprobe_volume.cc
@@ -846,7 +846,7 @@ void IrradianceBake::sync()
     }
     {
       /* Take the sorted lists array and copy adjacent surfel indices back to the Surfels.
-       * Also relink coplanar surfels to avoid over shadowing.  */
+       * Also relink coplanar surfels to avoid over shadowing. */
       PassSimple::Sub &sub = pass.sub("ListBuild");
       sub.shader_set(inst_.shaders.static_shader_get(SURFEL_LIST_BUILD));
       sub.bind_ssbo(SURFEL_BUF_SLOT, &surfels_buf_);
diff --git a/source/blender/draw/intern/draw_cache_impl_curves.cc b/source/blender/draw/intern/draw_cache_impl_curves.cc
index aac27825b17..4cbf00decc1 100644
--- a/source/blender/draw/intern/draw_cache_impl_curves.cc
+++ b/source/blender/draw/intern/draw_cache_impl_curves.cc
@@ -762,7 +762,7 @@ void CurvesEvalCache::ensure_positions(CurvesModule &module, const bke::CurvesGe
   }
 
   if (curves.is_empty()) {
-    /* Can happen when called from `curves_pos_buffer_get()`. Caller has to deal with nullptr.  */
+    /* Can happen when called from `curves_pos_buffer_get()`. Caller has to deal with nullptr. */
     return;
   }
 
diff --git a/source/blender/draw/intern/draw_curves_defines.hh b/source/blender/draw/intern/draw_curves_defines.hh
index a72a15d8464..98ff3a8ee79 100644
--- a/source/blender/draw/intern/draw_curves_defines.hh
+++ b/source/blender/draw/intern/draw_curves_defines.hh
@@ -24,7 +24,7 @@
 #define HANDLES_POS_RIGHT_SLOT 6
 #define BEZIER_OFFSETS_SLOT 7
 
-/* Nurbs (alias of other buffers).  */
+/* Nurbs (alias of other buffers). */
 #define CURVES_ORDER_SLOT CURVE_RESOLUTION_SLOT
 #define BASIS_CACHE_SLOT HANDLES_POS_LEFT_SLOT
 #define CONTROL_WEIGHTS_SLOT HANDLES_POS_RIGHT_SLOT
diff --git a/source/blender/draw/intern/shaders/draw_curves_info.hh b/source/blender/draw/intern/shaders/draw_curves_info.hh
index 443dcd7dc65..f52520d585b 100644
--- a/source/blender/draw/intern/shaders/draw_curves_info.hh
+++ b/source/blender/draw/intern/shaders/draw_curves_info.hh
@@ -46,7 +46,7 @@ STORAGE_BUF(CURVE_CYCLIC_SLOT, read, uint, curves_cyclic_buf[]) /* Actually bool
 STORAGE_BUF(HANDLES_POS_LEFT_SLOT, read, float, handles_positions_left_buf[])
 STORAGE_BUF(HANDLES_POS_RIGHT_SLOT, read, float, handles_positions_right_buf[])
 STORAGE_BUF(BEZIER_OFFSETS_SLOT, read, int, bezier_offsets_buf[])
-/* Nurbs (alias of other buffers).  */
+/* Nurbs (alias of other buffers). */
 // STORAGE_BUF(CURVES_ORDER_SLOT, read, uint, curves_order_buf[])  /* Actually int8_t. */
 // STORAGE_BUF(BASIS_CACHE_SLOT, read, float, basis_cache_buf[])
 // STORAGE_BUF(CONTROL_WEIGHTS_SLOT, read, float, control_weights_buf[])
diff --git a/source/blender/draw/intern/shaders/draw_curves_infos.hh b/source/blender/draw/intern/shaders/draw_curves_infos.hh
index 443dcd7dc65..f52520d585b 100644
--- a/source/blender/draw/intern/shaders/draw_curves_infos.hh
+++ b/source/blender/draw/intern/shaders/draw_curves_infos.hh
@@ -46,7 +46,7 @@ STORAGE_BUF(CURVE_CYCLIC_SLOT, read, uint, curves_cyclic_buf[]) /* Actually bool
 STORAGE_BUF(HANDLES_POS_LEFT_SLOT, read, float, handles_positions_left_buf[])
 STORAGE_BUF(HANDLES_POS_RIGHT_SLOT, read, float, handles_positions_right_buf[])
 STORAGE_BUF(BEZIER_OFFSETS_SLOT, read, int, bezier_offsets_buf[])
-/* Nurbs (alias of other buffers).  */
+/* Nurbs (alias of other buffers). */
 // STORAGE_BUF(CURVES_ORDER_SLOT, read, uint, curves_order_buf[])  /* Actually int8_t. */
 // STORAGE_BUF(BASIS_CACHE_SLOT, read, float, basis_cache_buf[])
 // STORAGE_BUF(CONTROL_WEIGHTS_SLOT, read, float, control_weights_buf[])
diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc
index 36b259b827d..803a204b837 100644
--- a/source/blender/editors/armature/pose_lib_2.cc
+++ b/source/blender/editors/armature/pose_lib_2.cc
@@ -351,7 +351,7 @@ static bAction *poselib_blend_init_get_action(bContext *C, wmOperator *op)
     }
   }
   else {
-    /* If no explicit asset reference was passed, get asset from context.  */
+    /* If no explicit asset reference was passed, get asset from context. */
     asset = CTX_wm_asset(C);
     if (!asset) {
       BKE_report(op->reports, RPT_ERROR, "No asset in context");
diff --git a/source/blender/editors/interface/view2d/view2d_draw.cc b/source/blender/editors/interface/view2d/view2d_draw.cc
index 7acd96402ca..faa0f260808 100644
--- a/source/blender/editors/interface/view2d/view2d_draw.cc
+++ b/source/blender/editors/interface/view2d/view2d_draw.cc
@@ -71,7 +71,7 @@ static int get_divisor(const int distance)
   }
 
   /* In case none of the above if is true, the divisor will be the full distance meaning the next
-   * step down from that number is 1.  */
+   * step down from that number is 1. */
   return distance;
 }
 
diff --git a/source/blender/editors/render/render_update.cc b/source/blender/editors/render/render_update.cc
index 6965c351fdf..bc86388ef6e 100644
--- a/source/blender/editors/render/render_update.cc
+++ b/source/blender/editors/render/render_update.cc
@@ -329,7 +329,7 @@ static void update_sequencer(const DEGEditorUpdateContext *update_ctx, Main *bma
     }
   }
 
-  /* Invalidate cache for strips that use this compositing tree as a modifier.  */
+  /* Invalidate cache for strips that use this compositing tree as a modifier. */
   if (GS(id->name) == ID_NT) {
     const bNodeTree *node_tree = reinterpret_cast<const bNodeTree *>(id);
     if (node_tree->type == NTREE_COMPOSIT) {
diff --git a/source/blender/editors/transform/transform_convert_armature.cc b/source/blender/editors/transform/transform_convert_armature.cc
index 0d5dd2cdf88..b885165b13e 100644
--- a/source/blender/editors/transform/transform_convert_armature.cc
+++ b/source/blender/editors/transform/transform_convert_armature.cc
@@ -458,8 +458,8 @@ static void add_pose_transdata(
     BoneParentTransform bpt;
     float rpmat[3][3];
 
-    /* Not using the pchan->custom_tx here because we need the transformation to be
-     * relative to the actual bone being modified, not it's visual representation.  */
+    /* Not using the `pchan->custom_tx` here because we need the transformation to be
+     * relative to the actual bone being modified, not it's visual representation. */
     BKE_bone_parent_transform_calc_from_pchan(pchan, &bpt);
     if (t->mode == TFM_TRANSLATION) {
       copy_m3_m4(pmat, bpt.loc_mat);
@@ -469,8 +469,8 @@ static void add_pose_transdata(
     }
 
     /* Grrr! Exceptional case: When translating pose bones that are either Hinge or NoLocal,
-     * and want align snapping, we just need both loc_mat and rotscale_mat.
-     * So simply always store rotscale mat in td->ext, and always use it to apply rotations...
+     * and want align snapping, we just need both `loc_mat` and `rotscale_mat`.
+     * So simply always store rotscale mat in `td->ext`, and always use it to apply rotations...
      * Ugly to need such hacks! :/ */
     copy_m3_m4(rpmat, bpt.rotscale_mat);
 
diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc
index d9b09dd0630..5ad8158e4b9 100644
--- a/source/blender/editors/uvedit/uvedit_select.cc
+++ b/source/blender/editors/uvedit/uvedit_select.cc
@@ -3081,7 +3081,7 @@ static void uv_select_invert(const Scene *scene, BMEditMesh *em)
     if (ED_uvedit_sync_uvselect_ignore(ts)) {
       bm->uv_select_sync_valid = false;
     }
-    /* If selection wasn't synced, there is no need to sync.  */
+    /* If selection wasn't synced, there is no need to sync. */
     if (bm->uv_select_sync_valid == false) {
       EDBM_select_swap(em);
       EDBM_selectmode_flush(em);
diff --git a/source/blender/makesdna/DNA_brush_enums.h b/source/blender/makesdna/DNA_brush_enums.h
index acc84abc36d..72795a68d57 100644
--- a/source/blender/makesdna/DNA_brush_enums.h
+++ b/source/blender/makesdna/DNA_brush_enums.h
@@ -104,13 +104,13 @@ typedef enum eGPDbrush_Flag {
 } eGPDbrush_Flag;
 
 typedef enum eGPDbrush_Flag2 {
-  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_HUE_AT_STROKE  */
+  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_HUE_AT_STROKE */
   /* Brush use random Hue at stroke level */
   GP_BRUSH_USE_HUE_AT_STROKE = (1 << 0),
-  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_SAT_AT_STROKE  */
+  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_SAT_AT_STROKE */
   /* Brush use random Saturation at stroke level */
   GP_BRUSH_USE_SAT_AT_STROKE = (1 << 1),
-  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_VAL_AT_STROKE  */
+  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_VAL_AT_STROKE */
   /* Brush use random Value at stroke level */
   GP_BRUSH_USE_VAL_AT_STROKE = (1 << 2),
   /* Brush use random Pressure at stroke level */
@@ -119,13 +119,13 @@ typedef enum eGPDbrush_Flag2 {
   GP_BRUSH_USE_STRENGTH_AT_STROKE = (1 << 4),
   /* Brush use random UV at stroke level */
   GP_BRUSH_USE_UV_AT_STROKE = (1 << 5),
-  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_HUE_RAND_PRESS  */
+  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_HUE_RAND_PRESS */
   /* Brush use Hue random pressure */
   GP_BRUSH_USE_HUE_RAND_PRESS = (1 << 6),
-  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_SAT_RAND_PRESS  */
+  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_SAT_RAND_PRESS */
   /* Brush use Saturation random pressure */
   GP_BRUSH_USE_SAT_RAND_PRESS = (1 << 7),
-  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_VAL_RAND_PRESS  */
+  /* DEPRECATED: replaced with BRUSH_COLOR_JITTER_USE_VAL_RAND_PRESS */
   /* Brush use Value random pressure */
   GP_BRUSH_USE_VAL_RAND_PRESS = (1 << 8),
   /* Brush use Pressure random pressure */
diff --git a/source/blender/windowmanager/intern/wm_operator_props.cc b/source/blender/windowmanager/intern/wm_operator_props.cc
index 5b016887737..a5f2633d357 100644
--- a/source/blender/windowmanager/intern/wm_operator_props.cc
+++ b/source/blender/windowmanager/intern/wm_operator_props.cc
@@ -512,8 +512,8 @@ void WM_operator_properties_generic_select(wmOperatorType *ot)
       ot->srna, "wait_to_deselect_others", false, "Wait to Deselect Others", "");
   RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
 
-  /* Force the selection to act on mouse click, not press. Necessary for some cases, but isn't used
-   * much.  */
+  /* Force the selection to act on mouse click, not press.
+   * Necessary for some cases, but isn't used much. */
   prop = RNA_def_boolean(ot->srna,
                          "use_select_on_click",
                          false,
diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc
index bfa4f9c23b2..817276d3446 100644
--- a/source/creator/creator_args.cc
+++ b/source/creator/creator_args.cc
@@ -825,7 +825,7 @@ static void print_help(bArgs *ba, bool all)
   BLI_args_print_arg_doc(ba, "--register-allusers");
   BLI_args_print_arg_doc(ba, "--unregister");
   BLI_args_print_arg_doc(ba, "--unregister-allusers");
-  /* Windows only.  */
+  /* Windows only. */
   BLI_args_print_arg_doc(ba, "--qos");
 
   BLI_args_print_arg_doc(ba, "--version");