diff --git a/intern/ghost/intern/GHOST_ContextVK.cc b/intern/ghost/intern/GHOST_ContextVK.cc
index 96938021d4a..79489379707 100644
--- a/intern/ghost/intern/GHOST_ContextVK.cc
+++ b/intern/ghost/intern/GHOST_ContextVK.cc
@@ -824,7 +824,7 @@ static bool surfaceFormatSupported(const VkSurfaceFormatKHR &surface_format)
 /**
  * Select the surface format that we will use.
  *
- * We will select any 8bit unorm surface.
+ * We will select any 8bit UNORM surface.
  */
 static bool selectSurfaceFormat(const VkPhysicalDevice physical_device,
                                 const VkSurfaceKHR surface,
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index dcd1ce70496..9e6809e4fef 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -14,7 +14,7 @@
 extern "C" {
 #endif
 
-/* Name of subfolder inside BLENDER_DATAFILES that contains font files. */
+/* Name of sub-directory inside #BLENDER_DATAFILES that contains font files. */
 #define BLF_DATAFILES_FONTS_DIR "fonts"
 
 /* File name of the default variable-width font. */
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 0a8fe263c6f..0b8d826b2e9 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -18,7 +18,7 @@ extern "C" {
 
 /* Blender major and minor version. */
 #define BLENDER_VERSION 400
-/* Blender patch version for bugfix releases. */
+/* Blender patch version for bug-fix releases. */
 #define BLENDER_VERSION_PATCH 0
 /** Blender release cycle stage: alpha/beta/rc/release. */
 #define BLENDER_VERSION_CYCLE alpha
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index df616c15eeb..d5b879e5a75 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -3250,8 +3250,8 @@ static void animsys_create_action_track_strip(const AnimData *adt,
    * and this setting doesn't work. */
   r_action_strip->flag |= NLASTRIP_FLAG_USR_INFLUENCE;
 
-  /* Unless extendmode is Nothing (might be useful for flattening NLA evaluation), disable range.
-   * Extendmode Nothing and Hold will behave as normal. Hold Forward will behave just like Hold.
+  /* Unless `extendmode` is Nothing (might be useful for flattening NLA evaluation), disable range.
+   * Extend-mode Nothing and Hold will behave as normal. Hold Forward will behave just like Hold.
    */
   if (r_action_strip->extendmode != NLASTRIP_EXTEND_NOTHING) {
     r_action_strip->flag |= NLASTRIP_FLAG_NO_TIME_MAP;
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 60b8786daa0..8dd87f4c87f 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -104,7 +104,7 @@ static void armature_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src
 
   BLI_duplicatelist(&armature_dst->bonebase, &armature_src->bonebase);
 
-  /* Duplicate the childrens' lists */
+  /* Duplicate the children's lists. */
   bone_dst = armature_dst->bonebase.first;
   for (bone_src = armature_src->bonebase.first; bone_src; bone_src = bone_src->next) {
     bone_dst->parent = NULL;
@@ -2493,7 +2493,7 @@ void BKE_pose_where_is_bone(struct Depsgraph *depsgraph,
   /* pose_mat(b) = pose_mat(b-1) * yoffs(b-1) * d_root(b) * bone_mat(b) * chan_mat(b) */
   BKE_armature_mat_bone_to_pose(pchan, pchan->chan_mat, pchan->pose_mat);
 
-  /* Only rootbones get the cyclic offset (unless user doesn't want that). */
+  /* Only root-bones get the cyclic offset (unless user doesn't want that). */
   /* XXX That could be a problem for snapping and other "reverse transform" features... */
   if (!pchan->parent) {
     if ((pchan->bone->flag & BONE_NO_CYCLICOFFSET) == 0) {
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index e11a9c89e48..723b4685ca8 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -970,7 +970,7 @@ static bool collection_object_cyclic_check_internal(Object *object, Collection *
   if (object->instance_collection) {
     Collection *dup_collection = object->instance_collection;
     if ((dup_collection->id.tag & LIB_TAG_DOIT) == 0) {
-      /* Cycle already exists in collections, let's prevent further crappyness */
+      /* Cycle already exists in collections, let's prevent further creepiness. */
       return true;
     }
     /* flag the object to identify cyclic dependencies in further dupli collections */
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 378394ea471..6b1cf01e9ec 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -4025,7 +4025,7 @@ static void transform_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
         mat4_to_size(dvec, ct->matrix);
 
         if (is_negative_m4(ct->matrix)) {
-          /* Bugfix #27886: (this is a limitation that riggers will have to live with for now).
+          /* Bug-fix #27886: (this is a limitation that riggers will have to live with for now).
            * We can't be sure which axis/axes are negative,
            * though we know that something is negative.
            * Assume we don't care about negativity of separate axes. */
diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc
index a9124e6c5f5..abe4395f213 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.cc
+++ b/source/blender/blenkernel/intern/dynamicpaint.cc
@@ -97,7 +97,7 @@ static int neighStraightY[8] = {0, 1, 0, -1, 1, 1, -1, -1};
 
 /* subframe_updateObject() flags */
 #define SUBFRAME_RECURSION 5
-/* surface_getBrushFlags() return vals */
+/* #surface_getBrushFlags() return values. */
 #define BRUSH_USES_VELOCITY (1 << 0)
 /* Brush mesh ray-cast status. */
 #define HIT_VOLUME 1
diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc
index 32043717e3e..91e7ffcdf32 100644
--- a/source/blender/blenkernel/intern/icons.cc
+++ b/source/blender/blenkernel/intern/icons.cc
@@ -745,7 +745,7 @@ static int icon_gplayer_color_ensure_create_icon(bGPDlayer *gpl)
   BLI_assert(BLI_thread_is_main());
 
   /* NOTE: The color previews for GP Layers don't really need
-   * to be "rendered" to image per se (as it will just be a plain
+   * to be "rendered" to image per-se (as it will just be a plain
    * colored rectangle), we need to define icon data here so that
    * we can store a pointer to the layer data in icon->obj.
    */
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 1d38ec8ffba..65c22191f7c 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -1948,7 +1948,7 @@ void BKE_library_make_local(Main *bmain,
   /* This is probably more of a hack than something we should do here, but...
    * Issue is, the whole copying + remapping done in complex cases above may leave pose-channels
    * of armatures in complete invalid state (more precisely, the bone pointers of the
-   * pose-channels - very crappy cross-data-blocks relationship), se we tag it to be fully
+   * pose-channels - very crappy cross-data-blocks relationship), so we tag it to be fully
    * recomputed, but this does not seems to be enough in some cases, and evaluation code ends up
    * trying to evaluate a not-yet-updated armature object's deformations.
    * Try "make all local" in 04_01_H.lighting.blend from Agent327 without this, e.g. */
diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc
index dd9fb93ebd3..894c3fef55a 100644
--- a/source/blender/blenkernel/intern/lib_override.cc
+++ b/source/blender/blenkernel/intern/lib_override.cc
@@ -2192,7 +2192,7 @@ static bool lib_override_library_resync(Main *bmain,
        * old liboverrides are also remapped, it means that the old liboverride owner of the shape
        * key is also now pointing to the new liboverride shape key, not the old one. Since shape
        * keys do not own their liboverride data, the old liboverride shape key user has to be
-       * restored to use the old liboverride shapekey, otherwise applying shape key override
+       * restored to use the old liboverride shape-key, otherwise applying shape key override
        * operations will be useless (would apply using the new, from linked data, liboverride,
        * being effectively a no-op). */
       Key **key_override_old_p = BKE_key_from_id_p(id_override_old);
diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc
index 56f9ac4af6e..dda56e57343 100644
--- a/source/blender/blenkernel/intern/material.cc
+++ b/source/blender/blenkernel/intern/material.cc
@@ -1285,11 +1285,9 @@ bool BKE_object_material_slot_remove(Main *bmain, Object *ob)
     return false;
   }
 
-  /* take a mesh/curve/mball as starting point, remove 1 index,
-   * AND with all objects that share the ob->data
-   *
-   * after that check indices in mesh/curve/mball!!!
-   */
+  /* Take a mesh/curve/meta-ball as starting point, remove 1 index,
+   * AND with all objects that share the `ob->data`.
+   * After that check indices in mesh/curve/meta-ball! */
 
   totcolp = BKE_object_material_len_p(ob);
   matarar = BKE_object_material_array_p(ob);
diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c
index 57c944be96e..b26a7f3fd3a 100644
--- a/source/blender/blenkernel/intern/ocean.c
+++ b/source/blender/blenkernel/intern/ocean.c
@@ -1454,7 +1454,7 @@ void BKE_ocean_bake(struct Ocean *o,
 
           // pr = pr * och->foam_fade; /* overall fade */
 
-          /* Remember ocean coord sys is Y up!
+          /* Remember ocean coord system is Y up!
            * break up the foam where height (Y) is low (wave valley),
            * and X and Z displacement is greatest. */
 
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index baa327c0fe7..7060983c281 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4597,7 +4597,7 @@ static void system_step(ParticleSimulationData *sim, float cfra, const bool use_
     }
 
     for (dframe = -totframesback; dframe <= 0; dframe++) {
-      /* simulate each subframe */
+      /* Simulate each sub-frame. */
       dt_frac = psys->dt_frac;
       for (t_frac = dt_frac; t_frac <= 1.0f; t_frac += dt_frac) {
         sim->courant_num = 0.0f;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index c1e89cd923a..de3c7256bdb 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1286,8 +1286,8 @@ static int ptcache_frame_from_filename(const char *filename, const char *ext)
 
   /* could crash if trying to copy a string out of this range */
   if (len > ext_len) {
-    /* using frame_len here gives compile error (vla) */
-    char num[/* frame_len */ 6 + 1];
+    /* Using frame_len here gives compile error (VLA). */
+    char num[/*frame_len*/ 6 + 1];
     STRNCPY(num, filename + len - ext_len);
 
     return atoi(num);
diff --git a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc
index b7bc4d097a4..3f858e0538b 100644
--- a/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc
+++ b/source/blender/blenlib/tests/BLI_polyfill_2d_test.cc
@@ -428,14 +428,14 @@ TEST(polyfill2d, SquareCW)
   TEST_POLYFILL_TEMPLATE_STATIC(poly, POLYFILL2D_TEST_NOP);
 }
 
-/* Starfleet insigna */
+/* Star-fleet insignia. */
 TEST(polyfill2d, Starfleet)
 {
   const float poly[][2] = {{0, 0}, {0.6f, 0.4f}, {1, 0}, {0.5f, 1}};
   TEST_POLYFILL_TEMPLATE_STATIC(poly, POLYFILL2D_TEST_NOP);
 }
 
-/* Starfleet insigna with repeated point */
+/* Star-fleet insignia with repeated point. */
 TEST(polyfill2d, StarfleetDegenerate)
 {
   const float poly[][2] = {{0, 0}, {0.6f, 0.4f}, {0.6f, 0.4f}, {1, 0}, {0.5f, 1}};
diff --git a/source/blender/blenloader/BLO_read_write.h b/source/blender/blenloader/BLO_read_write.h
index f5e4c9f76c9..5c49c871d7a 100644
--- a/source/blender/blenloader/BLO_read_write.h
+++ b/source/blender/blenloader/BLO_read_write.h
@@ -162,8 +162,8 @@ void blo_write_id_struct(BlendWriter *writer,
  *
  * Required for writing properly embedded IDs currently.
  *
- * \note: Once there is a better generic handling of embedded IDs, this may go back to private code
- * in writefile.c
+ * \note Once there is a better generic handling of embedded IDs,
+ * this may go back to private code in `writefile.c`.
  */
 typedef struct BLO_Write_IDBuffer BLO_Write_IDBuffer;
 
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 58896d432a8..ba5a66671c6 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -468,7 +468,7 @@ void BLO_main_expander(BLOExpandDoitCallback expand_doit_func);
  * Loop over all ID data in Main to mark relations.
  * Set (id->tag & LIB_TAG_NEED_EXPAND) to mark expanding. Flags get cleared after expanding.
  *
- * \param fdhandle: usually filedata, or own handle.
+ * \param fdhandle: usually file-data, or own handle.
  * \param mainvar: the Main database to expand.
  */
 void BLO_expand_main(void *fdhandle, struct Main *mainvar);
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index ab7fe7aad4b..270a839ff6d 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -1076,7 +1076,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
   if (bmain->versionfile <= 230) {
     bScreen *screen;
 
-    /* new variable blockscale, for panels in any area */
+    /* New variable block-scale, for panels in any area. */
     for (screen = bmain->screens.first; screen; screen = screen->id.next) {
       ScrArea *area;
 
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c
index fca5d38113b..a9088a82c2a 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -2,9 +2,9 @@
  * Copyright 2017 Blender Foundation */
 
 /*
- * Based on C++ version by Sergey Sharybin <sergey.vfx@gmail.com>.
- * Based on Python script msgfmt.py from Python source code tree, which was written by
- * Martin v. Löwis <loewis@informatik.hu-berlin.de>
+ * Based on C++ version by `Sergey Sharybin <sergey.vfx@gmail.com>`.
+ * Based on Python script `msgfmt.py` from Python source code tree, which was written by
+ * `Martin v. Löwis <loewis@informatik.hu-berlin.de>`.
  *
  * Generate binary message catalog from textual translation description.
  *
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index 98de2ea60bd..0d44d35b17e 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -426,7 +426,7 @@ static BMOpDefine bmo_pointmerge_facedata_def = {
 };
 
 /*
- * Average Vertices Facevert Data.
+ * Average Vertices Face-vert Data.
  *
  * Merge uv/vcols associated with the input vertices at
  * the bounding box center. (I know, it's not averaging but
diff --git a/source/blender/bmesh/intern/bmesh_walkers.h b/source/blender/bmesh/intern/bmesh_walkers.h
index cef2e1c9d2d..fe7f6f37582 100644
--- a/source/blender/bmesh/intern/bmesh_walkers.h
+++ b/source/blender/bmesh/intern/bmesh_walkers.h
@@ -163,7 +163,7 @@ enum {
   BMW_ISLAND,
   BMW_ISLAND_MANIFOLD,
   BMW_CONNECTED_VERTEX,
-  /* end of array index enum vals */
+  /* End of array index enum values. */
 
   /* Do not initialize function pointers and struct size in #BMW_init. */
   BMW_CUSTOM,
diff --git a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
index e6dddf00cd9..d854f58c53a 100644
--- a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
@@ -354,7 +354,7 @@ enum eVelocityStep : uint32_t {
 };
 
 struct VelocityObjectIndex {
-  /** Offset inside #VelocityObjectBuf for each timestep. Indexed using eVelocityStep. */
+  /** Offset inside #VelocityObjectBuf for each time-step. Indexed using eVelocityStep. */
   packed_int3 ofs;
   /** Temporary index to copy this to the #VelocityIndexBuf. */
   uint resource_id;
diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.cc b/source/blender/draw/engines/overlay/overlay_next_instance.cc
index 2fdef9128a3..bdf9ffa0bfe 100644
--- a/source/blender/draw/engines/overlay/overlay_next_instance.cc
+++ b/source/blender/draw/engines/overlay/overlay_next_instance.cc
@@ -155,7 +155,7 @@ void Instance::draw(Manager &manager)
   const DRWView *view_legacy = DRW_view_default_get();
   View view("OverlayView", view_legacy);
 
-  /* TODO: Better semantical switch? */
+  /* TODO: Better semantics using a switch? */
   if (!resources.color_overlay_tx.is_valid()) {
     /* Likely to be the selection case. Allocate dummy texture and bind only depth buffer. */
     resources.line_tx.acquire(int2(1, 1), GPU_RGBA8);
diff --git a/source/blender/draw/intern/draw_cache_extract.hh b/source/blender/draw/intern/draw_cache_extract.hh
index faeb4af4489..d4fb0aa773b 100644
--- a/source/blender/draw/intern/draw_cache_extract.hh
+++ b/source/blender/draw/intern/draw_cache_extract.hh
@@ -262,7 +262,7 @@ struct MeshBatchCache {
 
   MeshBatchList batch;
 
-  /* Index buffer per material. These are subranges of `ibo.tris` */
+  /* Index buffer per material. These are sub-ranges of `ibo.tris`. */
   GPUIndexBuf **tris_per_mat;
 
   GPUBatch **surface_per_mat;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 365eeaca952..2406b7651a2 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2573,7 +2573,7 @@ void DRW_draw_select_loop(struct Depsgraph *depsgraph,
   draw_select_framebuffer_depth_only_setup(viewport_size);
   GPU_framebuffer_bind(g_select_buffer.framebuffer_depth_only);
   GPU_framebuffer_clear_depth(g_select_buffer.framebuffer_depth_only, 1.0f);
-  /* WORKAROUND: Needed for Select-Next for keeping the same codeflow as Overlay-Next. */
+  /* WORKAROUND: Needed for Select-Next for keeping the same code-flow as Overlay-Next. */
   BLI_assert(DRW_viewport_texture_list_get()->depth == NULL);
   DRW_viewport_texture_list_get()->depth = g_select_buffer.texture_depth;
 
diff --git a/source/blender/draw/intern/draw_manager.hh b/source/blender/draw/intern/draw_manager.hh
index aa263d4d82a..416c3b34151 100644
--- a/source/blender/draw/intern/draw_manager.hh
+++ b/source/blender/draw/intern/draw_manager.hh
@@ -126,8 +126,8 @@ class Manager {
   ResourceHandle resource_handle(const float4x4 &model_matrix);
   /**
    * Get resource id for a loose matrix with bounds. The draw-calls for this resource handle will
-   * be culled bute there won't be any associated object info / bounds. Assumes correct handedness
-   * / winding.
+   * be culled but there won't be any associated object info / bounds.
+   * Assumes correct handedness / winding.
    */
   ResourceHandle resource_handle(const float4x4 &model_matrix,
                                  const float3 &bounds_center,
diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.c b/source/blender/editors/gpencil_legacy/gpencil_utils.c
index 701817f666f..e1017004cc6 100644
--- a/source/blender/editors/gpencil_legacy/gpencil_utils.c
+++ b/source/blender/editors/gpencil_legacy/gpencil_utils.c
@@ -1670,7 +1670,7 @@ static bool gpencil_check_cursor_region(bContext *C, const int mval_i[2])
     return false;
   }
 
-  /* TODO: add more spacetypes */
+  /* TODO: add more space-types. */
   if (!ELEM(area->spacetype, SPACE_VIEW3D)) {
     return false;
   }
diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc
index 0fef04280b7..812bb6bbce5 100644
--- a/source/blender/editors/interface/interface_layout.cc
+++ b/source/blender/editors/interface/interface_layout.cc
@@ -791,7 +791,7 @@ static void ui_item_enum_expand_elem_exec(uiLayout *layout,
   }
 
   if (RNA_property_flag(prop) & PROP_ENUM_FLAG) {
-    /* If this is set, assert since we're clobbering someone elses callback. */
+    /* If this is set, assert since we're clobbering someone else's callback. */
     /* Buttons get their block's func by default, so we cannot assert in that case either. */
     BLI_assert(ELEM(but->func, nullptr, block->func));
     UI_but_func_set(but, ui_item_enum_expand_handle, but, POINTER_FROM_INT(value));
diff --git a/source/blender/editors/interface/interface_region_popup.cc b/source/blender/editors/interface/interface_region_popup.cc
index d5355091ce2..5a1c5028b0e 100644
--- a/source/blender/editors/interface/interface_region_popup.cc
+++ b/source/blender/editors/interface/interface_region_popup.cc
@@ -742,7 +742,7 @@ uiBlock *ui_popup_block_refresh(bContext *C,
   /* checks which buttons are visible, sets flags to prevent draw (do after region init) */
   ui_popup_block_scrolltest(block);
 
-  /* adds subwindow */
+  /* Adds sub-window. */
   ED_region_floating_init(region);
 
   /* get winmat now that we actually have the subwindow */
diff --git a/source/blender/editors/interface/interface_style.cc b/source/blender/editors/interface/interface_style.cc
index 020d5dc3249..e2f332f5fca 100644
--- a/source/blender/editors/interface/interface_style.cc
+++ b/source/blender/editors/interface/interface_style.cc
@@ -44,7 +44,7 @@ static void fontstyle_set_ex(const uiFontStyle *fs, const float dpi_fac);
  * This is a complete set of layout rules, the 'state' of the Layout
  * Engine. Multiple styles are possible, defined via C or Python. Styles
  * get a name, and will typically get activated per region type, like
- * "Header", or "Listview" or "Toolbar". Properties of Style definitions
+ * `Header`, or `Listview` or `Toolbar`. Properties of Style definitions
  * are:
  *
  * - default column properties, internal spacing, aligning, min/max width
diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc
index fd5800f67ea..ce5b91c3308 100644
--- a/source/blender/editors/interface/view2d.cc
+++ b/source/blender/editors/interface/view2d.cc
@@ -549,9 +549,8 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize)
           cur->xmin -= temp;
           cur->xmax -= temp;
 
-          /* width does not get modified, as keepaspect here is just set to make
-           * sure visible area adjusts to changing view shape!
-           */
+          /* Width does not get modified, as keep-aspect here is just set to make
+           * sure visible area adjusts to changing view shape! */
         }
       }
       else {
diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c
index 54674bf58f6..f0941518407 100644
--- a/source/blender/editors/mesh/editmesh_loopcut.c
+++ b/source/blender/editors/mesh/editmesh_loopcut.c
@@ -229,7 +229,7 @@ static void ringsel_finish(bContext *C, wmOperator *op)
        *     in editmesh_select.cc (around line 1000)... */
       /* sets as active, useful for other tools */
       if (em->selectmode & SCE_SELECT_VERTEX) {
-        /* low priority TODO: get vertrex close to mouse. */
+        /* low priority TODO: get vertex close to mouse. */
         BM_select_history_store(em->bm, lcd->eed->v1);
       }
       if (em->selectmode & SCE_SELECT_EDGE) {
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 737c3e34033..3c301ce3357 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -2635,7 +2635,7 @@ void POSE_OT_constraint_add_with_targets(wmOperatorType *ot)
  * \note Only for pose-channels.
  * \{ */
 
-/* TODO: should these be here, or back in editors/armature/poseobject.c again? */
+/* TODO: should these be here, or back in `editors/armature/poseobject.c` again? */
 
 /* present menu with options + validation for targets to use */
 static int pose_ik_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 067f6e91dd9..29e2a6b079d 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -1116,7 +1116,7 @@ void ED_spacetype_image(void)
   art->listener = image_main_region_listener;
   BLI_addhead(&st->regiontypes, art);
 
-  /* regions: listview/buttons/scopes */
+  /* regions: list-view/buttons/scopes */
   art = MEM_callocN(sizeof(ARegionType), "spacetype image region");
   art->regionid = RGN_TYPE_UI;
   art->prefsizex = UI_SIDEBAR_PANEL_WIDTH;
diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc
index 9673d5ac541..050abe266e6 100644
--- a/source/blender/editors/space_node/space_node.cc
+++ b/source/blender/editors/space_node/space_node.cc
@@ -1169,7 +1169,7 @@ void ED_spacetype_node()
 
   BLI_addhead(&st->regiontypes, art);
 
-  /* regions: listview/buttons */
+  /* regions: list-view/buttons */
   art = MEM_cnew<ARegionType>("spacetype node region");
   art->regionid = RGN_TYPE_UI;
   art->prefsizex = UI_SIDEBAR_PANEL_WIDTH;
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 86fec3c88b1..778b64194f7 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -1048,7 +1048,7 @@ void ED_spacetype_sequencer(void)
                     ED_KEYMAP_GPENCIL;
   BLI_addhead(&st->regiontypes, art);
 
-  /* Listview/buttons. */
+  /* List-view/buttons. */
   art = MEM_callocN(sizeof(ARegionType), "spacetype sequencer region");
   art->regionid = RGN_TYPE_UI;
   art->prefsizex = UI_SIDEBAR_PANEL_WIDTH * 1.3f;
diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc
index cee874fdfdf..dac1cc8f3c2 100644
--- a/source/blender/editors/space_view3d/space_view3d.cc
+++ b/source/blender/editors/space_view3d/space_view3d.cc
@@ -2150,7 +2150,7 @@ void ED_spacetype_view3d()
   art->lock = 1; /* can become flag, see BKE_spacedata_draw_locks */
   BLI_addhead(&st->regiontypes, art);
 
-  /* regions: listview/buttons */
+  /* regions: list-view/buttons */
   art = MEM_cnew<ARegionType>("spacetype view3d buttons region");
   art->regionid = RGN_TYPE_UI;
   art->prefsizex = UI_SIDEBAR_PANEL_WIDTH;
diff --git a/source/blender/editors/transform/transform_mode.c b/source/blender/editors/transform/transform_mode.c
index 1ced9904179..dc4716db668 100644
--- a/source/blender/editors/transform/transform_mode.c
+++ b/source/blender/editors/transform/transform_mode.c
@@ -375,12 +375,12 @@ static void constraintRotLim(const TransInfo *UNUSED(t), TransData *td)
           continue;
         }
 
-        /* skip incompatible spacetypes */
+        /* Skip incompatible space-types. */
         if (!ELEM(con->ownspace, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL)) {
           continue;
         }
 
-        /* only do conversion if necessary, to preserve quats and eulers */
+        /* Only do conversion if necessary, to preserve quaternion and euler rotations. */
         if (do_limit == false) {
           constraintob_from_transdata(&cob, td);
           do_limit = true;
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.cpp b/source/blender/freestyle/intern/python/BPy_Nature.cpp
index fbabcd110a3..4f15a7d144c 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
@@ -61,7 +61,7 @@ static PyNumberMethods nature_as_number = {
     /*nb_inplace_matrix_multiply*/ nullptr,
 };
 
-/*-----------------------BPy_Nature docstring ------------------------------------*/
+/*-----------------------BPy_Nature doc-string -----------------------------------*/
 
 PyDoc_STRVAR(Nature_doc,
              "Class hierarchy: int > :class:`Nature`\n"
diff --git a/source/blender/gpu/intern/gpu_index_buffer.cc b/source/blender/gpu/intern/gpu_index_buffer.cc
index c5fd6ff2206..6335af11c4b 100644
--- a/source/blender/gpu/intern/gpu_index_buffer.cc
+++ b/source/blender/gpu/intern/gpu_index_buffer.cc
@@ -318,7 +318,7 @@ void IndexBuf::init_build_on_device(uint index_len)
 
 void IndexBuf::init_subrange(IndexBuf *elem_src, uint start, uint length)
 {
-  /* We don't support nested subranges. */
+  /* We don't support nested sub-ranges. */
   BLI_assert(elem_src && elem_src->is_subrange_ == false);
   BLI_assert((length == 0) || (start + length <= elem_src->index_len_));
 
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index a1de53149ee..806c7e75200 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -21,7 +21,7 @@ extern "C" {
  * Types needed for using the image buffer.
  *
  * Imbuf is external code, slightly adapted to live in the Blender
- * context. It requires an external jpeg module, and the avi-module
+ * context. It requires an external JPEG module, and the AVI-module
  * (also external code) in order to function correctly.
  *
  * This file contains types and some constants that go with them. Most
diff --git a/source/blender/imbuf/intern/anim_movie.cc b/source/blender/imbuf/intern/anim_movie.cc
index 34d2564452c..89341f7635d 100644
--- a/source/blender/imbuf/intern/anim_movie.cc
+++ b/source/blender/imbuf/intern/anim_movie.cc
@@ -766,7 +766,7 @@ static int startffmpeg(struct anim *anim)
     return -1;
   }
 
-  /* Try do detect if input has 0-255 YCbCR range (JFIF Jpeg MotionJpeg) */
+  /* Try do detect if input has 0-255 YCbCR range (JFIF, JPEG, Motion-JPEG). */
   if (!sws_getColorspaceDetails(anim->img_convert_ctx,
                                 (int **)&inv_table,
                                 &srcRange,
diff --git a/source/blender/imbuf/intern/jp2.cc b/source/blender/imbuf/intern/jp2.cc
index 1d23e33cdd5..8bd58f5eb9c 100644
--- a/source/blender/imbuf/intern/jp2.cc
+++ b/source/blender/imbuf/intern/jp2.cc
@@ -1206,7 +1206,7 @@ bool imb_save_jp2_stream(struct ImBuf *ibuf, opj_stream_t *stream, int /*flags*/
 
   /* compression ratio */
   /* invert range, from 10-100, 100-1
-   * Where jpeg see's 1 and highest quality (lossless) and 100 is very low quality. */
+   * Where JPEG see's 1 and highest quality (lossless) and 100 is very low quality. */
   parameters.tcp_rates[0] = ((100 - quality) / 90.0f * 99.0f) + 1;
 
   parameters.tcp_numlayers = 1; /* only one resolution */
diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp
index 41fc987aa07..9e2e0030ce4 100644
--- a/source/blender/io/collada/GeometryExporter.cpp
+++ b/source/blender/io/collada/GeometryExporter.cpp
@@ -344,7 +344,7 @@ void GeometryExporter::create_mesh_primitive_list(short material_index,
   Material *ma = ob->totcol ? BKE_object_material_get(ob, material_index + 1) : nullptr;
   COLLADASW::PrimitivesBase *primitive_list = create_primitive_list(is_triangulated, mSW);
 
-  /* sets count attribute in <polylist> */
+  /* sets count attribute in `<polylist>`. */
   primitive_list->setCount(polygon_count);
 
   /* sets material name */
diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp
index 18770718e9a..da0f64f8855 100644
--- a/source/blender/io/collada/MeshImporter.cpp
+++ b/source/blender/io/collada/MeshImporter.cpp
@@ -281,7 +281,7 @@ bool MeshImporter::is_nice_mesh(COLLADAFW::Mesh *mesh)
 
     const char *type_str = bc_primTypeToStr(type);
 
-    /* OpenCollada passes POLYGONS type for <polylist> */
+    /* OpenCollada passes POLYGONS type for `<polylist>`. */
     if (ELEM(type, COLLADAFW::MeshPrimitive::POLYLIST, COLLADAFW::MeshPrimitive::POLYGONS)) {
 
       COLLADAFW::Polygons *mpvc = (COLLADAFW::Polygons *)mp;
@@ -636,7 +636,7 @@ void MeshImporter::read_polys(COLLADAFW::Mesh *collada_mesh,
 
     int collada_meshtype = mp->getPrimitiveType();
 
-    /* since we cannot set poly->mat_nr here, we store a portion of me->mpoly in Primitive */
+    /* Since we cannot set `poly->mat_nr` here, we store a portion of `me->mpoly` in Primitive. */
     Primitive prim = {poly_index, &material_indices[poly_index], 0};
 
     /* If MeshPrimitive is TRIANGLE_FANS we split it into triangles
diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h
index c10997637e0..cadcd44bf1d 100644
--- a/source/blender/io/collada/MeshImporter.h
+++ b/source/blender/io/collada/MeshImporter.h
@@ -79,7 +79,7 @@ class MeshImporter : public MeshImporterBase {
 
   /* this structure is used to assign material indices to polygons
    * it holds a portion of Mesh faces and corresponds to a DAE primitive list
-   * (<triangles>, <polylist>, etc.) */
+   * (`<triangles>`, `<polylist>`, etc.) */
   struct Primitive {
     int poly_index;
     int *material_indices;
@@ -110,7 +110,10 @@ class MeshImporter : public MeshImporterBase {
   void print_index_list(COLLADAFW::IndexList &index_list);
 #endif
 
-  /** Checks if mesh has supported primitive types: lines, polylist, triangles, triangle_fans. */
+  /**
+   * Checks if mesh has supported primitive types:
+   * `lines`, `polylist`, `triangles`, `triangle_fans`.
+   */
   bool is_nice_mesh(COLLADAFW::Mesh *mesh);
 
   void read_vertices(COLLADAFW::Mesh *mesh, Mesh *me);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a8697a10c9b..b919f22039b 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -143,7 +143,7 @@ typedef enum {
   eModifierFlag_Active = (1 << 2),
   /**
    * Only set on modifiers in evaluated objects. The flag indicates that the user modified inputs
-   * to the modifer which might invalidate simulation caches.
+   * to the modifier which might invalidate simulation caches.
    */
   eModifierFlag_UserModified = (1 << 3),
 } ModifierFlag;
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index e36eeefb0a0..cbf6d40e914 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -56,7 +56,7 @@ typedef struct bActionStrip {
   float actstart, actend;
   /** Offset within action, for cycles and striding. */
   float actoffs;
-  /** The stridelength (considered when flag & ACT_USESTRIDE). */
+  /** The stride-length (considered when flag & ACT_USESTRIDE). */
   float stridelen;
   /** The number of times to repeat the action range. */
   float repeat;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index c33a31cfa90..e7d06f0b706 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -260,9 +260,9 @@ typedef struct Object {
 
   short type; /* #ObjectType */
   short partype;
-  /** Can be vertexnrs. */
+  /** Can be vertex indices. */
   int par1, par2, par3;
-  /** String describing subobject info, MAX_ID_NAME-2. */
+  /** String describing sub-object info, `MAX_ID_NAME - 2`. */
   char parsubstr[64];
   struct Object *parent, *track;
   /* Proxy pointer are deprecated, only kept for conversion to liboverrides. */
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 445d75406f1..7dbae742c00 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -437,7 +437,7 @@ enum {
   /* REACTOR type currently unused */
   /* PART_REACTOR = 1, */
   PART_HAIR = 2,
-  PART_FLUID = 3, /* deprecated (belonged to elbeem) */
+  PART_FLUID = 3, /* Deprecated (belonged to ELBEEM). */
   PART_FLUID_FLIP = 4,
   PART_FLUID_SPRAY = 5,
   PART_FLUID_BUBBLE = 6,
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index a7112df12c0..75f82b43805 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -187,9 +187,9 @@ typedef struct Sequence {
   float _pad1;
 
   short anim_preseek; /* UNUSED. */
-  /** Streamindex for movie or sound files with several streams. */
+  /** Stream-index for movie or sound files with several streams. */
   short streamindex;
-  /** For multicam source selection. */
+  /** For multi-camera source selection. */
   int multicam_source;
   /** MOVIECLIP render flags. */
   int clip_flag;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index c1e1f27c96d..f41649fa378 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -187,11 +187,12 @@ typedef struct Tex {
 
   float cropxmin, cropymin, cropxmax, cropymax;
   int texfilter;
-  int afmax; /* anisotropic filter maximum value, ewa -> max eccentricity, feline -> max probes */
+  /** Anisotropic filter maximum value, EWA -> max eccentricity, feline -> max probes. */
+  int afmax;
   short xrepeat, yrepeat;
   short extend;
 
-  /* variables disabled, moved to struct iuser */
+  /* Variables only used for versioning, moved to struct member `iuser`. */
   short _pad0;
   int len DNA_DEPRECATED;
   int frames DNA_DEPRECATED;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 28ca691f969..e01eceddec3 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -253,7 +253,7 @@ typedef struct ThemeSpace {
   unsigned char button_text[4];
   unsigned char button_text_hi[4];
 
-  /* listview regions */
+  /* List-view regions. */
   /** Region background. */
   unsigned char list[4];
   /** Panel title. */
@@ -489,7 +489,7 @@ typedef struct bTheme {
   ThemeUI tui;
 
   /**
-   * Individual Spacetypes:
+   * Individual Space-types:
    * \note Ensure #UI_THEMESPACE_END is updated when adding.
    */
   ThemeSpace space_properties;
diff --git a/source/blender/makesdna/DNA_view2d_types.h b/source/blender/makesdna/DNA_view2d_types.h
index 7e53c1e4d37..1cef9ef6547 100644
--- a/source/blender/makesdna/DNA_view2d_types.h
+++ b/source/blender/makesdna/DNA_view2d_types.h
@@ -48,8 +48,10 @@ typedef struct View2D {
 
   /** Storage of current winx/winy values, set in UI_view2d_size_update. */
   short winx, winy;
-  /** Storage of previous winx/winy values encountered by UI_view2d_curRect_validate(),
-   * for keepaspect. */
+  /**
+   * Storage of previous winx/winy values encountered by #UI_view2d_curRect_validate(),
+   * for keep-aspect.
+   */
   short oldwinx, oldwiny;
 
   /** Pivot point for transforms (rotate and scale). */
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 568eea48ec1..94d423bf654 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -286,11 +286,11 @@ typedef enum PropertyFlag {
 
   /** This is an IDProperty, not a DNA one. */
   PROP_IDPROPERTY = (1 << 10),
-  /** For dynamic arrays, and retvals of type string. */
+  /** For dynamic arrays & return values of type string. */
   PROP_DYNAMIC = (1 << 17),
   /** For enum that shouldn't be contextual */
   PROP_ENUM_NO_CONTEXT = (1 << 24),
-  /** For enums not to be translated (e.g. viewlayers' names in nodes). */
+  /** For enums not to be translated (e.g. view-layers' names in nodes). */
   PROP_ENUM_NO_TRANSLATE = (1 << 29),
 
   /**
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 607176f418a..9771c701a8b 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -1567,7 +1567,7 @@ static void rna_def_ID_materials(BlenderRNA *brna)
   FunctionRNA *func;
   PropertyRNA *parm;
 
-  /* for mesh/mball/curve materials */
+  /* For mesh/meta-ball/curve materials. */
   srna = RNA_def_struct(brna, "IDMaterials", NULL);
   RNA_def_struct_sdna(srna, "ID");
   RNA_def_struct_ui_text(srna, "ID Materials", "Collection of materials");
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 1e7c3afdb71..4024e376106 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1147,7 +1147,7 @@ static void rna_Object_active_material_set(PointerRNA *ptr,
   BKE_object_material_assign(G_MAIN, ob, value.data, ob->actcol, BKE_MAT_ASSIGN_EXISTING);
 
   if (ob->type == OB_GPENCIL_LEGACY) {
-    /* notifying material property in topbar */
+    /* Notifying material property in top-bar. */
     WM_main_add_notifier(NC_SPACE | ND_SPACE_VIEW3D, NULL);
   }
 }
diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py
index eaab2409a23..be842b9b73c 100755
--- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py
+++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py
@@ -103,7 +103,7 @@ def check_if_changed(a, b):
 
 def get_props_from_txt(input_filename):
     """
-    If the file is *.txt, the script assumes it is formatted as outlined in this script docstring
+    If the file is *.txt, the script assumes it is formatted as outlined in this script doc-string.
     """
 
     file = open(input_filename, 'r')
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
index 29f4c78a052..f64b47af4fc 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
@@ -1446,7 +1446,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
             if (smd->nonmanifold_offset_mode == MOD_SOLIDIFY_NONMANIFOLD_OFFSET_MODE_CONSTRAINTS) {
               NewEdgeRef *first_edge = nullptr;
               NewEdgeRef **edge_ptr = g->edges;
-              /* Contains normal and offset [nx, ny, nz, ofs]. */
+              /* Contains normal and offset `[nx, ny, nz, ofs]`. */
               float(*planes_queue)[4] = static_cast<float(*)[4]>(
                   MEM_malloc_arrayN(g->edges_len + 1, sizeof(*planes_queue), __func__));
               uint queue_index = 0;
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc
index ac09aa22568..d20ecbaf473 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.cc
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc
@@ -507,8 +507,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
 
   /* Right now:
    * If weight = 50 then all faces are given equal weight.
-   * If weight > 50 then more weight given to faces with larger vals (face area / corner angle).
-   * If weight < 50 then more weight given to faces with lesser vals. However current calculation
+   * If weight > 50 then more weight given to faces with larger values (face area / corner angle).
+   * If weight < 50 then more weight given to faces with lesser values. However current calculation
    * does not converge to min/max.
    */
   float weight = float(wnmd->weight) / 50.0f;
diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc
index c12dd2b5be9..69244eaef34 100644
--- a/source/blender/nodes/shader/node_shader_tree.cc
+++ b/source/blender/nodes/shader/node_shader_tree.cc
@@ -820,7 +820,7 @@ static void ntree_shader_weight_tree_invert(bNodeTree *ntree, bNode *output_node
   /* Recreate links between copied nodes. */
   LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
     if (node->runtime->tmp_flag >= 0) {
-      /* Naming can be confusing here. We use original nodelink name for from/to prefix.
+      /* Naming can be confusing here. We use original node-link name for from/to prefix.
        * The final link is in reversed order. */
       int socket_index;
       LISTBASE_FOREACH_INDEX (bNodeSocket *, sock, &node->inputs, socket_index) {
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index e0dc9402e26..9c1b4adc26f 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -940,7 +940,7 @@ PyObject *PyC_ExceptionBuffer(void)
   PySys_SetObject("stdout", stdout_backup);
   PySys_SetObject("stderr", stderr_backup);
 
-  Py_DECREF(stdout_backup); /* now sys owns the ref again */
+  Py_DECREF(stdout_backup); /* Now `sys` owns the reference again. */
   Py_DECREF(stderr_backup);
 
   Py_DECREF(string_io_mod);
@@ -1096,7 +1096,7 @@ PyObject *PyC_DefaultNameSpace(const char *filename)
   PyObject *builtins = PyEval_GetBuiltins();
   PyObject *mod_main = PyModule_New("__main__");
   PyDict_SetItemString(modules, "__main__", mod_main);
-  Py_DECREF(mod_main); /* sys.modules owns now */
+  Py_DECREF(mod_main); /* `sys.modules` owns now. */
   PyModule_AddStringConstant(mod_main, "__name__", "__main__");
   if (filename) {
     /* __file__ mainly for nice UI'ness
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index 08d0a97db95..692f4be9ff0 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -555,8 +555,8 @@ PyObject *BPY_app_struct(void)
   /* prevent user from creating new instances */
   BlenderAppType.tp_init = NULL;
   BlenderAppType.tp_new = NULL;
-  BlenderAppType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppType.tp_hash = (hashfunc)_Py_HashPointer;
 
   /* Kind of a hack on top of #PyStructSequence. */
   py_struct_seq_getset_init();
diff --git a/source/blender/python/intern/bpy_app_alembic.c b/source/blender/python/intern/bpy_app_alembic.c
index 2727691d5a4..7b6a4fff7df 100644
--- a/source/blender/python/intern/bpy_app_alembic.c
+++ b/source/blender/python/intern/bpy_app_alembic.c
@@ -83,8 +83,8 @@ PyObject *BPY_app_alembic_struct(void)
   /* prevent user from creating new instances */
   BlenderAppABCType.tp_init = NULL;
   BlenderAppABCType.tp_new = NULL;
-  BlenderAppABCType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppABCType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c
index e6aeb7a6628..594ba1edd20 100644
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@ -346,8 +346,8 @@ PyObject *BPY_app_build_options_struct(void)
   /* prevent user from creating new instances */
   BlenderAppBuildOptionsType.tp_init = NULL;
   BlenderAppBuildOptionsType.tp_new = NULL;
-  BlenderAppBuildOptionsType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppBuildOptionsType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_ffmpeg.c b/source/blender/python/intern/bpy_app_ffmpeg.c
index 10170d5439b..9a3cf34fea1 100644
--- a/source/blender/python/intern/bpy_app_ffmpeg.c
+++ b/source/blender/python/intern/bpy_app_ffmpeg.c
@@ -125,8 +125,8 @@ PyObject *BPY_app_ffmpeg_struct(void)
   /* prevent user from creating new instances */
   BlenderAppFFmpegType.tp_init = NULL;
   BlenderAppFFmpegType.tp_new = NULL;
-  BlenderAppFFmpegType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppFFmpegType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c
index 17ee3a762e5..78ab2fbb703 100644
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -255,8 +255,8 @@ PyObject *BPY_app_handlers_struct(void)
   /* prevent user from creating new instances */
   BlenderAppCbType.tp_init = NULL;
   BlenderAppCbType.tp_new = NULL;
-  BlenderAppCbType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppCbType.tp_hash = (hashfunc)_Py_HashPointer;
 
   /* assign the C callbacks */
   if (ret) {
diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c
index 0cea91908c0..152eb3edd08 100644
--- a/source/blender/python/intern/bpy_app_ocio.c
+++ b/source/blender/python/intern/bpy_app_ocio.c
@@ -89,8 +89,8 @@ PyObject *BPY_app_ocio_struct(void)
   /* prevent user from creating new instances */
   BlenderAppOCIOType.tp_init = NULL;
   BlenderAppOCIOType.tp_new = NULL;
-  BlenderAppOCIOType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppOCIOType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_oiio.c b/source/blender/python/intern/bpy_app_oiio.c
index 9a2a6639e18..32a96a73eb0 100644
--- a/source/blender/python/intern/bpy_app_oiio.c
+++ b/source/blender/python/intern/bpy_app_oiio.c
@@ -71,8 +71,8 @@ PyObject *BPY_app_oiio_struct(void)
   /* prevent user from creating new instances */
   BlenderAppOIIOType.tp_init = NULL;
   BlenderAppOIIOType.tp_new = NULL;
-  BlenderAppOIIOType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppOIIOType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_opensubdiv.c b/source/blender/python/intern/bpy_app_opensubdiv.c
index 5ffa23789e7..0e28811cf1b 100644
--- a/source/blender/python/intern/bpy_app_opensubdiv.c
+++ b/source/blender/python/intern/bpy_app_opensubdiv.c
@@ -82,7 +82,7 @@ PyObject *BPY_app_opensubdiv_struct(void)
   /* prevent user from creating new instances */
   BlenderAppOpenSubdivType.tp_init = NULL;
   BlenderAppOpenSubdivType.tp_new = NULL;
-  /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
   BlenderAppOpenSubdivType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
diff --git a/source/blender/python/intern/bpy_app_openvdb.c b/source/blender/python/intern/bpy_app_openvdb.c
index b2867d76091..d50fa9c2793 100644
--- a/source/blender/python/intern/bpy_app_openvdb.c
+++ b/source/blender/python/intern/bpy_app_openvdb.c
@@ -87,8 +87,8 @@ PyObject *BPY_app_openvdb_struct(void)
   /* prevent user from creating new instances */
   BlenderAppOVDBType.tp_init = NULL;
   BlenderAppOVDBType.tp_new = NULL;
-  BlenderAppOVDBType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppOVDBType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_sdl.c b/source/blender/python/intern/bpy_app_sdl.c
index 6f13058b8e1..92468603fca 100644
--- a/source/blender/python/intern/bpy_app_sdl.c
+++ b/source/blender/python/intern/bpy_app_sdl.c
@@ -122,8 +122,8 @@ PyObject *BPY_app_sdl_struct(void)
   /* prevent user from creating new instances */
   BlenderAppSDLType.tp_init = NULL;
   BlenderAppSDLType.tp_new = NULL;
-  BlenderAppSDLType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppSDLType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c
index 782a2a3de09..445d1f69fb7 100644
--- a/source/blender/python/intern/bpy_app_translations.c
+++ b/source/blender/python/intern/bpy_app_translations.c
@@ -859,7 +859,7 @@ PyObject *BPY_app_translations_struct(void)
 
   /* prevent user from creating new instances */
   BlenderAppTranslationsType.tp_new = NULL;
-  /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
   BlenderAppTranslationsType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
diff --git a/source/blender/python/intern/bpy_app_usd.c b/source/blender/python/intern/bpy_app_usd.c
index dd9a3ced23a..666f240a31d 100644
--- a/source/blender/python/intern/bpy_app_usd.c
+++ b/source/blender/python/intern/bpy_app_usd.c
@@ -84,8 +84,8 @@ PyObject *BPY_app_usd_struct(void)
   /* prevent user from creating new instances */
   BlenderAppUSDType.tp_init = NULL;
   BlenderAppUSDType.tp_new = NULL;
-  BlenderAppUSDType.tp_hash = (hashfunc)
-      _Py_HashPointer; /* without this we can't do set(sys.modules) #29635. */
+  /* Without this we can't do `set(sys.modules)` #29635. */
+  BlenderAppUSDType.tp_hash = (hashfunc)_Py_HashPointer;
 
   return ret;
 }
diff --git a/source/blender/python/intern/bpy_gizmo_wrap.c b/source/blender/python/intern/bpy_gizmo_wrap.c
index 84f90d2f3df..47ad8727e0e 100644
--- a/source/blender/python/intern/bpy_gizmo_wrap.c
+++ b/source/blender/python/intern/bpy_gizmo_wrap.c
@@ -195,7 +195,7 @@ void BPY_RNA_gizmogroup_wrapper(wmGizmoGroupType *gzgt, void *userdata)
 
   /* don't do translations here yet */
 #if 0
-  /* Use i18n context from rna_ext.srna if possible (py gizmogroups). */
+  /* Use i18n context from rna_ext.srna if possible (py gizmo-groups). */
   if (gzgt->rna_ext.srna) {
     RNA_def_struct_translation_context(gzgt->srna, RNA_struct_translation_context(gzgt->rna_ext.srna));
   }
diff --git a/source/blender/python/intern/bpy_interface_atexit.c b/source/blender/python/intern/bpy_interface_atexit.c
index 35a26e46be2..2bc7e35e3fa 100644
--- a/source/blender/python/intern/bpy_interface_atexit.c
+++ b/source/blender/python/intern/bpy_interface_atexit.c
@@ -4,7 +4,7 @@
  * \ingroup pythonintern
  *
  * This file inserts an exit callback into Python's 'atexit' module.
- * Without this sys.exit() can crash because blender is not properly closing
+ * Without this `sys.exit()` can crash because blender is not properly closing
  * resources.
  */
 
diff --git a/source/blender/python/intern/bpy_rna_array.c b/source/blender/python/intern/bpy_rna_array.c
index d86e8de750c..d74de8bb178 100644
--- a/source/blender/python/intern/bpy_rna_array.c
+++ b/source/blender/python/intern/bpy_rna_array.c
@@ -567,7 +567,7 @@ static int py_to_array(PyObject *seq,
      * python data, the check here is mainly for completeness. */
     if (copy_values(seq, ptr, prop, 0, data, item_size, NULL, convert_item, NULL) != NULL) {
       if (param_data == NULL) {
-        /* NULL can only pass through in case RNA property arraylength is 0 (impossible?) */
+        /* NULL can only pass through in case RNA property array-length is 0 (impossible?) */
         rna_set_array(ptr, prop, data);
         PyMem_FREE(data);
       }
diff --git a/source/blender/python/rna_dump.py b/source/blender/python/rna_dump.py
index 48c0819eb9b..c203a096649 100644
--- a/source/blender/python/rna_dump.py
+++ b/source/blender/python/rna_dump.py
@@ -123,8 +123,4 @@ for d in dir(bpy.types):
         seek(r, 'bpy.types.' + d + '.bl_rna', 0)
 '''
 
-# print dir(bpy)
-# import sys
-# sys.exit()
-
 print("iter over ", seek_count, "rna items")
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index f2a351cb64b..dec86dc8a02 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -108,7 +108,7 @@ typedef struct RenderLayer {
 
   int rectx, recty;
 
-  /** Optional saved endresult on disk. */
+  /** Optional saved end-result on disk. */
   void *exrhandle;
 
   ListBase passes;
diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 965a6836d20..b1c4566e07f 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -916,7 +916,7 @@ static void do_sub_effect(const SeqRenderData *context,
 /** \name Drop Effect
  * \{ */
 
-/* Must be > 0 or add precopy, etc to the function */
+/* Must be > 0 or add pre-copy, etc to the function. */
 #define XOFF 8
 #define YOFF 8
 
@@ -1980,7 +1980,7 @@ static void RVBlurBitmap2_float(float *map, int width, int height, float blur, i
     return;
   }
 
-  /* Allocate memory for the tempmap and the blur filter matrix */
+  /* Allocate memory for the temp-map and the blur filter matrix. */
   temp = MEM_mallocN(sizeof(float[4]) * width * height, "blurbitmaptemp");
   if (!temp) {
     return;
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index 25e45dcf083..c0c6597cc9f 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -88,7 +88,7 @@ SequencerDrawView sequencer_view3d_fn = NULL; /* NULL in background mode */
 void seq_imbuf_assign_spaces(Scene *scene, ImBuf *ibuf)
 {
 #if 0
-  /* Bute buffer is supposed to be in sequencer working space already. */
+  /* Byte buffer is supposed to be in sequencer working space already. */
   if (ibuf->rect != NULL) {
     IMB_colormanagement_assign_rect_colorspace(ibuf, scene->sequencer_colorspace_settings.name);
   }
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
index 2f60ebc761b..5a71017213b 100644
--- a/source/blender/sequencer/intern/sequencer.c
+++ b/source/blender/sequencer/intern/sequencer.c
@@ -568,12 +568,12 @@ static Sequence *seq_dupli(const Scene *scene_src,
     BLI_assert_unreachable();
   }
 
-  /* When using SEQ_DUPE_UNIQUE_NAME, it is mandatory to add new sequences in relevant container
+  /* When using #SEQ_DUPE_UNIQUE_NAME, it is mandatory to add new sequences in relevant container
    * (scene or meta's one), *before* checking for unique names. Otherwise the meta's list is empty
-   * and hence we miss all seqs in that meta that have already been duplicated (see #55668).
-   * Note that unique name check itself could be done at a later step in calling code, once all
-   * seqs have bee duplicated (that was first, simpler solution), but then handling of animation
-   * data will be broken (see #60194). */
+   * and hence we miss all sequence-strips in that meta that have already been duplicated,
+   * (see #55668). Note that unique name check itself could be done at a later step in calling
+   * code, once all sequence-strips have bee duplicated (that was first, simpler solution),
+   * but then handling of animation data will be broken (see #60194). */
   if (new_seq_list != NULL) {
     BLI_addtail(new_seq_list, seqn);
   }
diff --git a/source/blender/simulation/intern/implicit_blender.c b/source/blender/simulation/intern/implicit_blender.c
index 89bef63c641..244ceee4906 100644
--- a/source/blender/simulation/intern/implicit_blender.c
+++ b/source/blender/simulation/intern/implicit_blender.c
@@ -598,7 +598,7 @@ DO_INLINE void mul_bfmatrix_lfvector(float (*to)[3], fmatrix3x3 *from, lfVector
     {
       for (uint i = from[0].vcount; i < from[0].vcount + from[0].scount; i++) {
         /* This is the lower triangle of the sparse matrix,
-         * therefore multiplication occurs with transposed submatrices. */
+         * therefore multiplication occurs with transposed sub-matrices. */
         muladd_fmatrixT_fvector(to[from[i].c], from[i].m, fLongVector[from[i].r]);
       }
     }
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 89aac71e66a..1744dce35d8 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -563,7 +563,7 @@ typedef struct wmGesture {
   /** optional, maximum amount of points stored. */
   int points_alloc;
   int modal_state;
-  /** optional, draw the active side of the straightline gesture. */
+  /** Optional, draw the active side of the straight-line gesture. */
   bool draw_active_side;
 
   /**
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index 4a1df74f3a0..27e74f5760d 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -218,7 +218,7 @@ struct wmGizmoGroupType *WM_gizmogrouptype_append_ptr(void (*wtfunc)(struct wmGi
 void WM_gizmogrouptype_iter(struct GHashIterator *ghi);
 
 /**
- * Append and insert into a gizmo typemap.
+ * Append and insert into a gizmo type-map.
  * This is most common for C gizmos which are enabled by default.
  */
 struct wmGizmoGroupTypeRef *WM_gizmogrouptype_append_and_link(
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 1d454fd980c..d69547d2c7f 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -675,15 +675,14 @@ static void wm_draw_region_buffer_create(ARegion *region, bool stereo, bool use_
 
   if (!region->draw_buffer) {
     if (use_viewport) {
-      /* Allocate viewport which includes an offscreen buffer with depth
-       * multisample, etc. */
+      /* Allocate viewport which includes an off-screen buffer with depth multi-sample, etc. */
       region->draw_buffer = MEM_callocN(sizeof(wmDrawBuffer), "wmDrawBuffer");
       region->draw_buffer->viewport = stereo ? GPU_viewport_stereo_create() :
                                                GPU_viewport_create();
     }
     else {
-      /* Allocate offscreen buffer if it does not exist. This one has no
-       * depth or multisample buffers. 3D view creates own buffers with
+      /* Allocate off-screen buffer if it does not exist. This one has no
+       * depth or multi-sample buffers. 3D view creates own buffers with
        * the data it needs. */
       GPUOffScreen *offscreen = GPU_offscreen_create(
           region->winx, region->winy, false, GPU_RGBA8, GPU_TEXTURE_USAGE_SHADER_READ, NULL);
diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.c b/source/blender/windowmanager/intern/wm_keymap_utils.c
index 5e4ebeedd62..62ac7527460 100644
--- a/source/blender/windowmanager/intern/wm_keymap_utils.c
+++ b/source/blender/windowmanager/intern/wm_keymap_utils.c
@@ -280,7 +280,7 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname)
   else if (STRPREFIX(opname, "MBALL_OT")) {
     km = WM_keymap_find_all(wm, "Metaball", 0, 0);
 
-    /* some mball operators are active in object mode too, like add-prim */
+    /* Some meta-ball operators are active in object mode too, like add-primitive. */
     if (km && !WM_keymap_poll((bContext *)C, km)) {
       km = WM_keymap_find_all(wm, "Object Mode", 0, 0);
     }
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0fb8d2c5a86..cd91af5643c 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -3832,7 +3832,7 @@ void wm_operatortypes_register(void)
   WM_operatortype_append(GIZMOGROUP_OT_gizmo_tweak);
 }
 
-/* circleselect-like modal operators */
+/* Circle-select-like modal operators. */
 static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
 {
   static const EnumPropertyItem modal_items[] = {
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index f249cac104c..911dd349e98 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -277,7 +277,7 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op)
   if (prev_display_mode == S3D_DISPLAY_PAGEFLIP &&
       prev_display_mode != win_src->stereo3d_format->display_mode)
   {
-    /* in case the hardware supports pageflip but not the display */
+    /* In case the hardware supports page-flip but not the display. */
     if ((win_dst = wm_window_copy_test(C, win_src, false, false))) {
       /* pass */
     }
@@ -292,13 +292,13 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op)
   else if (win_src->stereo3d_format->display_mode == S3D_DISPLAY_PAGEFLIP) {
     const bScreen *screen = WM_window_get_active_screen(win_src);
 
-    /* ED_workspace_layout_duplicate() can't handle other cases yet #44688 */
+    /* #ED_workspace_layout_duplicate() can't handle other cases yet #44688 */
     if (screen->state != SCREENNORMAL) {
       BKE_report(
           op->reports, RPT_ERROR, "Failed to switch to Time Sequential mode when in fullscreen");
       ok = false;
     }
-    /* pageflip requires a new window to be created with the proper OS flags */
+    /* Page-flip requires a new window to be created with the proper OS flags. */
     else if ((win_dst = wm_window_copy_test(C, win_src, false, false))) {
       if (GPU_stereo_quadbuffer_support()) {
         BKE_report(op->reports, RPT_INFO, "Quad-buffer window successfully created");
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 6eb362a97e2..7ef28c6f52f 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -793,14 +793,14 @@ static void wm_window_ghostwindow_ensure(wmWindowManager *wm, wmWindow *win, boo
   keymap = WM_keymap_ensure(wm->defaultconf, "Screen Editing", 0, 0);
   WM_event_add_keymap_handler(&win->modalhandlers, keymap);
 
-  /* add drop boxes */
+  /* Add drop boxes. */
   {
     ListBase *lb = WM_dropboxmap_find("Window", 0, 0);
     WM_event_add_dropbox_handler(&win->handlers, lb);
   }
   wm_window_title(wm, win);
 
-  /* add topbar */
+  /* Add top-bar. */
   ED_screen_global_areas_refresh(win);
 }
 
diff --git a/tools/check_source/check_spelling_c_config.py b/tools/check_source/check_spelling_c_config.py
index 33924399d3c..39baaae0af7 100644
--- a/tools/check_source/check_spelling_c_config.py
+++ b/tools/check_source/check_spelling_c_config.py
@@ -179,6 +179,7 @@ dict_custom = {
     "monospaced",
     "mutators",
     "natively",
+    "nullable",
     "occludee",
     "occluder",
     "occluders",
@@ -249,6 +250,7 @@ dict_custom = {
     "rasterizes",
     "rasterizing",
     "reallocations",
+    "realtime",
     "rebalancing",
     "rebase",
     "recomputation",
@@ -434,6 +436,7 @@ dict_custom = {
     "volumetrics",
     "vortices",
     "voxelize",
+    "workspaces",
     "writeable",
     "zoomable",
 
@@ -455,6 +458,7 @@ dict_custom = {
     "addon",
     "addons",
     "autocomplete",
+    "bitmask",
     "codegen",
     "colospace",
     "datablock",