diff --git a/components/esp_common/include/esp_err.h b/components/esp_common/include/esp_err.h
index 30789475a5..039dc5552a 100644
--- a/components/esp_common/include/esp_err.h
+++ b/components/esp_common/include/esp_err.h
@@ -79,7 +79,6 @@ const char *esp_err_to_name_r(esp_err_t code, char *buf, size_t buflen);
 /** @cond */
 void _esp_error_check_failed(esp_err_t rc, const char *file, int line, const char *function, const char *expression) __attribute__((__noreturn__));
 
-/** @cond */
 void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int line, const char *function, const char *expression);
 
 #ifndef __ASSERT_FUNC
diff --git a/components/esp_driver_i2c/include/driver/i2c_types.h b/components/esp_driver_i2c/include/driver/i2c_types.h
index 903ad1c426..346b50dcd0 100644
--- a/components/esp_driver_i2c/include/driver/i2c_types.h
+++ b/components/esp_driver_i2c/include/driver/i2c_types.h
@@ -85,7 +85,7 @@ typedef struct {
  *
  * @param[in]  i2c_slave Handle for I2C slave.
  * @param[out] evt_data I2C capture event data, fed by driver
- * @param[in]  user_ctx User data, set in `i2c_slave_register_event_callbacks()`
+ * @param[in]  arg User data, set in `i2c_slave_register_event_callbacks()`
  *
  * @return Whether a high priority task has been waken up by this function
  */
diff --git a/components/esp_wifi/include/esp_wifi_crypto_types.h b/components/esp_wifi/include/esp_wifi_crypto_types.h
index 1c7ec82a8f..6b41cc524a 100644
--- a/components/esp_wifi/include/esp_wifi_crypto_types.h
+++ b/components/esp_wifi/include/esp_wifi_crypto_types.h
@@ -134,7 +134,7 @@ typedef int (*esp_sha256_prf_t)(const unsigned char *key, int key_len, const cha
  *
  * @param key Key for HMAC operations
  * @param key_len Length of the key in bytes
- * @param dataPointers to the data area
+ * @param data Pointers to the data area
  * @param data_len Length of the data area
  * @param mac Buffer for the hash (16 bytes)
  * Returns: 0 on success, -1 on failure
@@ -327,7 +327,7 @@ typedef int (*esp_omac1_aes_128_t)(const uint8_t *key, const uint8_t *data, size
  *        Counter Mode Cipher Block Chaining Message Authentication
  *        Code Protocol) which is used in IEEE 802.11i RSN standard.
  * @param tk 128-bit Temporal Key for obtained during 4-way handshake
- * @param hdr Pointer to IEEE802.11 frame headeri needed for AAD
+ * @param ieee80211_hdr Pointer to IEEE802.11 frame headeri needed for AAD
  * @param data Pointer to encrypted data buffer
  * @param data_len Encrypted data length in bytes
  * @param decrypted_len Length of decrypted data
@@ -373,7 +373,7 @@ typedef int (*esp_aes_gmac_t)(const uint8_t *key, size_t keylen, const uint8_t *
  * @param num_elem Number of elements in the data vector
  * @param addr Pointers to the data areas
  * @param len Lengths of the data blocks
- * @param mac Buffer for the hash
+ * @param buf Buffer for the hash
  * Returns: 0 on success, -1 on failure
  */
 typedef int (*esp_sha256_vector_t)(size_t num_elem, const uint8_t *addr[], const size_t *len, uint8_t *buf);
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index eb14a403c8..0105d2a2df 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit eb14a403c863d7f2161b92efb45bbb82d0008b02
+Subproject commit 0105d2a2df2735a121bb1cd585658e59be03cf61
diff --git a/components/protocomm/include/crypto/srp6a/esp_srp.h b/components/protocomm/include/crypto/srp6a/esp_srp.h
index 23db7db35c..b02d78a5b5 100644
--- a/components/protocomm/include/crypto/srp6a/esp_srp.h
+++ b/components/protocomm/include/crypto/srp6a/esp_srp.h
@@ -13,6 +13,7 @@ extern "C" {
 #endif
 
 /**
+ * @file esp_srp.h
  * @brief SRP-6a protocol implementation
  *
  * More information on protocol can be found: https://datatracker.ietf.org/doc/html/rfc5054
@@ -98,6 +99,13 @@ typedef enum {
     ESP_NG_3072 = 0,
 } esp_ng_type_t;
 
+/**
+ * @brief esp_srp handle as the result of `esp_srp_init`
+ *
+ * The handle is returned by `esp_srp_init` on successful init. It is then
+ * passed for subsequent API calls as an argument. `esp_srp_free` can be used to
+ * clean up the handle. After `esp_srp_free` the handle becomes invalid.
+ */
 typedef struct esp_srp_handle esp_srp_handle_t;
 
 /**