diff --git a/docs/architecture/psa-migration/strategy.md b/docs/architecture/psa-migration/strategy.md
index a13c100..0ad5fa0 100644
--- a/docs/architecture/psa-migration/strategy.md
+++ b/docs/architecture/psa-migration/strategy.md
@@ -351,7 +351,7 @@
 - too many different ways of computing a hash (low-level, MD, PSA);
 - too many different ways to configure the library that influence which of
   these ways is available and will be used (`MBEDTLS_USE_PSA_CRYPTO`,
-`MBEDTLS_PSA_CRYPTO_CONFIG`, `mbedtls_config.h` + `psa/crypto_config.h`).
+  `MBEDTLS_PSA_CRYPTO_CONFIG`, `mbedtls_config.h` + `psa/crypto_config.h`).
 
 As a result, we need more families of dependency macros than we'd like to.
 This is a temporary situation until we move to a place where everything is
@@ -361,12 +361,12 @@
 Note: the new macros supplement but do not replace the existing macros:
 - code that always uses PSA Crypto (for example, code specific to TLS 1.3)
   should use `PSA_WANT_xxx`;
-- code that always uses the legacy API (for exmaple, crypto modules that have
+- code that always uses the legacy API (for example, crypto modules that have
   not undergone step 1 yet) should use `MBEDTLS_xxx_C`;
 - code that may use one of the two APIs, either based on
   `MBEDTLS_USE_PSA_CRYPTO` (X.509, TLS 1.2, shared between TLS 1.2 and 1.3),
-or based on availability (crypto modules after step 1), should use one of the
-new macros from `legacy_or_psa.h`.
+  or based on availability (crypto modules after step 1), should use one of
+  the new macros from `legacy_or_psa.h`.
 
 Executing step 3 will mostly consist of using the right dependency macros in
 the right places (once the previous steps are done).
diff --git a/include/mbedtls/legacy_or_psa.h b/include/mbedtls/legacy_or_psa.h
index 7480751..2156be9 100644
--- a/include/mbedtls/legacy_or_psa.h
+++ b/include/mbedtls/legacy_or_psa.h
@@ -19,7 +19,7 @@
  */
 
 /*
- * Note: applications who are targetting a specific configurations do not need
+ * Note: applications that are targeting a specific configuration do not need
  * to use these macros; instead they should directly use the functions they
  * know are available in their configuration.
  *
@@ -29,7 +29,7 @@
  *
  * Note: code that is purely based on the legacy crypto APIs (mbedtls_xxx())
  * does not need to use these macros; instead it should use the relevant
- * MBEDTLS_xxx_ macros.
+ * MBEDTLS_xxx macros.
  *
  * These macros are for code that wants to use <crypto feature> and will do so
  * using <legacy API> or PSA depending on <condition>, where: