diff --git a/intern/cycles/kernel/device/cpu/compat.h b/intern/cycles/kernel/device/cpu/compat.h
index bcdf3347e6d..2032db3ff42 100644
--- a/intern/cycles/kernel/device/cpu/compat.h
+++ b/intern/cycles/kernel/device/cpu/compat.h
@@ -18,9 +18,8 @@
 #include "util/texture.h"
 #include "util/types.h"
 
-/* On x86_64, versions of glibc < 2.16 have an issue where expf is
- * much slower than the double version.  This was fixed in glibc 2.16.
- */
+/* On x86_64, versions of GLIBC < 2.16 have an issue where `expf` is
+ * much slower than the double version. This was fixed in GLIBC 2.16. */
 #if !defined(__KERNEL_GPU__) && defined(__x86_64__) && defined(__x86_64__) && \
     defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
     (__GLIBC__ <= 2 && __GLIBC_MINOR__ < 16)
diff --git a/intern/cycles/util/color.h b/intern/cycles/util/color.h
index 842b186899b..d43b2a5e5bb 100644
--- a/intern/cycles/util/color.h
+++ b/intern/cycles/util/color.h
@@ -275,8 +275,8 @@ ccl_device_inline float4 improve_5throot_solution_sse2(const float4 &old_result,
 /* Calculate powf(x, 2.4). Working domain: 1e-10 < x < 1e+10 */
 ccl_device_inline float4 fastpow24_sse2(const float4 &arg)
 {
-  /* max, avg and |avg| errors were calculated in gcc without FMA instructions
-   * The final precision should be better than powf in glibc */
+  /* `max`, `avg` and |avg| errors were calculated in GCC without FMA instructions.
+   * The final precision should be better than `powf` in GLIBC. */
 
   /* Calculate x^4/5, coefficient 0.994 was constructed manually to minimize avg error */
   /* 0x3F4CCCCD = 4/5 */
diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp
index c908d547a35..1fd52186550 100644
--- a/intern/cycles/util/thread.cpp
+++ b/intern/cycles/util/thread.cpp
@@ -14,7 +14,7 @@ CCL_NAMESPACE_BEGIN
 thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)
 {
 #if defined(__APPLE__) || defined(__linux__) && !defined(__GLIBC__)
-  /* Set the stack size to 2MB to match glibc. The default 512KB on macOS is
+  /* Set the stack size to 2MB to match GLIBC. The default 512KB on macOS is
    * too small for Embree, and consistent stack size also makes things more
    * predictable in general. */
   pthread_attr_t attribute;
diff --git a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
index 5314248d44a..d8481d9c2a9 100644
--- a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
+++ b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
@@ -784,10 +784,10 @@ void layer_adjustments_to_modifiers(Main &bmain, bGPdata &src_object_data, Objec
    *
    * NOTE: NLA animation in GPData that would control adjustment properties is not converted. This
    * would require (partially) re-creating a copy of the potential bGPData NLA into the Object NLA,
-   * which is too complex for the few potential usecases.
+   * which is too complex for the few potential use cases.
    *
    * This is achieved in several steps, roughly:
-   *   * For each GP layer, chack if there is animation on the adjutment data.
+   *   * For each GP layer, check if there is animation on the adjustment data.
    *   * Rename relevant FCurves RNA paths from GP animation data, and store their reference in
    *     temporary vectors.
    *   * Once all layers have been processed, move all affected FCurves from GPData animation to
@@ -838,7 +838,7 @@ void layer_adjustments_to_modifiers(Main &bmain, bGPdata &src_object_data, Objec
     BLI_str_escape(layer_name_esc, gpl->info, sizeof(layer_name_esc));
     const std::string legacy_root_path = fmt::format("layers[\"{}\"]", layer_name_esc);
 
-    /* If tint or thickness are animated, relevamt modifiers also need to be created. */
+    /* If tint or thickness are animated, relevant modifiers also need to be created. */
     if (gpd_animdata) {
       auto adjustment_animation_detection = [&](bAction *owner_action, FCurve &fcurve) -> bool {
         /* Early out if we already know that both data are animated. */
diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc
index 21eda684ef0..947a81ad3eb 100644
--- a/source/blender/blenkernel/intern/particle_distribute.cc
+++ b/source/blender/blenkernel/intern/particle_distribute.cc
@@ -834,8 +834,8 @@ static int distribute_compare_orig_index(const void *p1, const void *p2, void *u
     return -1;
   }
   if (index1 == index2) {
-    /* this pointer comparison appears to make qsort stable for glibc,
-     * and apparently on solaris too, makes the renders reproducible */
+    /* This pointer comparison appears to make #qsort stable for GLIBC,
+     * and apparently on SOLARIS too, makes the renders reproducible. */
     if (p1 < p2) {
       return -1;
     }
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tilemap_amend_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tilemap_amend_comp.glsl
index e156cc9a0b4..a3b4fdbe802 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tilemap_amend_comp.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tilemap_amend_comp.glsl
@@ -28,7 +28,7 @@ void main()
 
   LIGHT_FOREACH_BEGIN_DIRECTIONAL (light_cull_buf, l_idx) {
     LightData light = light_buf[l_idx];
-    /* This only works on clipmaps. Cascade have already the same LOD for every tilemaps. */
+    /* This only works on clip-maps. Cascade have already the same LOD for every tile-maps. */
     if (light.type != LIGHT_SUN) {
       break;
     }
diff --git a/source/blender/editors/interface/regions/interface_region_popover.cc b/source/blender/editors/interface/regions/interface_region_popover.cc
index ab9c0baf2bf..6c5613be7f0 100644
--- a/source/blender/editors/interface/regions/interface_region_popover.cc
+++ b/source/blender/editors/interface/regions/interface_region_popover.cc
@@ -409,7 +409,7 @@ void UI_popover_end(bContext *C, uiPopover *pup, wmKeyMap *keymap)
   pup->window = window;
 
   /* TODO(@ideasman42): we may want to make this configurable.
-   * The begin/end stype of calling popups doesn't allow 'can_refresh' to be set.
+   * The begin/end type of calling popups doesn't allow 'can_refresh' to be set.
    * For now close this style of popovers when accessed. */
   UI_block_flag_disable(pup->block, UI_BLOCK_KEEP_OPEN);
 }
diff --git a/source/blender/editors/interface/regions/interface_region_popup.cc b/source/blender/editors/interface/regions/interface_region_popup.cc
index 19d9abc9f43..58bd48e3232 100644
--- a/source/blender/editors/interface/regions/interface_region_popup.cc
+++ b/source/blender/editors/interface/regions/interface_region_popup.cc
@@ -561,7 +561,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
   CTX_wm_window_set(C, win);
   ui_region_temp_remove(C, screen, handle->region);
 
-  /* Reset context (area and region were nullptr'ed when changing context window). */
+  /* Reset context (area and region were null'ed when changing context window). */
   CTX_wm_window_set(C, ctx_win);
   CTX_wm_area_set(C, ctx_area);
   CTX_wm_region_set(C, ctx_region);
diff --git a/source/blender/editors/physics/physics_intern.hh b/source/blender/editors/physics/physics_intern.hh
index c3693bd38f9..f10251c46ba 100644
--- a/source/blender/editors/physics/physics_intern.hh
+++ b/source/blender/editors/physics/physics_intern.hh
@@ -110,7 +110,7 @@ void FLUID_OT_bake_guides(wmOperatorType *ot);
 void FLUID_OT_free_guides(wmOperatorType *ot);
 void FLUID_OT_pause_bake(wmOperatorType *ot);
 
-/* dynamicpaint.cc */
+/* `dynamicpaint.cc` */
 
 void DPAINT_OT_bake(wmOperatorType *ot);
 /**
diff --git a/source/blender/editors/screen/screen_intern.hh b/source/blender/editors/screen/screen_intern.hh
index 26f4987ee86..3f43948d9d2 100644
--- a/source/blender/editors/screen/screen_intern.hh
+++ b/source/blender/editors/screen/screen_intern.hh
@@ -61,7 +61,7 @@ enum eScreenAxis {
  */
 #define BORDERPADDING ((2.0f * UI_SCALE_FAC) + U.pixelsize)
 
-/* area.cc */
+/* `area.cc` */
 
 /**
  * We swap spaces for full-screen to keep all allocated data area vertices were set.
@@ -71,7 +71,7 @@ void ED_area_data_swap(ScrArea *area_dst, ScrArea *area_src);
 /* for quick toggle, can skip fades */
 void region_toggle_hidden(bContext *C, ARegion *region, bool do_fade);
 
-/* screen_draw.cc */
+/* `screen_draw.cc` */
 
 /**
  * Visual indication of the two areas involved in a proposed join.
@@ -82,7 +82,7 @@ void region_toggle_hidden(bContext *C, ARegion *region, bool do_fade);
 void screen_draw_join_highlight(ScrArea *sa1, ScrArea *sa2);
 void screen_draw_split_preview(ScrArea *area, eScreenAxis dir_axis, float fac);
 
-/* screen_edit.cc */
+/* `screen_edit.cc` */
 
 /**
  * Empty screen, with 1 dummy area without space-data. Uses window size.
@@ -127,7 +127,7 @@ bool screen_area_close(bContext *C, bScreen *screen, ScrArea *area);
 void screen_area_spacelink_add(const Scene *scene, ScrArea *area, eSpace_Type space_type);
 AZone *ED_area_actionzone_find_xy(ScrArea *area, const int xy[2]);
 
-/* screen_geometry.cc */
+/* `screen_geometry.cc` */
 
 int screen_geom_area_height(const ScrArea *area);
 int screen_geom_area_width(const ScrArea *area);
@@ -171,7 +171,7 @@ short screen_geom_find_area_split_point(const ScrArea *area,
  */
 void screen_geom_select_connected_edge(const wmWindow *win, ScrEdge *edge);
 
-/* screen_context.cc */
+/* `screen_context.cc` */
 
 /**
  * Entry point for the screen context.
@@ -180,11 +180,11 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
 
 extern "C" const char *screen_context_dir[]; /* doc access */
 
-/* screendump.cc */
+/* `screendump.cc` */
 
 void SCREEN_OT_screenshot(wmOperatorType *ot);
 void SCREEN_OT_screenshot_area(wmOperatorType *ot);
 
-/* workspace_layout_edit.cc */
+/* `workspace_layout_edit.cc` */
 
 bool workspace_layout_set_poll(const WorkSpaceLayout *layout);
diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc
index 51dca6af32b..d59d9303003 100644
--- a/source/blender/makesrna/intern/rna_access.cc
+++ b/source/blender/makesrna/intern/rna_access.cc
@@ -1795,7 +1795,7 @@ void RNA_property_enum_items_gettexted_all(bContext *C,
         int i_fixed;
 
         /* Items that do not exist on list are returned,
-         * but have their names/identifiers nullptr'ed out. */
+         * but have their names/identifiers null'ed out. */
         for (i_fixed = 0; item[i_fixed].identifier; i_fixed++) {
           if (STREQ(item[i_fixed].identifier, item_array[i].identifier)) {
             exists = true;