diff --git a/include/mbedtls/chacha20.h b/include/mbedtls/chacha20.h
index 1c6cde0..2ae5e6e 100644
--- a/include/mbedtls/chacha20.h
+++ b/include/mbedtls/chacha20.h
@@ -88,9 +88,10 @@
 void mbedtls_chacha20_init( mbedtls_chacha20_context *ctx );
 
 /**
- * \brief           This function releases and clears the specified ChaCha20 context.
+ * \brief           This function releases and clears the specified
+ *                  ChaCha20 context.
  *
- * \param ctx       The ChaCha20 context to clear. May be \c NULL,
+ * \param ctx       The ChaCha20 context to clear. This may be \c NULL,
  *                  in which case this function is a no-op. If it is not
  *                  \c NULL, it must point to an initialized context.
  *
@@ -107,7 +108,8 @@
  *
  * \param ctx       The ChaCha20 context to which the key should be bound.
  *                  It must be initialized.
- * \param key       The encryption/decryption key. Must be 32 bytes in length.
+ * \param key       The encryption/decryption key. This must be \c 32 Bytes
+ *                  in length.
  *
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA if ctx or key is NULL.
@@ -127,8 +129,8 @@
  *
  * \param ctx       The ChaCha20 context to which the nonce should be bound.
  *                  It must be initialized and bound to a key.
- * \param nonce     The nonce. Must be 12 bytes in size.
- * \param counter   The initial counter value. This is usually 0.
+ * \param nonce     The nonce. This must be \c 12 Bytes in size.
+ * \param counter   The initial counter value. This is usually \c 0.
  *
  * \return          \c 0 on success.
  * \return          #MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA if ctx or nonce is
@@ -157,11 +159,11 @@
  *
  * \param ctx       The ChaCha20 context to use for encryption or decryption.
  *                  It must be initialized and bound to a key and nonce.
- * \param size      The length of the input data in bytes.
+ * \param size      The length of the input data in Bytes.
  * \param input     The buffer holding the input data.
  *                  This pointer can be \c NULL if `size == 0`.
  * \param output    The buffer holding the output data.
- *                  Must be able to hold \p size bytes.
+ *                  This must be able to hold \p size Bytes.
  *                  This pointer can be \c NULL if `size == 0`.
  *
  * \return          \c 0 on success.
@@ -186,14 +188,15 @@
  * \note            The \p input and \p output pointers must either be equal or
  *                  point to non-overlapping buffers.
  *
- * \param key       The encryption/decryption key. Must be 32 bytes in length.
- * \param nonce     The nonce. Must be 12 bytes in size.
- * \param counter   The initial counter value. This is usually 0.
- * \param size      The length of the input data in bytes.
+ * \param key       The encryption/decryption key.
+ *                  This must be \c 32 Bytes in length.
+ * \param nonce     The nonce. This must be \c 12 Bytes in size.
+ * \param counter   The initial counter value. This is usually \c 0.
+ * \param size      The length of the input data in Bytes.
  * \param input     The buffer holding the input data.
  *                  This pointer can be \c NULL if `size == 0`.
  * \param output    The buffer holding the output data.
- *                  Must be able to hold \p size bytes.
+ *                  This must be able to hold \p size Bytes.
  *                  This pointer can be \c NULL if `size == 0`.
  *
  * \return          \c 0 on success.