docs: Fix typos and some wrong expressions in Eina API reference doxygen.

Summary: I had fixed some typos and some wrong expressions, such as capital letters, singular, and orders of groups in Eina API reference doxygen.

Test Plan: Doxygen Revision

Reviewers: stefan, cedric, raster, Jaehyun_Cho, jpeg

Reviewed By: jpeg

Subscribers: conr2d

Differential Revision: https://phab.enlightenment.org/D4674

55 files changed, 1440 insertions, 1535 deletions

diff --git a/src/lib/eina/Eina.h b/src/lib/eina/Eina.h
index 6a99b4fe68..41c182842b 100644
--- a/src/lib/eina/Eina.h
+++ b/src/lib/eina/Eina.h
@@ -197,9 +197,9 @@
  * should return properly populated @ref _Eina_Iterator and @ref _Eina_Accessor.
  *
  * @defgroup Eina_Tools_Group Tools
+ * @ingroup Eina
  * @brief Eina tools aims to help application development, providing ways to
  *        make it safer, log errors, manage memory more efficiently and more.
- * @ingroup Eina
  */
 
 #ifdef _WIN32
diff --git a/src/lib/eina/eina_accessor.h b/src/lib/eina/eina_accessor.h
index 38eff89b19..aed6d9d307 100644
--- a/src/lib/eina/eina_accessor.h
+++ b/src/lib/eina/eina_accessor.h
@@ -138,7 +138,7 @@ typedef Eina_Bool (*Eina_Accessor_Lock_Callback)(Eina_Accessor *it);
 
 /**
  * @typedef Eina_Accessor_Clone_Callback
- * @brief Type for a callback to return a clone for the accessor
+ * @brief Type for a callback to return a clone for the accessor.
  * @since 1.10
  */
 typedef Eina_Accessor* (*Eina_Accessor_Clone_Callback)(Eina_Accessor *it);
@@ -169,31 +169,31 @@ struct _Eina_Accessor
 
 /**
  * @def FUNC_ACCESSOR_GET_AT(Function)
- * @brief Helper macro to cast @a Function to a Eina_Accessor_Get_At_Callback.
+ * @brief Definition for helper macro to cast @a Function to a Eina_Accessor_Get_At_Callback.
  */
 #define FUNC_ACCESSOR_GET_AT(Function)        ((Eina_Accessor_Get_At_Callback)Function)
 
 /**
  * @def FUNC_ACCESSOR_GET_CONTAINER(Function)
- * @brief Helper macro to cast @a Function to a Eina_Accessor_Get_Container_Callback.
+ * @brief Definition for helper macro to cast @a Function to a Eina_Accessor_Get_Container_Callback.
  */
 #define FUNC_ACCESSOR_GET_CONTAINER(Function) ((Eina_Accessor_Get_Container_Callback)Function)
 
 /**
  * @def FUNC_ACCESSOR_FREE(Function)
- * @brief Helper macro to cast @a Function to a Eina_Accessor_Free_Callback.
+ * @brief Definition for helper macro to cast @a Function to a Eina_Accessor_Free_Callback.
  */
 #define FUNC_ACCESSOR_FREE(Function)          ((Eina_Accessor_Free_Callback)Function)
 
 /**
  * @def FUNC_ACCESSOR_LOCK(Function)
- * @brief Helper macro to cast @a Function to a Eina_Iterator_Lock_Callback.
+ * @brief Definition for helper macro to cast @a Function to a Eina_Iterator_Lock_Callback.
  */
 #define FUNC_ACCESSOR_LOCK(Function)          ((Eina_Accessor_Lock_Callback)Function)
 
 /**
  * @def FUNC_ACCESSOR_CLONE(Function)
- * @brief Helper macro to cast @p Function to a Eina_Iterator_Clone_Callback.
+ * @brief Definition for helper macro to cast @p Function to a Eina_Iterator_Clone_Callback.
  * @since 1.10
  */
 #define FUNC_ACCESSOR_CLONE(Function)          ((Eina_Accessor_Clone_Callback)Function)
@@ -201,26 +201,23 @@ struct _Eina_Accessor
 
 /**
  * @brief Frees an accessor.
- *
+ * @details This function frees @a accessor if it is not @c NULL.
  * @param[in] accessor The accessor to free
  *
- * @details This function frees @a accessor if it is not @c NULL.
  */
 EAPI void      eina_accessor_free(Eina_Accessor *accessor);
 
 /**
  * @brief Gets the data of an accessor at the given position.
- *
+ * @details This function retrieves the data of the element pointed by
+ *          @p accessor at the position @p position, and stores it in
+ *          @p data. If @p accessor is @c NULL or if an error occurs, @c EINA_FALSE
+ *          is returned, otherwise @c EINA_TRUE is returned.
  * @param[in] accessor The accessor
  * @param[in] position The position of the element
  * @param[in] data The pointer that stores the data to retrieve
  * @return #EINA_TRUE on success, otherwise #EINA_FALSE
  *
- * @details This function retrieves the data of the element pointed by
- *          @p accessor at the position @p position, and stores it in
- *          @p data. If @p accessor is @c NULL or if an error occurs, #EINA_FALSE
- *          is returned, otherwise #EINA_TRUE is returned.
- *
  */
 EAPI Eina_Bool eina_accessor_data_get(Eina_Accessor *accessor,
                                       unsigned int   position,
@@ -228,17 +225,22 @@ EAPI Eina_Bool eina_accessor_data_get(Eina_Accessor *accessor,
 
 /**
  * @brief Gets the container of an accessor.
- *
+ * @details This function returns the container that created @p accessor. If
+ *          @p accessor is @c NULL, this function returns @c NULL.
  * @param[in] accessor The accessor
  * @return The container that created the accessor
  *
- * @details This function returns the container that created @p accessor. If
- *          @p accessor is @c NULL, this function returns @c NULL.
  */
 EAPI void *eina_accessor_container_get(Eina_Accessor *accessor) EINA_ARG_NONNULL(1) EINA_PURE;
 
 /**
  * @brief Iterates over the container and executes a callback on the chosen elements.
+ * @details This function iterates over the elements pointed by @p accessor,
+ *          starting from the element at position @p start and ending at the
+ *          element at position @p end. For each element, the callback
+ *          @p cb is called with the data @p fdata. If @p accessor is @c NULL
+ *          or if @p start is greater than or equal to @p end, the function returns
+ *          immediately.
  *
  * @param[in] accessor The accessor
  * @param[in] cb The callback called on the chosen elements
@@ -246,12 +248,6 @@ EAPI void *eina_accessor_container_get(Eina_Accessor *accessor) EINA_ARG_NONNULL
  * @param[in] end The position of the last element
  * @param[in] fdata The data passed to the callback
  *
- * @details This function iterates over the elements pointed by @p accessor,
- *          starting from the element at position @p start and ending at the
- *          element at position @p end. For each element, the callback
- *          @p cb is called with the data @p fdata. If @p accessor is @c NULL
- *          or if @p start is greater than or equal to @p end, the function returns
- *          immediately.
  */
 EAPI void  eina_accessor_over(Eina_Accessor *accessor,
                               Eina_Each_Cb   cb,
@@ -285,7 +281,7 @@ EAPI Eina_Bool eina_accessor_lock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
 EAPI Eina_Accessor* eina_accessor_clone(Eina_Accessor *accessor) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Unlock the container of the accessor.
+ * @brief Unlocks the container of the accessor.
  *
  * @param[in] accessor The accessor
  * @return #EINA_TRUE on success, otherwise #EINA_FALSE
@@ -301,7 +297,9 @@ EAPI Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1)
 
 /**
  * @def EINA_ACCESSOR_FOREACH
- * @brief Helper macro to iterate over all the elements easily.
+ * @brief Definition for helper macro to iterate over all the elements easily.
+ * @details This macro allows a convenient way to loop over all elements in an
+ *          accessor, very similar to EINA_LIST_FOREACH().
  *
  * @param accessor The accessor to use
  * @param counter A counter used by eina_accessor_data_get() when
@@ -310,9 +308,6 @@ EAPI Eina_Bool eina_accessor_unlock(Eina_Accessor *accessor) EINA_ARG_NONNULL(1)
  *             It must be a pointer to support getting
  *             its address since eina_accessor_data_get() requires a pointer.
  *
- * @details This macro allows a convenient way to loop over all elements in an
- *          accessor, very similar to EINA_LIST_FOREACH().
- *
  * This macro can be used for freeing the data of a list, like in the
  * following example. It has the same goal as the one documented in
  * EINA_LIST_FOREACH(), but using accessors:
diff --git a/src/lib/eina/eina_alloca.h b/src/lib/eina/eina_alloca.h
index 9339c68b3b..c0e1b10217 100644
--- a/src/lib/eina/eina_alloca.h
+++ b/src/lib/eina/eina_alloca.h
@@ -44,7 +44,7 @@ extern "C"
 #   endif
 /**
  * Allocates memory in the stack frame of the caller, so it's automatically
- * freed when the caller returns.  See alloca(3) for detials.
+ * freed when the caller returns. See alloca(3) for details.
  */
 void *alloca(size_t size);
 #  endif
diff --git a/src/lib/eina/eina_array.h b/src/lib/eina/eina_array.h
index f4e363a2fd..c17fbd9dd0 100644
--- a/src/lib/eina/eina_array.h
+++ b/src/lib/eina/eina_array.h
@@ -177,7 +177,7 @@
  * array it @b may shrink.
  *
  * Allocating memory is expensive, so when the array needs to grow it allocates 
- * enough memory to hold @p step additonal elements, not just the element 
+ * enough memory to hold @p step additional elements, not just the element 
  * currently being added. Similarly if you remove elements, it won't free space 
  * until you have removed @p step elements. 
  *
@@ -242,7 +242,7 @@ struct _Eina_Array
 
 
 /**
- * @brief Create a new array.
+ * @brief Creates a new array.
  *
  * @param step The count of pointers to add when increasing the array size.
  * @return @c NULL on failure, non @c NULL otherwise.
@@ -257,7 +257,7 @@ struct _Eina_Array
 EAPI Eina_Array *eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Free an array.
+ * @brief Frees an array.
  *
  * @param array The array to free.
  *
@@ -269,7 +269,7 @@ EAPI Eina_Array *eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_
 EAPI void        eina_array_free(Eina_Array *array);
 
 /**
- * @brief Set the step of an array.
+ * @brief Sets the step of an array.
  *
  * @param array The array.
  * @param sizeof_eina_array Should be the value returned by sizeof(Eina_Array).
@@ -285,7 +285,7 @@ EAPI void        eina_array_step_set(Eina_Array  *array,
                                      unsigned int sizeof_eina_array,
                                      unsigned int step) EINA_ARG_NONNULL(1);
 /**
- * @brief Clean an array.
+ * @brief Cleans an array.
  *
  * @param array The array to clean.
  *
@@ -297,7 +297,7 @@ EAPI void        eina_array_step_set(Eina_Array  *array,
 static inline void eina_array_clean(Eina_Array *array) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Flush an array.
+ * @brief Flushes an array.
  *
  * @param array The array to flush.
  *
@@ -309,7 +309,7 @@ static inline void eina_array_clean(Eina_Array *array) EINA_ARG_NONNULL(1);
 EAPI void eina_array_flush(Eina_Array *array) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Rebuild an array by specifying the data to keep.
+ * @brief Rebuilds an array by specifying the data to keep.
  *
  * @param array The array.
  * @param keep The functions which selects the data to keep.
@@ -329,7 +329,7 @@ EAPI Eina_Bool eina_array_remove(Eina_Array * array,
                                  void *gdata) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Append a data to an array.
+ * @brief Appends a data to an array.
  *
  * @param array The array.
  * @param data The data to add.
@@ -345,7 +345,7 @@ static inline Eina_Bool eina_array_push(Eina_Array *array,
                                         const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Remove the last data of an array.
+ * @brief Removes the last data of an array.
  *
  * @param array The array.
  * @return The retrieved data.
@@ -359,10 +359,10 @@ static inline Eina_Bool eina_array_push(Eina_Array *array,
 static inline void     *eina_array_pop(Eina_Array *array) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Return the data at a given position in an array.
+ * @brief Returns the data at a given position in an array.
  *
  * @param array The array.
- * @param idx The potition of the data to retrieve.
+ * @param idx The position of the data to retrieve.
  * @return The retrieved data.
  *
  * This function returns the data at the position @p idx in @p
@@ -372,7 +372,7 @@ static inline void     *eina_array_pop(Eina_Array *array) EINA_ARG_NONNULL(1);
 static inline void     *eina_array_data_get(const Eina_Array *array,
                                             unsigned int      idx) EINA_ARG_NONNULL(1);
 /**
- * @brief Set the data at a given position in an array.
+ * @brief Sets the data at a given position in an array.
  *
  * @param array The array.
  * @param idx The position of the data to set.
@@ -388,7 +388,8 @@ static inline void      eina_array_data_set(const Eina_Array *array,
                                             unsigned int      idx,
                                             const void       *data) EINA_ARG_NONNULL(1);
 /**
- * @brief Return the number of elements in an array.
+ * @deprecated use eina_array_count()
+ * @brief Returns the number of elements in an array.
  *
  * @param array The array.
  * @return The number of elements.
@@ -397,12 +398,11 @@ static inline void      eina_array_data_set(const Eina_Array *array,
  * performance reasons, there is no check of @p array. If it is
  * @c NULL or invalid, the program may crash.
  *
- * @deprecated use eina_array_count()
  */
 static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Return the number of elements in an array.
+ * @brief Returns the number of elements in an array.
  *
  * @param array The array.
  * @return The number of elements.
@@ -414,7 +414,7 @@ static inline unsigned int eina_array_count_get(const Eina_Array *array) EINA_AR
 static inline unsigned int eina_array_count(const Eina_Array *array) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Get a new iterator associated to an array.
+ * @brief Gets a new iterator associated to an array.
  *
  * @param array The array.
  * @return A new iterator.
@@ -427,7 +427,7 @@ static inline unsigned int eina_array_count(const Eina_Array *array) EINA_ARG_NO
 EAPI Eina_Iterator        *eina_array_iterator_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Get a new accessor associated to an array.
+ * @brief Gets a new accessor associated to an array.
  *
  * @param array The array.
  * @return A new accessor.
@@ -440,7 +440,7 @@ EAPI Eina_Iterator        *eina_array_iterator_new(const Eina_Array *array) EINA
  */
 EAPI Eina_Accessor        *eina_array_accessor_new(const Eina_Array *array) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 /**
- * @brief Provide a safe way to iterate over an array
+ * @brief Provides a safe way to iterate over an array.
  *
  * @param array The array to iterate over.
  * @param cb The callback to call for each item.
@@ -457,7 +457,7 @@ static inline Eina_Bool    eina_array_foreach(Eina_Array  *array,
                                               void        *fdata);
 /**
  * @def EINA_ARRAY_ITER_NEXT
- * @brief Macro to iterate over an array easily.
+ * @brief Definition for the macro to iterate over an array easily.
  *
  * @param array The array to iterate over.
  * @param index The integer number that is increased while iterating.
diff --git a/src/lib/eina/eina_benchmark.h b/src/lib/eina/eina_benchmark.h
index 8c0c5988da..b54c984db2 100644
--- a/src/lib/eina/eina_benchmark.h
+++ b/src/lib/eina/eina_benchmark.h
@@ -116,7 +116,7 @@
  * The first column (specimen) is the integer passed to the work1()
  * function when the test is run. The second column (experiment time)
  * is the time, in nanosecond, that work1() takes. The third and
- * fourth columnd are self-explicit.
+ * fourth column are self-explicit.
  *
  * You can see that the integer passed work1() starts from 200 and
  * finishes at 290, with a step of 10. These values are computed withe
@@ -129,7 +129,7 @@
  * gnuplot bench_test_run.gnuplot
  * @endcode
  *
- * to create the graphic of the comparison curves. The image file is
+ * To create the graphic of the comparison curves. The image file is
  * named output_test_run.png.
  *
  * @section tutorial_benchmark_advanced_usage More Advanced Usage
@@ -345,7 +345,7 @@ typedef void (*Eina_Benchmark_Specimens)(int request);
 
 /**
  * @def EINA_BENCHMARK
- * @brief cast to an #Eina_Benchmark_Specimens.
+ * @brief Definition for the cast to an #Eina_Benchmark_Specimens.
  *
  * @param function The function to cast.
  *
@@ -355,7 +355,7 @@ typedef void (*Eina_Benchmark_Specimens)(int request);
 
 
 /**
- * @brief Create a new array.
+ * @brief Creates a new array.
  *
  * @param name The name of the benchmark.
  * @param run The name of the run.
@@ -374,7 +374,7 @@ EAPI Eina_Benchmark *eina_benchmark_new(const char *name,
                                         const char *run);
 
 /**
- * @brief Free a benchmark object.
+ * @brief Frees a benchmark object.
  *
  * @param bench The benchmark to free.
  *
@@ -385,7 +385,7 @@ EAPI Eina_Benchmark *eina_benchmark_new(const char *name,
 EAPI void            eina_benchmark_free(Eina_Benchmark *bench);
 
 /**
- * @brief Add a test to a benchmark.
+ * @brief Adds a test to a benchmark.
  *
  * @param bench The benchmark.
  * @param name The name of the test.
@@ -413,7 +413,7 @@ EAPI Eina_Bool       eina_benchmark_register(Eina_Benchmark          *bench,
                                              int                      count_step);
 
 /**
- * @brief Run the benchmark tests that have been registered.
+ * @brief Runs the benchmark tests that have been registered.
  *
  * @param bench The benchmark.
  * @return The list of names of the test files.
@@ -426,7 +426,7 @@ EAPI Eina_Bool       eina_benchmark_register(Eina_Benchmark          *bench,
  * bench_[name]_[run]%s.gnuplot
  * @endcode
  *
- * where [name] and [run] are the values passed to
+ * Where [name] and [run] are the values passed to
  * eina_benchmark_new().
  *
  * Each registered test is executed and timed. The time is written to
diff --git a/src/lib/eina/eina_bezier.h b/src/lib/eina/eina_bezier.h
index e8d1a7bcbe..dfbee11d4e 100644
--- a/src/lib/eina/eina_bezier.h
+++ b/src/lib/eina/eina_bezier.h
@@ -48,7 +48,7 @@ struct _Eina_Bezier
 };
 
 /**
- * @brief Set the values of the points of the given floating
+ * @brief Sets the values of the points of the given floating
  * point cubic bezier curve.
  *
  * @param b The floating point bezier.
@@ -67,7 +67,7 @@ struct _Eina_Bezier
 EAPI void eina_bezier_values_set(Eina_Bezier *b, double start_x, double start_y, double ctrl_start_x, double ctrl_start_y, double ctrl_end_x, double ctrl_end_y, double end_x, double end_y) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Get the values of the points of the given floating
+ * @brief Gets the values of the points of the given floating
  * point cubic bezier curve.
  *
  * @param b The floating point bezier.
@@ -133,7 +133,7 @@ EAPI void eina_bezier_point_at(const Eina_Bezier *b, double t, double *px, doubl
 EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNULL(1);
 
 /**
- * @brief split the bezier at given length.
+ * @brief Splits the bezier at given length.
  *
  * @param b The floating point bezier.
  * @param len The given length.
@@ -144,7 +144,7 @@ EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNUL
 EAPI void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bezier *left, Eina_Bezier *right) EINA_ARG_NONNULL(1);
 
 /**
- * @brief get the bound of the the bezier.
+ * @brief Gets the bound of the the bezier.
  *
  * @param b The floating point bezier.
  * @param x x coordinate of bounding box.
@@ -158,7 +158,7 @@ EAPI void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bez
 EAPI void eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, double *h) EINA_ARG_NONNULL(1);
 
 /**
- * @brief find the bezier at given interval.
+ * @brief Finds the bezier at given interval.
  *
  * @param b The floating point bezier.
  * @param t0 The start interval.
diff --git a/src/lib/eina/eina_binbuf.h b/src/lib/eina/eina_binbuf.h
index fe5fc4ef37..0aa0e1a117 100644
--- a/src/lib/eina/eina_binbuf.h
+++ b/src/lib/eina/eina_binbuf.h
@@ -34,7 +34,7 @@
 typedef struct _Eina_Strbuf Eina_Binbuf;
 
 /**
- * @brief Create a new string buffer.
+ * @brief Creates a new string buffer.
  *
  * @return Newly allocated string buffer instance.
  *
@@ -48,12 +48,12 @@ typedef struct _Eina_Strbuf Eina_Binbuf;
 EAPI Eina_Binbuf *eina_binbuf_new(void) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Create a new string buffer using the passed string. The passed
+ * @brief Creates a new string buffer using the passed string. The passed
  * string is used directly as the buffer, it's somehow the opposite function of
  * @ref eina_binbuf_string_steal . The passed string must be malloced.
  *
- * @param str the string to manage
- * @param length the length of the string.
+ * @param str The string to manage.
+ * @param length The length of the string.
  * @return Newly allocated string buffer instance.
  *
  * This function creates a new string buffer. On error, @c NULL is
@@ -65,13 +65,13 @@ EAPI Eina_Binbuf *eina_binbuf_new(void) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Binbuf *eina_binbuf_manage_new_length(unsigned char *str, size_t length) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_DEPRECATED;
 
 /**
- * @brief Create a new string buffer using the passed string. The passed
+ * @brief Creates a new string buffer using the passed string. The passed
  * string is used directly as the buffer, it's somehow the opposite function of
  * @ref eina_binbuf_string_steal .
  *
- * @param str the string to start from
- * @param length the length of the string.
- * @param ro the passed string will not be touched if set to EINA_TRUE.
+ * @param str The string to start from.
+ * @param length The length of the string.
+ * @param ro The passed string will not be touched if set to EINA_TRUE.
  * @return Newly allocated string buffer instance.
  *
  * This function creates a new string buffer. On error, @c NULL is
@@ -90,12 +90,12 @@ EAPI Eina_Binbuf *eina_binbuf_manage_new_length(unsigned char *str, size_t lengt
 EAPI Eina_Binbuf *eina_binbuf_manage_new(const unsigned char *str, size_t length, Eina_Bool ro) EINA_MALLOC EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Create a new string buffer using the passed string. The passed
+ * @brief Creates a new string buffer using the passed string. The passed
  * string is used directly as the buffer, it's somehow the opposite function of
  * @ref eina_binbuf_string_steal . The passed string will not be touched.
  *
- * @param str the string to start from
- * @param length the length of the string.
+ * @param str The string to start from.
+ * @param length The length of the string.
  * @return Newly allocated string buffer instance.
  *
  * This function creates a new string buffer. On error, @c NULL is
@@ -110,7 +110,7 @@ EAPI Eina_Binbuf *eina_binbuf_manage_new(const unsigned char *str, size_t length
 EAPI Eina_Binbuf *eina_binbuf_manage_read_only_new_length(const unsigned char *str, size_t length) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_DEPRECATED;
 
 /**
- * @brief Free a string buffer.
+ * @brief Frees a string buffer.
  *
  * @param buf The string buffer to free.
  *
@@ -120,7 +120,7 @@ EAPI Eina_Binbuf *eina_binbuf_manage_read_only_new_length(const unsigned char *s
 EAPI void eina_binbuf_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Reset a string buffer.
+ * @brief Resets a string buffer.
  *
  * @param buf The string buffer to reset.
  *
@@ -130,7 +130,7 @@ EAPI void eina_binbuf_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 EAPI void eina_binbuf_reset(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Expand a buffer, making room for at least @a minimum_unused_space.
+ * @brief Expands a buffer, making room for at least @a minimum_unused_space.
  *
  * One of the properties of the buffer is that it may overallocate
  * space, thus it may have more than eina_binbuf_length_get() bytes
@@ -161,7 +161,7 @@ EAPI void eina_binbuf_reset(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 EAPI Eina_Rw_Slice eina_binbuf_expand(Eina_Binbuf *buf, size_t minimum_unused_space) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Mark more bytes as used.
+ * @brief Marks more bytes as used.
  *
  * This function should be used after eina_binbuf_expand(), marking
  * the extra bytes returned there as used, then they will be
@@ -182,7 +182,7 @@ EAPI Eina_Rw_Slice eina_binbuf_expand(Eina_Binbuf *buf, size_t minimum_unused_sp
 EAPI Eina_Bool eina_binbuf_use(Eina_Binbuf *buf, size_t extra_bytes) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Append a string of exact length to a buffer, reallocating as necessary.
+ * @brief Appends a string of exact length to a buffer, reallocating as necessary.
  *
  * @param buf The string buffer to append to.
  * @param str The string to append.
@@ -203,7 +203,7 @@ EAPI Eina_Bool eina_binbuf_use(Eina_Binbuf *buf, size_t extra_bytes) EINA_ARG_NO
 EAPI Eina_Bool eina_binbuf_append_length(Eina_Binbuf *buf, const unsigned char *str, size_t length) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Append a slice to a buffer, reallocating as necessary.
+ * @brief Appends a slice to a buffer, reallocating as necessary.
  *
  * @param buf The string buffer to append to.
  * @param slice The slice to append.
@@ -217,7 +217,7 @@ EAPI Eina_Bool eina_binbuf_append_length(Eina_Binbuf *buf, const unsigned char *
 EAPI Eina_Bool eina_binbuf_append_slice(Eina_Binbuf *buf, const Eina_Slice slice) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Append an Eina_Binbuf to a buffer, reallocating as necessary.
+ * @brief Appends an Eina_Binbuf to a buffer, reallocating as necessary.
  *
  * @param buf The string buffer to append to.
  * @param data The string buffer to append.
@@ -236,7 +236,7 @@ EAPI Eina_Bool eina_binbuf_append_slice(Eina_Binbuf *buf, const Eina_Slice slice
 EAPI Eina_Bool eina_binbuf_append_buffer(Eina_Binbuf *buf, const Eina_Binbuf *data) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Append a character to a string buffer, reallocating as
+ * @brief Appends a character to a string buffer, reallocating as
  * necessary.
  *
  * @param buf The string buffer to append to.
@@ -249,7 +249,7 @@ EAPI Eina_Bool eina_binbuf_append_buffer(Eina_Binbuf *buf, const Eina_Binbuf *da
 EAPI Eina_Bool eina_binbuf_append_char(Eina_Binbuf *buf, unsigned char c) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Insert a string of exact length to a buffer, reallocating as necessary.
+ * @brief Inserts a string of exact length to a buffer, reallocating as necessary.
  *
  * @param buf The string buffer to insert to.
  * @param str The string to insert.
@@ -271,7 +271,7 @@ EAPI Eina_Bool eina_binbuf_append_char(Eina_Binbuf *buf, unsigned char c) EINA_A
 EAPI Eina_Bool eina_binbuf_insert_length(Eina_Binbuf *buf, const unsigned char *str, size_t length, size_t pos) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Insert a slice to a buffer, reallocating as necessary.
+ * @brief Inserts a slice to a buffer, reallocating as necessary.
  *
  * @param buf The string buffer to insert to.
  * @param slice The slice to insert.
@@ -287,7 +287,7 @@ EAPI Eina_Bool eina_binbuf_insert_length(Eina_Binbuf *buf, const unsigned char *
 EAPI Eina_Bool eina_binbuf_insert_slice(Eina_Binbuf *buf, const Eina_Slice slice, size_t pos) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Insert a character to a string buffer, reallocating as
+ * @brief Inserts a character to a string buffer, reallocating as
  * necessary.
  *
  * @param buf The string buffer to insert to.
@@ -302,7 +302,7 @@ EAPI Eina_Bool eina_binbuf_insert_slice(Eina_Binbuf *buf, const Eina_Slice slice
 EAPI Eina_Bool eina_binbuf_insert_char(Eina_Binbuf *buf, unsigned char c, size_t pos) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Remove a slice of the given string buffer.
+ * @brief Removes a slice of the given string buffer.
  *
  * @param buf The string buffer to remove a slice.
  * @param start The initial (inclusive) slice position to start
@@ -319,7 +319,7 @@ EAPI Eina_Bool eina_binbuf_insert_char(Eina_Binbuf *buf, unsigned char c, size_t
 EAPI Eina_Bool eina_binbuf_remove(Eina_Binbuf *buf, size_t start, size_t end) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Retrieve a pointer to the contents of a string buffer
+ * @brief Retrieves a pointer to the contents of a string buffer.
  *
  * @param buf The string buffer.
  * @return The current string in the string buffer.
@@ -334,7 +334,7 @@ EAPI Eina_Bool eina_binbuf_remove(Eina_Binbuf *buf, size_t start, size_t end) EI
 EAPI const unsigned char *eina_binbuf_string_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Steal the contents of a string buffer.
+ * @brief Steals the contents of a string buffer.
  *
  * @param buf The string buffer to steal.
  * @return The current string in the string buffer.
@@ -349,7 +349,7 @@ EAPI const unsigned char *eina_binbuf_string_get(const Eina_Binbuf *buf) EINA_AR
 EAPI unsigned char *eina_binbuf_string_steal(Eina_Binbuf *buf) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
- * @brief Free the contents of a string buffer but not the buffer.
+ * @brief Frees the contents of a string buffer but not the buffer.
  *
  * @param buf The string buffer to free the string of.
  *
@@ -359,7 +359,7 @@ EAPI unsigned char *eina_binbuf_string_steal(Eina_Binbuf *buf) EINA_MALLOC EINA_
 EAPI void eina_binbuf_string_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Retrieve the length of the string buffer content.
+ * @brief Retrieves the length of the string buffer content.
  *
  * @param buf The string buffer.
  * @return The current length of the string, in bytes.
@@ -369,7 +369,7 @@ EAPI void eina_binbuf_string_free(Eina_Binbuf *buf) EINA_ARG_NONNULL(1);
 EAPI size_t    eina_binbuf_length_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Get a read-only slice representing the current binbuf contents.
+ * @brief Gets a read-only slice representing the current binbuf contents.
  *
  * @param buf the src buffer.
  * @return a read-only slice for the current contents. It may become
@@ -380,7 +380,7 @@ EAPI size_t    eina_binbuf_length_get(const Eina_Binbuf *buf) EINA_ARG_NONNULL(1
 EAPI Eina_Slice eina_binbuf_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
- * @brief Get a read-write slice representing the current binbuf contents.
+ * @brief Gets a read-write slice representing the current binbuf contents.
  *
  * @param buf the src buffer.
  * @return a read-write slice for the current contents. It may become
@@ -393,7 +393,7 @@ EAPI Eina_Slice eina_binbuf_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_R
  */
 EAPI Eina_Rw_Slice eina_binbuf_rw_slice_get(const Eina_Binbuf *buf) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 /**
- * @brief Get the content of the buffer and free the buffer
+ * @brief Gets the content of the buffer and free the buffer.
  *
  * @param buf the buffer to get the content from and which will be freed
  *
diff --git a/src/lib/eina/eina_binshare.h b/src/lib/eina/eina_binshare.h
index 9015c78461..af9781dbf4 100644
--- a/src/lib/eina/eina_binshare.h
+++ b/src/lib/eina/eina_binshare.h
@@ -129,14 +129,12 @@ EAPI void        eina_binshare_del(const void *obj);
 
 /**
  * @brief Notes that the given object @b must be shared.
- *
+ * @details This function is a cheap way to know the length of a shared
+ *          object.
  * @param[in] obj The shared object to know the length \n
  *            It is safe to give @c NULL, in which case @c -1 is returned
  * @return    The length of the shared object
  *
- * @details This function is a cheap way to know the length of a shared
- *          object.
- *
  * @warning If the given pointer is not shared, bad things happen, mostly a
  *          segmentation fault. If in doubt, try strlen().
  */
@@ -152,16 +150,14 @@ EAPI void        eina_binshare_dump(void);
 
 /**
  * @brief Retrieves an instance of a blob for use in a program.
- *
- * @param   ptr The binary blob to retrieve an instance of
- * @return  A pointer to an instance of the string on success,
- *          otherwise @c NULL on failure
- *
  * @details This macro retrieves an instance of @p obj. If @p obj is
  *          @c NULL, then @c NULL is returned. If @p obj is already stored, it
  *          is just returned and its reference counter is increased. Otherwise
  *          it is added to the blobs to be searched and a duplicated blob
  *          of @p obj is returned.
+ * @param   ptr The binary blob to retrieve an instance of
+ * @return  A pointer to an instance of the string on success,
+ *          otherwise @c NULL on failure
  *
  * @note This macro essentially calls eina_binshare_add_length with ptr and sizeof(*ptr)
  *       as the parameters. It's useful for pointers to structures.
diff --git a/src/lib/eina/eina_clist.h b/src/lib/eina/eina_clist.h
index 8f3e2e90aa..e927a9bc25 100644
--- a/src/lib/eina/eina_clist.h
+++ b/src/lib/eina/eina_clist.h
@@ -169,14 +169,13 @@ static inline void eina_clist_add_tail(Eina_Clist *list, Eina_Clist *elem);
 
 /**
  * @brief Inits an (unlinked) element.
+ * @details This function is called on elements that have not been added to the list
+ *          so that eina_clist_element_init() works correctly.
  *
  * @param[in] elem An element
  * @pre The element is not in any list.
  * @post The element is marked as not being in any list.
  *
- * @details This function is called on elements that have not been added to the list
- *          so that eina_clist_element_init() works correctly.
- *
  * @note It is not necessary to call this before adding an element to this list.
  *
  * @since 1.1.0
@@ -324,7 +323,7 @@ static inline void eina_clist_move_head(Eina_Clist *dst, Eina_Clist *src);
  * @brief Iterates through the list, with safety against removal.
  *
  * @param cursor The pointer to be used during the interaction
- * @param cursor2 The auxiliar pointer to be used during the interaction
+ * @param cursor2 The auxiliary pointer to be used during the interaction
  * @param list The list to be interacted with
  */
 #define EINA_CLIST_FOR_EACH_SAFE(cursor, cursor2, list) \
@@ -351,7 +350,7 @@ static inline void eina_clist_move_head(Eina_Clist *dst, Eina_Clist *src);
  * @brief Iterates through the list using a list entry, with safety against removal.
  *
  * @param cursor The pointer to be used during the interaction
- * @param cursor2 The auxiliar pointer to be used during the interaction
+ * @param cursor2 The auxiliary pointer to be used during the interaction
  * @param list The list to be interacted with
  * @param type The type of the list
  * @param field The field of the element
@@ -378,7 +377,7 @@ static inline void eina_clist_move_head(Eina_Clist *dst, Eina_Clist *src);
  * @brief Iterates through the list in the reverse order, with safety against removal.
  *
  * @param cursor The pointer to be used during the interaction
- * @param cursor2 The auxiliar pointer to be used during the interaction
+ * @param cursor2 The auxiliary pointer to be used during the interaction
  * @param list The list to be interacted with
  */
 #define EINA_CLIST_FOR_EACH_SAFE_REV(cursor, cursor2, list) \
@@ -406,7 +405,7 @@ static inline void eina_clist_move_head(Eina_Clist *dst, Eina_Clist *src);
  *        removal.
  *
  * @param cursor The pointer to be used during the interaction
- * @param cursor2 The auxiliar pointer to be used during the interaction
+ * @param cursor2 The auxiliary pointer to be used during the interaction
  * @param list The list to be interacted with
  * @param type The type of the list
  * @param field The field of the element
diff --git a/src/lib/eina/eina_convert.h b/src/lib/eina/eina_convert.h
index be65cc404e..1234e4cf50 100644
--- a/src/lib/eina/eina_convert.h
+++ b/src/lib/eina/eina_convert.h
@@ -92,15 +92,15 @@
  *
  * To convert a string to a double, eina_convert_atod() should be
  * used. The format of the string must be as above. Then, the double
- * has the following mantiss and exponent:
+ * has the following mantissas and exponent:
  *
  * @code
  * mantiss  : [-]hhhhhh
  * exponent : 2^([+-]e - 4 * n)
  * @endcode
  *
- * with n being number of cypers after the point in the string
- * format. To obtain the double number from the mantiss and exponent,
+ * with n being number of cyphers after the point in the string
+ * format. To obtain the double number from the mantissas and exponent,
  * use ldexp().
  *
  * Here is an example of use:
@@ -163,31 +163,31 @@ EAPI extern Eina_Error EINA_ERROR_CONVERT_0X_NOT_FOUND; /**< Not used, perhaps a
 EAPI extern Eina_Error EINA_ERROR_CONVERT_OUTRUN_STRING_LENGTH; /**< Not used, perhaps a placeholder?  Defined as 0 in eina_convert.c*/
 
 /**
- * @brief Convert an integer number to a string in decimal base.
+ * @brief Converts an integer number to a string in decimal base.
  *
  * @param n The integer to convert.
  * @param s The buffer to store the converted integer.
- * @return The length of the string, including the nul terminated
+ * @return The length of the string, including the null terminated
  * character.
  *
- * This function converts @p n to a nul terminated string. The
+ * This function converts @p n to a null terminated string. The
  * converted string is in decimal base. As no check is done, @p s must
  * be a buffer that is sufficiently large to store the integer.
  *
- * The returned value is the length of the string, including the nul
+ * The returned value is the length of the string, including the null
  * terminated character.
  */
 EAPI int       eina_convert_itoa(int n, char *s)  EINA_ARG_NONNULL(2);
 
 /**
- * @brief Convert an integer number to a string in hexadecimal base.
+ * @brief Converts an integer number to a string in hexadecimal base.
  *
  * @param n The integer to convert.
  * @param s The buffer to store the converted integer.
- * @return The length of the string, including the nul terminated
+ * @return The length of the string, including the null terminated
  * character.
  *
- * This function converts @p n to a nul terminated string. The
+ * This function converts @p n to a null terminated string. The
  * converted string is in hexadecimal base and the alphabetical
  * cyphers are in lower case. As no check is done, @p s must be a
  * buffer that is sufficiently large to store the integer.
@@ -199,7 +199,7 @@ EAPI int       eina_convert_xtoa(unsigned int n, char *s) EINA_ARG_NONNULL(2);
 
 
 /**
- * @brief Convert a double to a string.
+ * @brief Converts a double to a string.
  *
  * @param d The double to convert.
  * @param des The destination buffer to store the converted double.
@@ -207,27 +207,27 @@ EAPI int       eina_convert_xtoa(unsigned int n, char *s) EINA_ARG_NONNULL(2);
  *
  * This function converts the double @p d to a string. The string is
  * stored in the buffer pointed by @p des and must be sufficiently
- * large to contain the converted double. The returned string is nul
+ * large to contain the converted double. The returned string is null
  * terminated and has the following format:
  *
  * @code
  * [-]0xh.hhhhhp[+-]e
  * @endcode
  *
- * where the h are the hexadecimal cyphers of the mantiss and e the
+ * where the h are the hexadecimal cyphers of the mantissas and e the
  * exponent (a decimal number).
  *
- * The returned value is the length of the string, including the nul
+ * The returned value is the length of the string, including the null
  * character.
  */
 EAPI int       eina_convert_dtoa(double d, char *des) EINA_ARG_NONNULL(2);
 
 /**
- * @brief Convert a string to a double.
+ * @brief Converts a string to a double.
  *
  * @param src The string to convert.
  * @param length The length of the string.
- * @param m The mantisse.
+ * @param m The mantissa.
  * @param e The exponent.
  * @return #EINA_TRUE on success, #EINA_FALSE otherwise.
  *
@@ -242,16 +242,16 @@ EAPI int       eina_convert_dtoa(double d, char *des) EINA_ARG_NONNULL(2);
  * [-]0xh.hhhhhp[+-]e
  * @endcode
  *
- * where the h are the hexadecimal cyphers of the mantiss and e the
- * exponent (a decimal number). If n is the number of cypers after the
- * point, the returned mantiss and exponents are:
+ * where the h are the hexadecimal cyphers of the mantissas and e the
+ * exponent (a decimal number). If n is the number of cyphers after the
+ * point, the returned mantissas and exponents are:
  *
  * @code
  * mantiss  : [-]hhhhhh
  * exponent : 2^([+-]e - 4 * n)
  * @endcode
  *
- * The mantiss and exponent are stored in the buffers pointed
+ * The mantissas and exponent are stored in the buffers pointed
  * respectively by @p m and @p e.
  *
  * If the string is invalid #EINA_FALSE is returned, otherwise #EINA_TRUE is
@@ -264,7 +264,7 @@ EAPI Eina_Bool eina_convert_atod(const char *src,
 
 
 /**
- * @brief Convert a 32.32 fixed point number to a string.
+ * @brief Converts a 32.32 fixed point number to a string.
  *
  * @param fp The fixed point number to convert.
  * @param des The destination buffer to store the converted fixed point number.
@@ -280,10 +280,10 @@ EAPI Eina_Bool eina_convert_atod(const char *src,
  * [-]0xh.hhhhhp[+-]e
  * @endcode
  *
- * where the h are the hexadecimal cyphers of the mantiss and e the
+ * where the h are the hexadecimal cyphers of the mantissas and e the
  * exponent (a decimal number).
  *
- * The returned value is the length of the string, including the nul
+ * The returned value is the length of the string, including the null
  * character.
  *
  * @note The code is the same than eina_convert_dtoa() except that it
@@ -294,7 +294,7 @@ EAPI int       eina_convert_fptoa(Eina_F32p32 fp,
                                   char       *des) EINA_ARG_NONNULL(2);
 
 /**
- * @brief Convert a string to a 32.32 fixed point number.
+ * @brief Converts a string to a 32.32 fixed point number.
  *
  * @param src The string to convert.
  * @param length The length of the string.
@@ -312,16 +312,16 @@ EAPI int       eina_convert_fptoa(Eina_F32p32 fp,
  * [-]0xh.hhhhhp[+-]e
  * @endcode
  *
- * where the h are the hexadecimal cyphers of the mantiss and e the
- * exponent (a decimal number). If n is the number of cypers after the
- * point, the returned mantiss and exponents are:
+ * where the h are the hexadecimal cyphers of the mantissas and e the
+ * exponent (a decimal number). If n is the number of cyphers after the
+ * point, the returned mantissas and exponents are:
  *
  * @code
  * mantiss  : [-]hhhhhh
  * exponent : 2^([+-]e - 4 * n)
  * @endcode
  *
- * The mantiss and exponent are stored in the buffers pointed
+ * The mantissas and exponent are stored in the buffers pointed
  * respectively by @p m and @p e.
  *
  * If the string is invalid, #EINA_FALSE is returned,
diff --git a/src/lib/eina/eina_counter.h b/src/lib/eina/eina_counter.h
index 7c58ec1ec8..a4ad3395b6 100644
--- a/src/lib/eina/eina_counter.h
+++ b/src/lib/eina/eina_counter.h
@@ -114,14 +114,13 @@ typedef struct _Eina_Counter Eina_Counter;
 
 /**
  * @brief Returns a counter.
- *
- * @param[in] name The name of the counter
- * @return A newly allocated counter
- *
  * @details This function returns a new counter. It is characterized by @p
  *          name. If @p name is @c NULL, the function returns @c NULL
  *          immediately. If memory allocation fails, @c NULL is returned.
  *
+ * @param[in] name The name of the counter
+ * @return A newly allocated counter
+ *
  * @note Whe the new counter is not needed anymore, use eina_counter_free() to
  *       free the allocated memory.
  */
@@ -129,25 +128,23 @@ EAPI Eina_Counter *eina_counter_new(const char *name) EINA_WARN_UNUSED_RESULT EI
 
 /**
  * @brief Deletes a counter.
- *
- * @param[in] counter The counter to delete
- *
  * @details This function removes the clock of @p counter from the used clocks
  *          (see eina_counter_start()) and frees the memory allocated for
  *          @p counter. If @p counter is @c NULL, the function returns
  *          immediately.
+ * @param[in] counter The counter to delete
+ *
  */
 EAPI void          eina_counter_free(Eina_Counter *counter) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Starts the time count.
- *
- * @param[in] counter The counter
- *
  * @details This function specifies that the part of the code beginning just
  *          after its call is being timed, using @p counter. If
  *          @p counter is @c NULL, this function returns immediately.
  *
+ * @param[in] counter The counter
+ *
  * @note This function adds the clock associated to @p counter in a list. If
  *       the memory needed by that clock can not be allocated, the function
  *       returns and nothing is done.
@@ -159,30 +156,28 @@ EAPI void          eina_counter_start(Eina_Counter *counter) EINA_ARG_NONNULL(1)
 
 /**
  * @brief Stops the time count.
- *
- * @param[in] counter The counter
- * @param[in] specimen The number of the test
- *
  * @details This function stops the timing that has been started with
  *          eina_counter_start(). @p counter must be the same as the one used
  *          with eina_counter_start(). @p specimen is the number of the
  *          test. If @p counter or its associated clock is @c NULL, or if the
  *          time can't be retrieved the function exits.
+ * @param[in] counter The counter
+ * @param[in] specimen The number of the test
+ *
  */
 EAPI void          eina_counter_stop(Eina_Counter *counter,
                                      int           specimen) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Dumps the result of all the clocks of a counter to a stream.
- *
- * @param[in] counter The counter
- * @return A string with a summary of the test
- *
  * @details This function returns an malloc'd string containing the dump of
  *          all the valid clocks of @p counter.
  *          If @p counter is @c NULL, the functions exits
  *          immediately. Otherwise, the output is formatted like this:
  *
+ * @param[in] counter The counter
+ * @return A string with a summary of the test
+ *
  * @verbatim
  * \# specimen    experiment time    starting time    ending time
  * 1              208                120000           120208
diff --git a/src/lib/eina/eina_cow.h b/src/lib/eina/eina_cow.h
index 400cfe473f..c98c4b60f1 100644
--- a/src/lib/eina/eina_cow.h
+++ b/src/lib/eina/eina_cow.h
@@ -52,33 +52,33 @@ typedef struct _Eina_Cow Eina_Cow;
 typedef void Eina_Cow_Data;
 
 /**
- * @brief Instantiate a new Eina_Cow pool.
+ * @brief Instantiates a new Eina_Cow pool.
  *
  * @param name The name of this pool, used for debug.
  * @param struct_size The size of the object from this pool.
  * @param step How many objects to allocate when the pool gets empty.
  * @param default_value The default value returned by this pool.
  * @param gc Is it possible to run garbage collection on this pool.
- * @return a valid new Eina_Cow or @c NULL on error.
+ * @return A valid new Eina_Cow, or @c NULL on error.
  */
 EAPI Eina_Cow *eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, const void *default_value, Eina_Bool gc) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Destroy an Eina_Cow pool and all the allocated memory
+ * @brief Destroys an Eina_Cow pool and all the allocated memory.
  *
  * @param cow The pool to destroy
  */
 EAPI void eina_cow_del(Eina_Cow *cow);
 
 /**
- * @brief Return an initialized pointer from the pool.
+ * @brief Returns an initialized pointer from the pool.
  * @param cow The pool to take things from.
  * @return A pointer to the new pool instance
  */
 EAPI const Eina_Cow_Data *eina_cow_alloc(Eina_Cow *cow) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Free a pointer from the pool.
+ * @brief Frees a pointer from the pool.
  * @param cow The pool to gave back memory to.
  * @param data The data to give back.
  *
@@ -88,7 +88,7 @@ EAPI const Eina_Cow_Data *eina_cow_alloc(Eina_Cow *cow) EINA_WARN_UNUSED_RESULT;
 EAPI void eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data);
 
 /**
- * @brief Get a writable pointer from a const pointer.
+ * @brief Gets a writeable pointer from a const pointer.
  * @param cow The pool the pointer come from.
  * @param src The pointer you want to write to.
  *
@@ -97,7 +97,7 @@ EAPI void eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data **data);
 EAPI void *eina_cow_write(Eina_Cow *cow,
                           const Eina_Cow_Data * const *src) EINA_WARN_UNUSED_RESULT;
 /**
- * @brief Set back a pointer into read only.
+ * @brief Sets back a pointer into read only.
  * @param cow The pool the pointer come from.
  * @param dst The read only version of the pointer.
  * @param data The pointer to which data was written to.
@@ -110,7 +110,7 @@ EAPI void eina_cow_done(Eina_Cow *cow,
                         const void *data,
                         Eina_Bool needed_gc);
 /**
- * @brief Make the destination contain the same thing as the source pointer.
+ * @brief Makes the destination contain the same thing as the source pointer.
  * @param cow The pool the pointers come from.
  * @param dst The destination to update.
  * @param src The source of information to copy.
@@ -120,7 +120,7 @@ EAPI void eina_cow_memcpy(Eina_Cow *cow,
                           const Eina_Cow_Data *src);
 
 /**
- * @brief Try to find entries that have the same content and update them.
+ * @brief Tries to find entries that have the same content and update them.
  * @param cow The cow to try to compact.
  * @return EINA_TRUE if something was compacted, EINA_FALSE if nothing was.
  *
@@ -132,7 +132,7 @@ EAPI Eina_Bool eina_cow_gc(Eina_Cow *cow);
 
 /**
  * @def EINA_COW_WRITE_BEGIN
- * @brief This macro setup a writable pointer from a const one.
+ * @brief Definition for the macro to setup a writeable pointer from a const one.
  * @param Cow The Eina_Cow where the const pointer come from.
  * @param Read The const pointer to get a writable handler from.
  * @param Write_Type The type of the pointer you want to write to.
@@ -151,7 +151,7 @@ EAPI Eina_Bool eina_cow_gc(Eina_Cow *cow);
 
 /**
  * @def EINA_COW_WRITE_END
- * @brief This macro close the writable pointer.
+ * @brief Definition for the macro to close the writeable pointer.
  * @param Cow The Eina_Cow where the const pointer come from.
  * @param Read The const pointer to get a writable handler from.
  * @param Write The name of the variable where to put the writeable pointer to.
diff --git a/src/lib/eina/eina_cpu.h b/src/lib/eina/eina_cpu.h
index e97d61417e..05de0fa8f5 100644
--- a/src/lib/eina/eina_cpu.h
+++ b/src/lib/eina/eina_cpu.h
@@ -59,31 +59,31 @@ typedef enum _Eina_Cpu_Features
 } Eina_Cpu_Features;
 
 /**
- * @brief Global hardware architecture handler
+ * @brief Global hardware architecture handler.
  *
  * @return the current cpu features
  */
 EAPI extern Eina_Cpu_Features eina_cpu_features;
 
 /**
- * @brief Cpu features accessor
+ * @brief Cpu features accessor.
  *
  * @return the current cpu features
  */
 EAPI Eina_Cpu_Features eina_cpu_features_get(void);
 
 /**
- * @brief Get the current number of processors
+ * @brief Gets the current number of processors.
  *
- * @return the number of processors that are online, that
+ * @return The number of processors that are online, that
  * is available when the function is called.
  */
 EAPI int               eina_cpu_count(void);
 
 /**
- * @brief Get the current virtual page size
+ * @brief Gets the current virtual page size.
  *
- * @return the fixed length that represents the smallest unit of data for memory
+ * @return The fixed length that represents the smallest unit of data for memory
  * allocation performed by the operating system on behalf of the program, and
  * for transfers between the main memory and any other auxiliary store.
  */
@@ -93,7 +93,7 @@ EAPI int               eina_cpu_page_size(void);
  * @brief Reverses the byte order of a 16-bit (destination) register.
  *
  * @param x The binary word to swap
- * @return a byte order swapped 16-bit integer.  
+ * @return A byte order swapped 16-bit integer.  
  *
  * On big endian systems, the number is converted to little endian byte order.
  * On little endian systems, the number is converted to big endian byte order.
@@ -104,7 +104,7 @@ static inline unsigned short eina_swap16(unsigned short x);
  * @brief Reverses the byte order of a 32-bit (destination) register.
  *
  * @param x The binary word to swap
- * @return a byte order swapped 32-bit integer.  
+ * @return A byte order swapped 32-bit integer.  
  *
  * On big endian systems, the number is converted to little endian byte order.
  * On little endian systems, the number is converted to big endian byte order.
@@ -115,7 +115,7 @@ static inline unsigned int eina_swap32(unsigned int x);
  * @brief Reverses the byte order of a 64-bit (destination) register.
  *
  * @param x The binary word to swap
- * @return a byte order swapped 64-bit integer.  
+ * @return A byte order swapped 64-bit integer.  
  *
  * On big endian systems, the number is converted to little endian byte order.
  * On little endian systems, the number is converted to big endian byte order.
diff --git a/src/lib/eina/eina_crc.h b/src/lib/eina/eina_crc.h
index 819ca911dd..fe1a919898 100644
--- a/src/lib/eina/eina_crc.h
+++ b/src/lib/eina/eina_crc.h
@@ -12,7 +12,7 @@
 #include "eina_magic.h"
 
 /**
- * @brief Generate a crc checksum for the given data using crc-32 algorithm.
+ * @brief Generates a crc checksum for the given data using crc-32 algorithm.
  *
  * @param key The data for which crc checksum has to be generated.
  * @param len The length of the data.
diff --git a/src/lib/eina/eina_error.h b/src/lib/eina/eina_error.h
index 71df4848db..80d243b165 100644
--- a/src/lib/eina/eina_error.h
+++ b/src/lib/eina/eina_error.h
@@ -107,16 +107,15 @@ EAPI extern Eina_Error EINA_ERROR_OUT_OF_MEMORY EINA_DEPRECATED; /* use ENOMEM *
 
 /**
  * @brief Registers a new error type.
- *
- * @param[in] msg The description of the error \n
- *                It is duplicated using eina_stringshare_add().
- * @return The unique number identifier for this error
- *
  * @details This function stores the error message described by
  *          @p msg in a list. The returned value is a unique identifier greater than or equal
  *          to @c 1. The description can be retrieved later by passing
  *          the returned value to eina_error_msg_get().
  *
+ * @param[in] msg The description of the error \n
+ *                It is duplicated using eina_stringshare_add().
+ * @return The unique number identifier for this error
+ *
  * @note There is no need to register messages that exist in libC's @c
  *       errno.h, such as @c ENOMEM or @c EBADF.
  *
@@ -126,17 +125,16 @@ EAPI Eina_Error  eina_error_msg_register(const char *msg) EINA_ARG_NONNULL(1) EI
 
 /**
  * @brief Registers a new error type, statically allocated message.
+ * @details This function stores the error message described by
+ *          @p msg in a list. The returned value is a unique identifier greater than or equal
+ *          to @c 1. The description can be retrieved later by passing
+ *          the returned value to eina_error_msg_get().
  *
  * @param[in] msg The description of the error \n
  *            This string is not duplicated and thus
  *            the given pointer should live during the usage of eina_error.
  * @return The unique number identifier for this error
  *
- * @details This function stores the error message described by
- *          @p msg in a list. The returned value is a unique identifier greater than or equal
- *          to @c 1. The description can be retrieved later by passing
- *          the returned value to eina_error_msg_get().
- *
  * @note There is no need to register messages that exist in libC's @c
  *       errno.h, such as @c ENOMEM or @c EBADF.
  *
@@ -146,6 +144,10 @@ EAPI Eina_Error  eina_error_msg_static_register(const char *msg) EINA_ARG_NONNUL
 
 /**
  * @brief Changes the message of an already registered message.
+ * @details This function modifies the message associated with @p error and changes
+ *          it to @p msg. If the error is previously registered by @ref eina_error_msg_static_register
+ *          then the string is not duplicated, otherwise the previous message
+ *          is unrefed and @p msg is copied.
  *
  * @param[in] error The Eina_Error to change the message of
  * @param[in] msg The description of the error \n
@@ -153,11 +155,6 @@ EAPI Eina_Error  eina_error_msg_static_register(const char *msg) EINA_ARG_NONNUL
  *            otherwise it must remain intact for the duration.
  * @return #EINA_TRUE if successful, otherwise #EINA_FALSE on error
  *
- * @details This function modifies the message associated with @p error and changes
- *          it to @p msg. If the error is previously registered by @ref eina_error_msg_static_register
- *          then the string is not duplicated, otherwise the previous message
- *          is unrefed and @p msg is copied.
- *
  * @note It is not possible to modify messages that exist in libC's @c
  *       errno.h, such as @c ENOMEM or @c EBADF.
  *
@@ -169,24 +166,22 @@ EAPI Eina_Bool   eina_error_msg_modify(Eina_Error  error,
 
 /**
  * @brief Returns the last set error.
- *
- * @return The last error or 0 (#EINA_ERROR_NO_ERROR).
- *
  * @details This function returns the last error set by eina_error_set(). The
  *          description of the message is returned by eina_error_msg_get().
  *
+ * @return The last error or 0 (#EINA_ERROR_NO_ERROR).
+ *
  * @note This function is thread safe @since 1.10, but slower to use.
  */
 EAPI Eina_Error  eina_error_get(void);
 
 /**
  * @brief Sets the last error.
- *
- * @param[in] err The error identifier
- *
  * @details This function sets the last error identifier. The last error can be
  *          retrieved by eina_error_get().
  *
+ * @param[in] err The error identifier
+ *
  * @note This is also used to clear previous errors, in which case @p err should
  *        be @c 0 (#EINA_ERROR_NO_ERROR).
  *
@@ -196,25 +191,23 @@ EAPI void        eina_error_set(Eina_Error err);
 
 /**
  * @brief Returns the description of the given error number.
- *
- * @param[in] error The error number
- * @return The description of the error
- *
  * @details This function returns the description of an error that has been
  *          registered by eina_error_msg_register(). If an incorrect error is
  *          given, then @c NULL is returned.
+ * @param[in] error The error number
+ * @return The description of the error
+ *
  */
 EAPI const char *eina_error_msg_get(Eina_Error error) EINA_PURE;
 
 /**
  * @brief Finds the #Eina_Error corresponding to a message string.
+ * @details This function attempts to match @p msg with its corresponding #Eina_Error value.
+ *          If no such value is found, @c 0 is returned.
  *
  * @param[in] msg The error message string to match (NOT @c NULL)
  * @return The #Eina_Error matching @p msg, otherwise @c 0 on failure
  *
- * @details This function attempts to match @p msg with its corresponding #Eina_Error value.
- *          If no such value is found, @c 0 is returned.
- *
  * @note this function only works for explicitly registered errors
  *       such as the messages given to eina_error_msg_register(),
  *       eina_error_msg_static_register() or modified with
diff --git a/src/lib/eina/eina_evlog.h b/src/lib/eina/eina_evlog.h
index 97278636dc..65f7908651 100644
--- a/src/lib/eina/eina_evlog.h
+++ b/src/lib/eina/eina_evlog.h
@@ -56,7 +56,7 @@ struct _Eina_Evlog_Buf
 };
 
 /**
- * @brief Log an event in our event log for profiling data
+ * @brief Logs an event in our event log for profiling data.
  *
  * Log some interesting event inside of EFL, eg a wakeup (and why etc.).
  * The @p event string must alwasy be provided and be of the form:
@@ -117,7 +117,7 @@ EAPI void
 eina_evlog(const char *event, void *obj, double srctime, const char *detail);
 
 /**
- * @brief Steal an event log buffer from the evlog core
+ * @brief Steals an event log buffer from the evlog core.
  *
  * Only one buffer can be stolen at any time. If you steal a new buffer, the
  * old stolen buffer is "released" back to the evlog core.
@@ -130,7 +130,7 @@ EAPI Eina_Evlog_Buf *
 eina_evlog_steal(void);
 
 /**
- * @brief Begin logging - until now eina_evlog is a NOOP
+ * @brief Begins logging - until now eina_evlog is a NOOP.
  *
  * @since 1.15
  */
@@ -138,7 +138,7 @@ EAPI void
 eina_evlog_start(void);
 
 /**
- * @brief Stop logging
+ * @brief Stops logging.
  *
  * You must not be using any evlog buffers stolen by eina_evlog_steal() by
  * the time you call this function.
diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h
index 7a1c55994f..e5098be065 100644
--- a/src/lib/eina/eina_file.h
+++ b/src/lib/eina/eina_file.h
@@ -71,7 +71,7 @@
  * @brief This group discusses the functions to handle files and directories.
  *
  * @details These functions make it easier to do a number of file and directory operations
- *          such as getting the list of files in a directory, spliting paths, and finding
+ *          such as getting the list of files in a directory, splitting paths, and finding
  *          out file size and type.
  *
  * @warning All functions in this group are @b blocking, which means they may
@@ -159,7 +159,7 @@ typedef enum {
  * it never happens */
 /**
  * @def EINA_PATH_MAX
- * @brief The constant defined as the highest value for PATH_MAX.
+ * @brief Definition for the constant defined as the highest value for PATH_MAX.
  */
 #define EINA_PATH_MAX 8192
 
@@ -239,23 +239,15 @@ struct _Eina_File_Line
 /**
  * @def EINA_FILE_DIR_LIST_CB
  * @brief The macro to cast to an #Eina_File_Dir_List_Cb.
- *
+ * @details This macro casts @p function to #Eina_File_Dir_List_Cb.
  * @param function The function to cast
  *
- * @details This macro casts @p function to #Eina_File_Dir_List_Cb.
  */
 #define EINA_FILE_DIR_LIST_CB(function) ((Eina_File_Dir_List_Cb)function)
 
 
 /**
  * @brief Lists all the files on the directory by calling the function for every file found.
- *
- * @param[in] dir The directory name
- * @param[in] recursive Iterate recursively in the directory
- * @param[in] cb The callback to be called
- * @param[in] data The data to pass to the callback
- * @return #EINA_TRUE on success, otherwise #EINA_FALSE
- *
  * @details This function calls @p cb for each file that is in @p dir. To have @p cb
  *          called on the files that are in subdirectories of @p dir, @p recursive should
  *          be #EINA_TRUE. In other words, if @p recursive is #EINA_FALSE, only direct children
@@ -265,6 +257,12 @@ struct _Eina_File_Line
  *          If @p cb or @p dir is @c NULL or if @p dir is a string of size 0,
  *          or if @p dir cannot be opened, this function returns #EINA_FALSE
  *          immediately. Otherwise, it returns #EINA_TRUE.
+ *
+ * @param[in] dir The directory name
+ * @param[in] recursive Iterate recursively in the directory
+ * @param[in] cb The callback to be called
+ * @param[in] data The data to pass to the callback
+ * @return #EINA_TRUE on success, otherwise #EINA_FALSE
  */
 EAPI Eina_Bool eina_file_dir_list(const char           *dir,
                                   Eina_Bool             recursive,
@@ -273,28 +271,27 @@ EAPI Eina_Bool eina_file_dir_list(const char           *dir,
 
 /**
  * @brief Splits a path according to the delimiter of the filesystem.
- *
- * @param[in] path The path to split
- * @return An array of the parts of the path to split
- *
  * @details This function splits @p path according to the delimiter of the used
  *          filesystem. If  @p path is @c NULL or if the array cannot be
  *          created, @c NULL is returned, otherwise an array with each part of @p path
  *          is returned.
+ *
+ * @param[in] path The path to split
+ * @return An array of the parts of the path to split
+ *
  */
 EAPI Eina_Array    *eina_file_split(char *path) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @brief Gets an iterator to list the content of a directory.
+ * @details This returns an iterator for shared strings, the name of each file in @p dir is
+ *          only fetched when advancing the iterator, which means there is very little
+ *          cost associated with creating the list and stopping halfway through it.
  *
  * @param [in] dir The name of the directory to list
  * @return An #Eina_Iterator that walks over the files and directories
  *         in @p dir. On failure, it returns @c NULL.
  *
- * @details This returns an iterator for shared strings, the name of each file in @p dir is
- *          only fetched when advancing the iterator, which means there is very little
- *          cost associated with creating the list and stopping halfway through it.
- *
  * @note The iterator hands the user a stringshared value with the full
  *       path. The user must free the string using eina_stringshare_del() on it.
  *
@@ -308,16 +305,15 @@ EAPI Eina_Iterator *eina_file_ls(const char *dir) EINA_WARN_UNUSED_RESULT EINA_A
 /**
  * @brief Gets an iterator to list the content of a directory, with direct
  *        information.
+ * @details This returns an iterator for #Eina_File_Direct_Info, the name of each file in @p
+ *          dir is only fetched when advancing the iterator, which means there is
+ *          cost associated with creating the list and stopping halfway through it.
  *
  * @param [in] dir The name of the directory to list
  *
  * @return An #Eina_Iterator that walks over the files and
  *         directories in @p dir. On failure, it returns @c NULL.
  *
- * @details This returns an iterator for #Eina_File_Direct_Info, the name of each file in @p
- *          dir is only fetched when advancing the iterator, which means there is
- *          cost associated with creating the list and stopping halfway through it.
- *
  * @warning The #Eina_File_Direct_Info returned by the iterator <b>must not</b>
  *          be modified in any way.
  * @warning When the iterator is advanced or deleted the #Eina_File_Direct_Info
@@ -336,14 +332,13 @@ EAPI Eina_Iterator *eina_file_stat_ls(const char *dir) EINA_WARN_UNUSED_RESULT E
 /**
  * @brief Uses information provided by #Eina_Iterator of eina_file_stat_ls() or eina_file_direct_ls()
  *        to call stat in the most efficient way on your system.
+ * @details This function calls fstatat or stat depending on what your system supports. This makes it efficient and simple
+ *          to use on your side without complex detection already done inside Eina on what the system can do.
  *
  * @param[in] container The container returned by #Eina_Iterator using eina_iterator_container_get()
  * @param[in] info The content of the current #Eina_File_Direct_Info provided by #Eina_Iterator
  * @param[in] buf The location put the result of the stat
- * @return @c 0 is returnedon success, otherwise @c -1 is returned on error and errno is set appropriately
- *
- * @details This function calls fstatat or stat depending on what your system supports. This makes it efficient and simple
- *          to use on your side without complex detection already done inside Eina on what the system can do.
+ * @return @c 0 is returned on success, otherwise @c -1 is returned on error and errno is set appropriately
  *
  * @see eina_file_direct_ls()
  * @see eina_file_stat_ls()
@@ -355,19 +350,18 @@ EAPI int eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Sta
 /**
  * @brief Generates and creates a uniquely named temporary file from a template name.
  *        The generated file is opened with the open(2) @c O_EXCL flag.
+ * @details This function calls mkstemp(), generates a unique temporary filename
+ *          from template, creates and opens the file, and returns an open file
+ *          descriptor for the file.
  *
  * @param[in] templatename This is a string. It must contain the six characters 'XXXXXX'
- *                         at the end or directly followed by an extension as in 
+ *                         at the end or directly followed by an extension as in
  *                         'prefixXXXXXX.ext'.
  * @param[out] path The path to the created temporary file, or @c NULL in case of failure.
  *                  It must be released by eina_tmpstr_del().
- * @return On success @c file descriptor of the temporary file is returned, 
+ * @return On success @c file descriptor of the temporary file is returned,
  *         On error @c -1 is returned, in which case @c errno is set appropriately.
  *
- * @details This function calls mkstemp(), generates a unique temporary filename
- *          from template, creates and opens the file, and returns an open file 
- *          descriptor for the file.
- *
  * @note If a filename extension was specified in @p templatename, then the new @p path
  *       will also contain this extension (since 1.10).
  *
@@ -376,7 +370,7 @@ EAPI int eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Sta
  *       the system temporary directory (@see eina_environment_tmp_get()). If the
  *       @p templatename contains a directory separator ('/', or '\\' on Windows)
  *       then the file will be created inside this directory, which must exist and
- *       be writable. Use ./filename.XXXXXX to create files in the current
+ *       be writeable. Use ./filename.XXXXXX to create files in the current
  *       working directory. (since 1.17)
  *
  * @see eina_file_mkdtemp()
@@ -386,23 +380,22 @@ EAPI int eina_file_mkstemp(const char *templatename, Eina_Tmpstr **path) EINA_AR
 
 /**
  * @brief Generates and creates a uniquely named temporary directory from a template name.
+ * @details This function calls mkdtemp(). The directory is then created with
+ *           permissions 0700.
  *
- * @param[in] templatename This is a string. The last six characters of @p templatename 
+ * @param[in] templatename This is a string. The last six characters of @p templatename
  *                         must be XXXXXX.
  * @param[out] path The path to the created temporary directory, or @c NULL in case of failure.
  *                  It must be released by eina_tmpstr_del().
- * @return On success @c EINA_TRUE is returned, On error @c EINA_FALSE is returned, 
+ * @return On success @c EINA_TRUE is returned, On error @c EINA_FALSE is returned,
  *                    in which case @c errno is set appropriately.
  *
- * @details This function calls mkdtemp(). The directory is then created with 
- *           permissions 0700.
- *
  * @note If the @p templatename is a simple directory name (no relative or absolute
  *       path to another directory), then a temporary directory will be created inside
  *       the system temporary directory (@see eina_environment_tmp_get()). If the
  *       @p templatename contains a directory separator ('/', or '\\' on Windows)
  *       then the temporary directory will be created inside that other directory,
- *       which must exist and be writable. (since 1.17)
+ *       which must exist and be writeable. (since 1.17)
  *
  * @see eina_file_mkstemp()
  * @since 1.8
@@ -412,16 +405,15 @@ EAPI Eina_Bool eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path) E
 /**
  * @brief Gets an iterator to list the content of a directory, with direct
  *        information.
+ * @details This returns an iterator for #Eina_File_Direct_Info, the name of each file in
+ *          @p dir is only fetched when advancing the iterator, which means there is
+ *          cost associated with creating the list and stopping halfway through it.
  *
  * @param [in] dir The name of the directory to list
  *
  * @return An Eina_Iterator that walks over the files and
  *         directories in @p dir. On failure, it returns @c NULL.
  *
- * @details This returns an iterator for #Eina_File_Direct_Info, the name of each file in
- *          @p dir is only fetched when advancing the iterator, which means there is
- *          cost associated with creating the list and stopping halfway through it.
- *
  * @warning If readdir_r doesn't contain file type information, file type is
  *          EINA_FILE_UNKNOWN.
  * @warning The #Eina_File_Direct_Info returned by the iterator <b>must not</b>
@@ -441,15 +433,14 @@ EAPI Eina_Iterator *eina_file_direct_ls(const char *dir) EINA_WARN_UNUSED_RESULT
 
 /**
  * @brief Sanitizes the file path.
+ * @details This function takes care of adding the current working directory if its a
+ *          relative path and also removes all '..' and '//' references in the original
+ *          path.
  *
  * @param[in] path The path to sanitize
  *
  * @return An allocated string with the sanitized path
  *
- * @details This function takes care of adding the current working directory if its a
- *          relative path and also removes all '..' and '//' references in the original
- *          path.
- *
  * @since 1.1
  */
 EAPI char *eina_file_path_sanitize(const char *path);
@@ -475,7 +466,9 @@ typedef enum {
 } Eina_File_Copy_Flags;
 
 /**
- * @brief Copy one file to another using the fastest possible way and report progress.
+ * @brief Copies one file to another using the fastest possible way and report progress.
+ * @details This function tries to splice if it is available. It is blocked
+ *          until the whole file is copied or it fails.
  *
  * @param[in] src The source file.
  * @param[in] dst The destination file.
@@ -485,31 +478,27 @@ typedef enum {
  * @return #EINA_TRUE on success, #EINA_FALSE otherwise (and @p dst
  *         will be deleted)
  *
- * @details This function tries to splice if it is available. It is blocked
- *          until the whole file is copied or it fails.
- *
  * @note During the progress it may call back @p cb with the progress summary.
  */
 EAPI Eina_Bool eina_file_copy(const char *src, const char *dst, Eina_File_Copy_Flags flags, Eina_File_Copy_Progress cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @brief Gets a read-only handler to a file.
+ * @details This opens a file in the read-only mode. @p name should be an absolute path. An
+ *          #Eina_File handle can be shared among multiple instances if @p shared
+ *          is #EINA_TRUE, otherwise.
  *
  * @param[in] name The filename to open
  * @param[in] shared Requested a shm
 
  * @return An #Eina_File handle to the file
  *
- * @details This opens a file in the read-only mode. @p name should be an absolute path. An
- *          #Eina_File handle can be shared among multiple instances if @p shared
- *          is #EINA_TRUE, otherwise.
- *
  * @since 1.1
  */
 EAPI Eina_File *eina_file_open(const char *name, Eina_Bool shared) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
- * @brief Create a virtual file from a memory pointer.
+ * @brief Creates a virtual file from a memory pointer.
  *
  * @param[in] virtual_name A virtual name for Eina_File, if @c NULL, a generated one will be given
  * @param[in] data The memory pointer to take data from
@@ -523,7 +512,7 @@ EAPI Eina_File *
 eina_file_virtualize(const char *virtual_name, const void *data, unsigned long long length, Eina_Bool copy) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
- * @brief Tells if a file is a real file or only exist in memory
+ * @brief Tells if a file is a real file or only exist in memory.
  *
  * @param file The file to test
  * @return #EINA_TRUE if the file is a virtual file
@@ -534,14 +523,13 @@ EAPI Eina_Bool
 eina_file_virtual(Eina_File *file) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
- * @brief Refreshes file information
+ * @brief Refreshes file information.
+ * @details All current map continue to exist. You need to manually delete
+ *          and recreate them to have the new correct mapping.
  *
  * @param file The file to refresh
  * @return #EINA_TRUE if the file has changed
  *
- * @details All current map continue to exist. You need to manually delete
- *          and recreate them to have the new correct mapping.
- *
  * @since 1.8
  */
 EAPI Eina_Bool eina_file_refresh(Eina_File *file);
@@ -560,11 +548,10 @@ EAPI Eina_File * eina_file_dup(const Eina_File *file);
 
 /**
  * @brief Unrefs the file handler.
+ * @details This decrements the file's reference count and if it reaches zero it closes the file.
  *
  * @param[in] file The file handler to unref
  *
- * @details This decrements the file's reference count and if it reaches zero it closes the file.
- *
  * @since 1.1
  */
 EAPI void eina_file_close(Eina_File *file);
@@ -666,7 +653,10 @@ EAPI void *eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
 EAPI void eina_file_map_free(Eina_File *file, void *map);
 
 /**
- * @brief Ask the OS to populate or otherwise pages of memory in file mapping
+ * @brief Asks the OS to populate or otherwise pages of memory in file mapping.
+ * @details This advises the operating system as to what to do with the memory mapped
+ *          to the given @p file. This affects a specific range of memory and may not
+ *          be honoured if the system chooses to ignore the request.
  * 
  * @param[in] file The file handle from which the map comes
  * @param[in] rule The rule to apply to the mapped memory
@@ -674,10 +664,6 @@ EAPI void eina_file_map_free(Eina_File *file, void *map);
  * @param[in] offset The offset in bytes from the start of the map address
  * @param [in]length The length in bytes of the memory region to populate
  * 
- * @details This advises the operating system as to what to do with the memory mapped
- *          to the given @p file. This affects a specific range of memory and may not
- *          be honored if the system chooses to ignore the request.
- * 
  * @since 1.8
  */
 EAPI void
@@ -686,20 +672,19 @@ eina_file_map_populate(Eina_File *file, Eina_File_Populate rule, const void *map
 
 /**
  * @brief Maps line by line in the memory efficiently using an #Eina_Iterator.
- *
- * @param[in] file The file to run over
- * @return An Eina_Iterator that produces #Eina_File_Line
- *
  * @details This function returns an iterator that acts like fgets without
  *          useless memcpy. Be aware that once eina_iterator_next has been called,
  *          nothing can guarantee that the memory is still going to be mapped.
  *
+ * @param[in] file The file to run over
+ * @return An Eina_Iterator that produces #Eina_File_Line
+ *
  * @since 1.3
  */
 EAPI Eina_Iterator *eina_file_map_lines(Eina_File *file);
 
 /**
- * @brief Tells whether there has been an IO error during the life of a mmaped file,
+ * @brief Tells whether there has been an IO error during the life of a mmaped file.
  *
  * @param[in] file The file handler to the mmaped file
  * @param[in] map The memory map to check if an error occurred on it
@@ -710,7 +695,9 @@ EAPI Eina_Iterator *eina_file_map_lines(Eina_File *file);
 EAPI Eina_Bool eina_file_map_faulted(Eina_File *file, void *map);
 
 /**
- * @brief Join two paths of known length.
+ * @brief Joins two paths of known length.
+ * @details This function is similar to eina_str_join_len(), but the separator
+ *          is '\' on Windows and '/' otherwise.
  *
  * @param dst The buffer to store the result.
  * @param size Size (in byte) of the buffer.
@@ -720,9 +707,6 @@ EAPI Eina_Bool eina_file_map_faulted(Eina_File *file, void *map);
  * @param b_len length of @p b.
  * @return The number of characters printed.
  *
- * This function is similar to eina_str_join_len(), but the separator
- * is '\' on Windows and '/' otherwise.
- *
  * @see eina_str_join_len()
  * @see eina_file_path_join()
  *
@@ -736,7 +720,10 @@ static inline size_t eina_file_path_join_len(char *dst,
                                              size_t b_len);
 
 /**
- * @brief Join two paths of known length.
+ * @brief Joins two paths of known length.
+ * @details This function is similar to eina_file_path_join_len(), but will compute
+ *          the length of @p a and @p b using strlen(). The path separator is
+ *          '\' on Windows and '/' otherwise.
  *
  * @param dst The buffer to store the result.
  * @param size Size (in byte) of the buffer.
@@ -744,10 +731,6 @@ static inline size_t eina_file_path_join_len(char *dst,
  * @param b Second string to use.
  * @return The number of characters printed.
  *
- * This function is similar to eina_file_path_join_len(), but will compute
- * the length of @p a and @p b using strlen(). The path separator is
- * '\' on Windows and '/' otherwise.
- *
  * @see eina_file_path_join_len()
  *
  * @since 1.16
@@ -759,14 +742,13 @@ static inline size_t eina_file_path_join(char *dst,
 
 
 /**
- * @brief Unlink file
+ * @brief Unlinks file.
+ * @details This function is a wrapper around the unlink() system call. It removes a link to
+ *          a file.
  *
  * @param pathname File name to unlink.
  * @return #EINA_TRUE if the unlink was successfull, #EINA_FALSE otherwise..
  *
- * This function is a wrapper around the unlink() system call. It removes a link to
- * a file.
- *
  * @since 1.19
  */
 EAPI Eina_Bool eina_file_unlink(const char *pathname);
diff --git a/src/lib/eina/eina_fp.h b/src/lib/eina/eina_fp.h
index 80aefff7a5..b176aca62e 100644
--- a/src/lib/eina/eina_fp.h
+++ b/src/lib/eina/eina_fp.h
@@ -76,7 +76,7 @@ typedef int32_t Eina_F16p16;
 typedef int32_t Eina_F8p24;
 
 /**
- * @brief Create a new Eina_F32p32 floating point number from standard 32-bit
+ * @brief Creates a new Eina_F32p32 floating point number from standard 32-bit
  * integer
  *
  * @param v 32-bit integer value to convert
@@ -85,7 +85,7 @@ typedef int32_t Eina_F8p24;
 static inline Eina_F32p32  eina_f32p32_int_from(int32_t v);
 
 /**
- * @brief Create a new standard 32-bit integer from Eina_F32p32 floating point
+ * @brief Creates a new standard 32-bit integer from Eina_F32p32 floating point
  * number
  *
  * @param v Eina_F32p32 value to convert
@@ -94,15 +94,15 @@ static inline Eina_F32p32  eina_f32p32_int_from(int32_t v);
 static inline int32_t      eina_f32p32_int_to(Eina_F32p32 v);
 
 /**
- * @brief Create a new Eina_F32p32 floating point number from standard double
+ * @brief Creates a new Eina_F32p32 floating point number from standard double
  *
- * @param v double value to convert
+ * @param v Double value to convert
  * @return The value converted into Eina_F32p32 format
  */
 static inline Eina_F32p32  eina_f32p32_double_from(double v);
 
 /**
- * @brief Create a new standard double from Eina_F32p32 floating point
+ * @brief Creates a new standard double from Eina_F32p32 floating point
  * number
  *
  * @param v Eina_F32p32 value to convert
@@ -120,11 +120,11 @@ static inline double       eina_f32p32_double_to(Eina_F32p32 v);
 static inline Eina_F32p32  eina_f32p32_add(Eina_F32p32 a, Eina_F32p32 b);
 
 /**
- * @brief Calculates the substraction of two Eina_F32p32 floating point numbers
+ * @brief Calculates the subtraction of two Eina_F32p32 floating point numbers
  *
  * @param a The first number
- * @param b The substracted number
- * @return The substaction result of the two numbers @p a - @p b
+ * @param b The subtracted number
+ * @return The subtraction result of the two numbers @p a - @p b
  */
 static inline Eina_F32p32  eina_f32p32_sub(Eina_F32p32 a, Eina_F32p32 b);
 
@@ -133,7 +133,7 @@ static inline Eina_F32p32  eina_f32p32_sub(Eina_F32p32 a, Eina_F32p32 b);
  *
  * @param a The first number
  * @param b The second number
- * @return The mutliplication result of the two numbers @p a * @p b
+ * @return The multiplication result of the two numbers @p a * @p b
  *
  * To prevent overflow during multiplication we need to reduce the precision of
  * the fraction part Shift both values to only contain 16 bit of the fraction
@@ -148,7 +148,7 @@ static inline Eina_F32p32  eina_f32p32_mul(Eina_F32p32 a, Eina_F32p32 b);
  *
  * @param a The Eina_F32p32 number
  * @param b The integer value
- * @return The mutliplication result of the two numbers @p a * @p b
+ * @return The multiplication result of the two numbers @p a * @p b
  */
 static inline Eina_F32p32  eina_f32p32_scale(Eina_F32p32 a, int b);
 
@@ -170,7 +170,7 @@ static inline Eina_F32p32  eina_f32p32_div(Eina_F32p32 a, Eina_F32p32 b);
 static inline Eina_F32p32  eina_f32p32_sqrt(Eina_F32p32 a);
 
 /**
- * @brief Get the absolute value of the integer part of and Eina_F32p32 floating
+ * @brief Gets the absolute value of the integer part of and Eina_F32p32 floating
  * point number
  *
  * @param v The floating point number
@@ -179,7 +179,7 @@ static inline Eina_F32p32  eina_f32p32_sqrt(Eina_F32p32 a);
 static inline unsigned int eina_f32p32_fracc_get(Eina_F32p32 v);
 
 /**
- * @brief Get the absolute value of an Eina_F32p32 floating point number
+ * @brief Gets the absolute value of an Eina_F32p32 floating point number
  *
  * @param a The floating point number
  * @return The absolute value for the number @p a
@@ -220,7 +220,7 @@ EAPI Eina_F32p32           eina_f32p32_sin(Eina_F32p32 a);
 #define EINA_F16P16_HALF (1 << 15)
 
 /**
- * @brief Create a new Eina_F16p316 floating point number from standard 32-bit
+ * @brief Creates a new Eina_F16p316 floating point number from standard 32-bit
  * integer
  *
  * @param v 32-bit integer value to convert
@@ -229,7 +229,7 @@ EAPI Eina_F32p32           eina_f32p32_sin(Eina_F32p32 a);
 static inline Eina_F16p16  eina_f16p16_int_from(int32_t v);
 
 /**
- * @brief Create a new standard 32-bit integer from Eina_F16p16 floating point
+ * @brief Creates a new standard 32-bit integer from Eina_F16p16 floating point
  * number 
  *
  * @param v Eina_F16p16 value to convert
@@ -238,15 +238,15 @@ static inline Eina_F16p16  eina_f16p16_int_from(int32_t v);
 static inline int32_t      eina_f16p16_int_to(Eina_F16p16 v);
 
 /**
- * @brief Create a new Eina_F16p16 floating point number from standard double
+ * @brief Creates a new Eina_F16p16 floating point number from standard double
  *
- * @param v double value to convert
+ * @param v Double value to convert
  * @return The value converted into Eina_F16p16 format
  */
 static inline Eina_F16p16  eina_f16p16_double_from(double v);
 
 /**
- * @brief Create a new standard double from Eina_F16p16 floating point
+ * @brief Creates a new standard double from Eina_F16p16 floating point
  * number 
  *
  * @param v Eina_F16p16 value to convert
@@ -255,15 +255,15 @@ static inline Eina_F16p16  eina_f16p16_double_from(double v);
 static inline double       eina_f16p16_double_to(Eina_F16p16 v);
 
 /**
- * @brief Create a new Eina_F16p16 floating point number from standard float
+ * @brief Creates a new Eina_F16p16 floating point number from standard float
  *
- * @param v float value to convert
+ * @param v Float value to convert
  * @return The value converted into Eina_F16p16 format
  */
 static inline Eina_F16p16  eina_f16p16_float_from(float v);
 
 /**
- * @brief Create a new standard float from Eina_F16p16 floating point
+ * @brief Creates a new standard float from Eina_F16p16 floating point
  * number
  *
  * @param v Eina_F16p16 value to convert
@@ -281,11 +281,11 @@ static inline float        eina_f16p16_float_to(Eina_F16p16 v);
 static inline Eina_F16p16  eina_f16p16_add(Eina_F16p16 a, Eina_F16p16 b);
 
 /**
- * @brief Calculates the substraction of two Eina_F16p16 floating point numbers
+ * @brief Calculates the subtraction of two Eina_F16p16 floating point numbers
  *
  * @param a The first number
- * @param b The substracted number
- * @return The substaction result of the two numbers @p a - @p b
+ * @param b The subtracted number
+ * @return The subtraction result of the two numbers @p a - @p b
  */
 static inline Eina_F16p16  eina_f16p16_sub(Eina_F16p16 a, Eina_F16p16 b);
 
@@ -294,7 +294,7 @@ static inline Eina_F16p16  eina_f16p16_sub(Eina_F16p16 a, Eina_F16p16 b);
  *
  * @param a The first number
  * @param b The second number
- * @return The mutliplication result of the two numbers @p a * @p b
+ * @return The multiplication result of the two numbers @p a * @p b
  */
 static inline Eina_F16p16  eina_f16p16_mul(Eina_F16p16 a, Eina_F16p16 b);
 
@@ -304,7 +304,7 @@ static inline Eina_F16p16  eina_f16p16_mul(Eina_F16p16 a, Eina_F16p16 b);
  *
  * @param a The Eina_F16p16 number
  * @param b The integer value
- * @return The mutliplication result of the two numbers @p a * @p b
+ * @return The multiplication result of the two numbers @p a * @p b
  */
 static inline Eina_F16p16  eina_f16p16_scale(Eina_F16p16 a, int b);
 
@@ -326,7 +326,7 @@ static inline Eina_F16p16  eina_f16p16_div(Eina_F16p16 a, Eina_F16p16 b);
 static inline Eina_F16p16  eina_f16p16_sqrt(Eina_F16p16 a);
 
 /**
- * @brief Get the absolute value of the integer part of and Eina_F16p16 floating
+ * @brief Gets the absolute value of the integer part of and Eina_F16p16 floating
  * point number
  *
  * @param v The floating point number
@@ -336,7 +336,7 @@ static inline unsigned int eina_f16p16_fracc_get(Eina_F16p16 v);
 
 
 /**
- * @brief Create a new Eina_F16p316 floating point number from standard 32-bit
+ * @brief Creates a new Eina_F16p316 floating point number from standard 32-bit
  * integer
  *
  * @param v 32-bit integer value to convert
@@ -345,7 +345,7 @@ static inline unsigned int eina_f16p16_fracc_get(Eina_F16p16 v);
 static inline Eina_F8p24   eina_f8p24_int_from(int32_t v);
 
 /**
- * @brief Create a new standard 32-bit integer from Eina_F8p24 floating point
+ * @brief Creates a new standard 32-bit integer from Eina_F8p24 floating point
  * number
  *
  * @param v Eina_F8p24 value to convert
@@ -354,9 +354,9 @@ static inline Eina_F8p24   eina_f8p24_int_from(int32_t v);
 static inline int32_t      eina_f8p24_int_to(Eina_F8p24 v);
 
 /**
- * @brief Create a new Eina_F8p24 floating point number from standard float
+ * @brief Creates a new Eina_F8p24 floating point number from standard float
  *
- * @param v float value to convert
+ * @param v Float value to convert
  * @return The value converted into Eina_F8p24 format
  */
 static inline Eina_F8p24   eina_f8p24_float_from(float v);
@@ -379,11 +379,11 @@ static inline float        eina_f8p24_float_to(Eina_F8p24 v);
 static inline Eina_F8p24   eina_f8p24_add(Eina_F8p24 a, Eina_F8p24 b);
 
 /**
- * @brief Calculates the substraction of two Eina_F8p24 floating point numbers
+ * @brief Calculates the subtraction of two Eina_F8p24 floating point numbers
  *
  * @param a The first number
- * @param b The substracted number
- * @return The substaction result of the two numbers @p a - @p b
+ * @param b The subtracted number
+ * @return The subtraction result of the two numbers @p a - @p b
  */
 static inline Eina_F8p24   eina_f8p24_sub(Eina_F8p24 a, Eina_F8p24 b);
 
@@ -392,7 +392,7 @@ static inline Eina_F8p24   eina_f8p24_sub(Eina_F8p24 a, Eina_F8p24 b);
  *
  * @param a The first number
  * @param b The second number
- * @return The mutliplication result of the two numbers @p a * @p b
+ * @return The multiplication result of the two numbers @p a * @p b
  */
 static inline Eina_F8p24   eina_f8p24_mul(Eina_F8p24 a, Eina_F8p24 b);
 
@@ -402,7 +402,7 @@ static inline Eina_F8p24   eina_f8p24_mul(Eina_F8p24 a, Eina_F8p24 b);
  *
  * @param a The Eina_F16p16 number
  * @param b The integer value
- * @return The mutliplication result of the two numbers @p a * @p b
+ * @return The multiplication result of the two numbers @p a * @p b
  */
 static inline Eina_F8p24   eina_f8p24_scale(Eina_F8p24 a, int b);
 
@@ -424,7 +424,7 @@ static inline Eina_F8p24   eina_f8p24_div(Eina_F8p24 a, Eina_F8p24 b);
 static inline Eina_F8p24   eina_f8p24_sqrt(Eina_F8p24 a);
 
 /**
- * @brief Get the absolute value of the integer part of and Eina_F8p24 floating
+ * @brief Gets the absolute value of the integer part of and Eina_F8p24 floating
  * point number
  *
  * @param v The floating point number
diff --git a/src/lib/eina/eina_hamster.h b/src/lib/eina/eina_hamster.h
index bea759d57f..e5b7129f04 100644
--- a/src/lib/eina/eina_hamster.h
+++ b/src/lib/eina/eina_hamster.h
@@ -39,7 +39,7 @@
 
 
 /**
- * @brief Get the hamster count.
+ * @brief Gets the hamster count.
  *
  * @return The number of available hamsters.
  *
diff --git a/src/lib/eina/eina_hash.h b/src/lib/eina/eina_hash.h
index 5f953bf865..e66442066f 100644
--- a/src/lib/eina/eina_hash.h
+++ b/src/lib/eina/eina_hash.h
@@ -77,7 +77,7 @@
  * @until printf("\n");
  *
  * There are different ways of iterate over the entries of a hash. Here we show
- * two of them: using @ref eina_hash_foreach and @ref Eina_Iterator .
+ * two of them: using @ref eina_hash_foreach and @ref Eina_Iterator.
  *
  * @skip List of phones
  * @until eina_iterator_free(it);
@@ -346,7 +346,7 @@ typedef Eina_Bool    (*Eina_Hash_Foreach)(const Eina_Hash *hash, const void *key
 
 
 /**
- * @brief Create a new hash table.
+ * @brief Creates a new hash table.
  *
  * @param key_length_cb The function called when getting the size of the key.
  * @param key_cmp_cb The function called when comparing the keys.
@@ -381,7 +381,7 @@ EAPI Eina_Hash *eina_hash_new(Eina_Key_Length key_length_cb,
                               int             buckets_power_size) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2, 3);
 
 /**
- * @brief Redefine the callback that clean the data of a hash
+ * @brief Redefines the callback that clean the data of a hash.
  *
  * @param hash The given hash table
  * @param data_free_cb The function called on each value when the hash
@@ -397,7 +397,7 @@ EAPI Eina_Hash *eina_hash_new(Eina_Key_Length key_length_cb,
 EAPI void eina_hash_free_cb_set(Eina_Hash *hash, Eina_Free_Cb data_free_cb) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Create a new hash table using the djb2 algorithm.
+ * @brief Creates a new hash table using the djb2 algorithm.
  *
  * @param data_free_cb The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -412,7 +412,7 @@ EAPI void eina_hash_free_cb_set(Eina_Hash *hash, Eina_Free_Cb data_free_cb) EINA
 EAPI Eina_Hash *eina_hash_string_djb2_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Create a new hash table for use with strings.
+ * @brief Creates a new hash table for use with strings.
  *
  * @param data_free_cb The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -431,7 +431,7 @@ EAPI Eina_Hash *eina_hash_string_djb2_new(Eina_Free_Cb data_free_cb);
 EAPI Eina_Hash *eina_hash_string_superfast_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Create a new hash table for use with strings with small bucket size.
+ * @brief Creates a new hash table for use with strings with small bucket size.
  *
  * @param data_free_cb  The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -449,7 +449,7 @@ EAPI Eina_Hash *eina_hash_string_superfast_new(Eina_Free_Cb data_free_cb);
 EAPI Eina_Hash *eina_hash_string_small_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Create a new hash table for use with 32bit integers.
+ * @brief Creates a new hash table for use with 32bit integers.
  *
  * @param data_free_cb  The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -468,7 +468,7 @@ EAPI Eina_Hash *eina_hash_string_small_new(Eina_Free_Cb data_free_cb);
 EAPI Eina_Hash *eina_hash_int32_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Create a new hash table for use with 64bit integers.
+ * @brief Creates a new hash table for use with 64bit integers.
  *
  * @param data_free_cb  The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -486,7 +486,7 @@ EAPI Eina_Hash *eina_hash_int32_new(Eina_Free_Cb data_free_cb);
 EAPI Eina_Hash *eina_hash_int64_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Create a new hash table for use with pointers.
+ * @brief Creates a new hash table for use with pointers.
  *
  * @param data_free_cb  The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -512,7 +512,7 @@ EAPI Eina_Hash *eina_hash_int64_new(Eina_Free_Cb data_free_cb);
 EAPI Eina_Hash *eina_hash_pointer_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Create a new hash table optimized for stringshared values.
+ * @brief Creates a new hash table optimized for stringshared values.
  *
  * @param data_free_cb  The function called on each value when the hash table
  * is freed, or when an item is deleted from it. @c NULL can be passed as
@@ -538,7 +538,7 @@ EAPI Eina_Hash *eina_hash_pointer_new(Eina_Free_Cb data_free_cb);
 EAPI Eina_Hash *eina_hash_stringshared_new(Eina_Free_Cb data_free_cb);
 
 /**
- * @brief Add an entry to the given hash table.
+ * @brief Adds an entry to the given hash table.
  *
  * @param hash The given hash table. Cannot be @c NULL.
  * @param key A unique key. Cannot be @c NULL.
@@ -563,7 +563,7 @@ EAPI Eina_Bool  eina_hash_add(Eina_Hash  *hash,
                               const void *data) EINA_ARG_NONNULL(1, 2, 3);
 
 /**
- * @brief Add an entry to the given hash table without duplicating the string
+ * @brief Adds an entry to the given hash table without duplicating the string.
  * key.
  *
  * @param hash The given hash table. Cannot be @c NULL.
@@ -591,7 +591,7 @@ EAPI Eina_Bool eina_hash_direct_add(Eina_Hash  *hash,
                                     const void *data) EINA_ARG_NONNULL(1, 2, 3);
 
 /**
- * @brief Remove the entry identified by a key or a data from the given
+ * @brief Removes the entry identified by a key or a data from the given
  * hash table.
  *
  * @param hash The given hash table.
@@ -618,7 +618,7 @@ EAPI Eina_Bool eina_hash_del(Eina_Hash  *hash,
                              const void *data) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Retrieve a specific entry in the given hash table.
+ * @brief Retrieves a specific entry in the given hash table.
  *
  * @param hash The given hash table.
  * @param key The key of the entry to find.
@@ -634,7 +634,7 @@ EAPI void *eina_hash_find(const Eina_Hash *hash,
                           const void      *key) EINA_ARG_NONNULL(2);
 
 /**
- * @brief Modify the entry pointer at the specified key and return the old
+ * @brief Modifies the entry pointer at the specified key and return the old
  * entry.
  * @param hash The given hash table.
  * @param key The key of the entry to modify.
@@ -651,7 +651,7 @@ EAPI void *eina_hash_modify(Eina_Hash  *hash,
                             const void *data) EINA_ARG_NONNULL(1, 2, 3);
 
 /**
- * @brief Modify the entry pointer at the specified key and return the
+ * @brief Modifies the entry pointer at the specified key and return the
  * old entry or add the entry if not found.
  *
  * @param hash The given hash table.
@@ -670,7 +670,7 @@ EAPI void *eina_hash_set(Eina_Hash  *hash,
                          const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Change the key associated with a data without triggering the
+ * @brief Changes the key associated with a data without triggering the
  * free callback.
  *
  * @param hash    The given hash table.
@@ -687,7 +687,7 @@ EAPI Eina_Bool eina_hash_move(Eina_Hash  *hash,
                               const void *new_key) EINA_ARG_NONNULL(1, 2, 3);
 
 /**
- * Free the given hash table resources.
+ * @brief Frees the given hash table resources.
  *
  * @param hash The hash table to be freed.
  *
@@ -711,7 +711,7 @@ EAPI Eina_Bool eina_hash_move(Eina_Hash  *hash,
 EAPI void      eina_hash_free(Eina_Hash *hash) EINA_ARG_NONNULL(1);
 
 /**
- * Free the given hash table buckets resources.
+ * @brief Frees the given hash table buckets resources.
  *
  * @param hash The hash table whose buckets have to be freed.
  *
@@ -736,7 +736,7 @@ EAPI void      eina_hash_free_buckets(Eina_Hash *hash) EINA_ARG_NONNULL(1);
 EAPI int       eina_hash_population(const Eina_Hash *hash) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Add an entry to the given hash table.
+ * @brief Adds an entry to the given hash table.
  *
  * @param hash The given hash table. Cannot be @c NULL.
  * @param key A unique key. Cannot be @c NULL.
@@ -766,7 +766,7 @@ EAPI Eina_Bool eina_hash_add_by_hash(Eina_Hash  *hash,
                                      const void *data) EINA_ARG_NONNULL(1, 2, 5);
 
 /**
- * @brief Add an entry to the given hash table and do not duplicate the string
+ * @brief Adds an entry to the given hash table and do not duplicate the string
  * key.
  *
  * @param hash The given hash table. Cannot be @c NULL.
@@ -800,7 +800,7 @@ EAPI Eina_Bool eina_hash_direct_add_by_hash(Eina_Hash  *hash,
                                             const void *data) EINA_ARG_NONNULL(1, 2, 5);
 
 /**
- * @brief Remove the entry identified by a key and a key hash from the given
+ * @brief Removes the entry identified by a key and a key hash from the given
  * hash table.
  *
  * @param hash The given hash table. Cannot be @c NULL.
@@ -817,8 +817,8 @@ EAPI Eina_Bool eina_hash_direct_add_by_hash(Eina_Hash  *hash,
  * functions returns immediately #EINA_FALSE. This function
  * returns #EINA_FALSE if an error occurred, #EINA_TRUE otherwise.
  *
- * @note if you don't have the key_hash, use eina_hash_del_by_key() instead.
- * @note if you don't have the key, use eina_hash_del_by_data() instead.
+ * @note If you don't have the key_hash, use eina_hash_del_by_key() instead.
+ * @note If you don't have the key, use eina_hash_del_by_data() instead.
  */
 EAPI Eina_Bool eina_hash_del_by_key_hash(Eina_Hash  *hash,
                                          const void *key,
@@ -826,7 +826,7 @@ EAPI Eina_Bool eina_hash_del_by_key_hash(Eina_Hash  *hash,
                                          int         key_hash) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Remove the entry identified by a key from the given hash table.
+ * @brief Removes the entry identified by a key from the given hash table.
  *
  * This version will calculate key length and hash by using functions
  * provided to hash creation function.
@@ -837,21 +837,21 @@ EAPI Eina_Bool eina_hash_del_by_key_hash(Eina_Hash  *hash,
  *
  * This function removes the entry identified by @p key from @p
  * hash. The key length and hash will be calculated automatically by
- * using functiond provided to has creation function. If a free
+ * using function provided to has creation function. If a free
  * function was given to the callback on creation, it will be called
  * for the data being deleted. If @p hash or @p key are @c NULL, the
  * functions returns immediately #EINA_FALSE. This function
  * returns #EINA_FALSE if an error occurred, #EINA_TRUE otherwise.
  *
- * @note if you already have the key_hash, use eina_hash_del_by_key_hash()
+ * @note If you already have the key_hash, use eina_hash_del_by_key_hash()
  * instead.
- * @note if you don't have the key, use eina_hash_del_by_data() instead.
+ * @note If you don't have the key, use eina_hash_del_by_data() instead.
  */
 EAPI Eina_Bool eina_hash_del_by_key(Eina_Hash  *hash,
                                     const void *key) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Remove the entry identified by a data from the given hash table.
+ * @brief Removes the entry identified by a data from the given hash table.
  *
  * This version is slow since there is no quick access to nodes based on data.
  *
@@ -867,14 +867,14 @@ EAPI Eina_Bool eina_hash_del_by_key(Eina_Hash  *hash,
  * function returns #EINA_FALSE if an error occurred, #EINA_TRUE
  * otherwise.
  *
- * @note if you already have the key, use eina_hash_del_by_key() or
+ * @note If you already have the key, use eina_hash_del_by_key() or
  * eina_hash_del_by_key_hash() instead.
  */
 EAPI Eina_Bool eina_hash_del_by_data(Eina_Hash  *hash,
                                      const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Remove the entry identified by a key and a key hash or a
+ * @brief Removes the entry identified by a key and a key hash or a
  * data from the given hash table.
  *
  * If @p key is @c NULL, then @p data is used to find a match to
@@ -898,8 +898,8 @@ EAPI Eina_Bool eina_hash_del_by_data(Eina_Hash  *hash,
  * string when setting the value of @p key_length. This function
  * returns #EINA_FALSE if an error occurred, #EINA_TRUE otherwise.
  *
- * @note if you know you already have the key, use eina_hash_del_by_key_hash(),
- *       if you know you don't have the key, use eina_hash_del_by_data()
+ * @note If you know you already have the key, use eina_hash_del_by_key_hash(),
+ *       If you know you don't have the key, use eina_hash_del_by_data()
  *       directly.
  */
 EAPI Eina_Bool eina_hash_del_by_hash(Eina_Hash  *hash,
@@ -909,7 +909,7 @@ EAPI Eina_Bool eina_hash_del_by_hash(Eina_Hash  *hash,
                                      const void *data) EINA_ARG_NONNULL(1);
 
 /**
- * @brief Retrieve a specific entry in the given hash table.
+ * @brief Retrieves a specific entry in the given hash table.
  *
  * @param hash The given hash table. Cannot be @c NULL.
  * @param key The key of the entry to find.
@@ -931,7 +931,7 @@ EAPI void *eina_hash_find_by_hash(const Eina_Hash *hash,
                                   int              key_hash) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Modify the entry pointer at the specified key and returns
+ * @brief Modifies the entry pointer at the specified key and returns
  * the old entry.
  *
  * @param hash The given hash table.
@@ -952,7 +952,7 @@ EAPI void *eina_hash_modify_by_hash(Eina_Hash  *hash,
                                     const void *data) EINA_ARG_NONNULL(1, 2, 5);
 
 /**
- * @brief Returned a new iterator associated to hash keys.
+ * @brief Returns a new iterator associated to hash keys.
  *
  * @param hash The hash.
  * @return A new iterator.
@@ -972,7 +972,7 @@ EAPI void *eina_hash_modify_by_hash(Eina_Hash  *hash,
 EAPI Eina_Iterator *eina_hash_iterator_key_new(const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Returned a new iterator associated to hash data.
+ * @brief Returns a new iterator associated to hash data.
  *
  * @param hash The hash.
  * @return A new iterator.
@@ -1005,7 +1005,7 @@ EAPI Eina_Iterator *eina_hash_iterator_data_new(const Eina_Hash *hash) EINA_MALL
  * If the memory can not be allocated, @c NULL is returned.
  * Otherwise, a valid iterator is returned.
  *
- * @note iterator data will provide values as Eina_Hash_Tuple that should not
+ * @note Iterator data will provide values as Eina_Hash_Tuple that should not
  *   be modified!
  *
  * @warning if the hash structure changes then the iterator becomes
@@ -1015,7 +1015,7 @@ EAPI Eina_Iterator *eina_hash_iterator_data_new(const Eina_Hash *hash) EINA_MALL
 EAPI Eina_Iterator *eina_hash_iterator_tuple_new(const Eina_Hash *hash) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
- * @brief Call a function on every member stored in the hash table
+ * @brief Calls a function on every member stored in the hash table.
  *
  * @param hash The hash table whose members will be walked
  * @param func The function to call on each parameter
@@ -1055,7 +1055,7 @@ EAPI void           eina_hash_foreach(const Eina_Hash  *hash,
 
 
 /**
- * @brief Append data to an #Eina_List inside a hash
+ * @brief Appends data to an #Eina_List inside a hash.
  *
  * This function is identical to the sequence of calling
  * eina_hash_find(), eina_list_append(), eina_hash_set(),
@@ -1067,7 +1067,7 @@ EAPI void           eina_hash_foreach(const Eina_Hash  *hash,
  */
 EAPI void eina_hash_list_append(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
 /**
- * @brief Prepend data to an #Eina_List inside a hash
+ * @brief Prepends data to an #Eina_List inside a hash.
  *
  * This function is identical to the sequence of calling
  * eina_hash_find(), eina_list_prepend(), eina_hash_set(),
@@ -1079,7 +1079,7 @@ EAPI void eina_hash_list_append(Eina_Hash *hash, const void *key, const void *da
  */
 EAPI void eina_hash_list_prepend(Eina_Hash *hash, const void *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
 /**
- * @brief Remove data from an #Eina_List inside a hash
+ * @brief Removes data from an #Eina_List inside a hash.
  *
  * This function is identical to the sequence of calling
  * eina_hash_find(), eina_list_remove(), eina_hash_set(),
diff --git a/src/lib/eina/eina_inarray.h b/src/lib/eina/eina_inarray.h
index 2f95665049..7bba977a5b 100644
--- a/src/lib/eina/eina_inarray.h
+++ b/src/lib/eina/eina_inarray.h
@@ -166,7 +166,7 @@
  *
  * We then add element using eina_inarray_insert and print. Then remove that
  * element and add again using eina_inarray_insert_sorted and prints. This
- * shows the 2 different positions the elment gets added. Then searches an
+ * shows the 2 different positions the element gets added. Then searches an
  * element in the unsorted array using eina_inarray_search, then sorts the
  * array and then searches the same element using eina_inarray_search_sorted.
  * @until }
@@ -236,15 +236,14 @@ struct _Eina_Inarray
 
 /**
  * @brief Creates a new inline array.
+ * @details This creates a new array where members are inlined in a sequence. Each
+ *          member has @a member_size bytes.
  *
  * @param[in] member_size The size of each member in the array
  * @param[in] step The step size by which to resize the array, do this using the following
  *             extra amount
  * @return The new inline array table, otherwise @c NULL on failure
  *
- * @details This creates a new array where members are inlined in a sequence. Each
- *          member has @a member_size bytes.
- *
  * @note If the @a step is @c 0, then a safe default is chosen.
  *
  * @note On failure, @c NULL is returned. If @p member_size is zero, then @c NULL is returned.
@@ -269,6 +268,8 @@ EAPI void eina_inarray_free(Eina_Inarray *array) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Initializes an inline array.
+ * @details This initializes an array. If the @p step is @c 0, then a safe default is
+ *          chosen.
  *
  * @param[in] array The array object to initialize
  * @param[in] sizeof_eina_inarray The size of array object
@@ -276,9 +277,6 @@ EAPI void eina_inarray_free(Eina_Inarray *array) EINA_ARG_NONNULL(1);
  * @param[in] step The step size by which to resize the array, do this using the following
  *            extra amount
  *
- * @details This initializes an array. If the @p step is @c 0, then a safe default is
- *          chosen.
- *
  * @note This is useful for arrays inlined into other structures or
  *       allocated to a stack.
  *
@@ -294,7 +292,6 @@ EAPI void eina_inarray_step_set(Eina_Inarray *array,
 /**
  * @brief Removes every member from the array.
  *
- *
  * @param[in] array The array object
  *
  * @since 1.2
@@ -303,15 +300,14 @@ EAPI void eina_inarray_flush(Eina_Inarray *array) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Copies the data as the last member of the array.
+ * @details This copies the given pointer contents at the end of the array. The
+ *          pointer is not referenced, instead its contents are copied to the
+ *          members array using the previously defined @c member_size.
  *
  * @param[in] array The array object
  * @param[in] data The data to be copied at the end
  * @return The index of the new member, otherwise @c -1 on errors
  *
- * @details This copies the given pointer contents at the end of the array. The
- *          pointer is not referenced, instead its contents are copied to the
- *          members array using the previously defined @c member_size.
- *
  * @see eina_inarray_insert_at()
  *
  * @since 1.2
@@ -320,7 +316,7 @@ EAPI int eina_inarray_push(Eina_Inarray *array,
                            const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
- * @brief Allocate new item at the end of the array.
+ * @brief Allocates new item at the end of the array.
  *
  * @param[in] array The array object
  * @param[in] size  The number of new item to allocate
@@ -334,17 +330,16 @@ EAPI void *eina_inarray_grow(Eina_Inarray *array, unsigned int size);
 
 /**
  * @brief Copies the data to the array at a position found by the comparison function.
+ * @details This copies the given pointer contents at the array position defined by the
+ *          given @a compare function. The pointer is not referenced, instead
+ *          its contents are copied to the members array using the previously
+ *          defined @c member_size.
  *
  * @param[in] array The array object
  * @param[in] data The data to be copied
  * @param[in] compare The compare function
  * @return The index of the new member, otherwise @c -1 on errors
  *
- * @details This copies the given pointer contents at the array position defined by the
- *          given @a compare function. The pointer is not referenced, instead
- *          its contents are copied to the members array using the previously
- *          defined @c member_size.
- *
  * @note The data given to the @p compare function is a pointer to the member
  *       memory itself, do no change it.
  *
@@ -360,17 +355,16 @@ EAPI int eina_inarray_insert(Eina_Inarray *array,
 
 /**
  * @brief Copies the data to the array at a position found by the comparison function.
+ * @details This copies the given pointer contents at the array position defined by the
+ *          given @p compare function. The pointer is not referenced, instead
+ *          its contents are copied to the members array using the previously
+ *          defined @p member_size.
  *
  * @param[in] array The array object
  * @param[in] data The data to be copied
  * @param[in] compare The compare function
  * @return The index of the new member, otherwise @c -1 on errors
  *
- * @details This copies the given pointer contents at the array position defined by the
- *          given @p compare function. The pointer is not referenced, instead
- *          its contents are copied to the members array using the previously
- *          defined @p member_size.
- *
  * @note The data given to the @p compare function is a pointer to the member
  *       memory itself, do no change it.
  *
@@ -387,15 +381,14 @@ EAPI int eina_inarray_insert_sorted(Eina_Inarray *array,
 
 /**
  * @brief Finds data and removes the matching member.
+ * @details This finds data in the array and removes it. Data may be an existing
+ *          member of the array (then optimized) or the contents are matched
+ *          using memcmp().
  *
  * @param[in] array The array object
  * @param[in] data The data to be found and removed
  * @return The index of the removed member, otherwise @c -1 on errors
  *
- * @details This finds data in the array and removes it. Data may be an existing
- *          member of the array (then optimized) or the contents are matched
- *          using memcmp().
- *
  * @see eina_inarray_pop()
  * @see eina_inarray_remove_at()
  *
@@ -418,16 +411,15 @@ EAPI void *eina_inarray_pop(Eina_Inarray *array) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Gets the member at the given position.
- *
- * @param[in] array The array object
- * @param[in] position The member position
- * @return A pointer to current the member memory
- *
  * @details This gets the member given that its position in the array is provided. It is a pointer to
  *          its current memory, then it can be invalidated with functions that
  *          change the array such as eina_inarray_push(),
  *          eina_inarray_insert_at(), or eina_inarray_remove_at(), or variants.
  *
+ * @param[in] array The array object
+ * @param[in] position The member position
+ * @return A pointer to current the member memory
+ *
  * @see eina_inarray_lookup()
  * @see eina_inarray_lookup_sorted()
  *
@@ -438,17 +430,16 @@ EAPI void *eina_inarray_nth(const Eina_Inarray *array,
 
 /**
  * @brief Copies the data at the given position in the array.
+ * @details This copies the given pointer contents at the given @p position in the
+ *          array. The pointer is not referenced, instead its contents are
+ *          copied to the members array using the previously defined
+ *          @p member_size.
  *
  * @param[in] array The array object
  * @param[in] position The position to insert the member at
  * @param[in] data The data to be copied at the position
  * @return #EINA_TRUE on success, otherwise #EINA_FALSE on failure
  *
- * @details This copies the given pointer contents at the given @p position in the
- *          array. The pointer is not referenced, instead its contents are
- *          copied to the members array using the previously defined
- *          @p member_size.
- *
  * @note All the members from @a position to the end of the array are
  *       shifted to the end.
  *
@@ -495,17 +486,16 @@ EAPI void *eina_inarray_alloc_at(Eina_Inarray *array,
 
 /**
  * @brief Copies the data to the given position.
+ * @details This copies the given pointer contents at the given @p position in the
+ *          array. The pointer is not referenced, instead its contents are
+ *          copied to the members array using the previously defined
+ *          @p member_size.
  *
  * @param[in] array The array object
  * @param[in] position The position to copy the member at
  * @param[in] data The data to be copied at the position
  * @return #EINA_TRUE on success, otherwise #EINA_FALSE on failure
  *
- * @details This copies the given pointer contents at the given @p position in the
- *          array. The pointer is not referenced, instead its contents are
- *          copied to the members array using the previously defined
- *          @p member_size.
- *
  * @note If @p position does not exist, it fails.
  *
  * @since 1.2
@@ -548,12 +538,11 @@ EAPI void eina_inarray_reverse(Eina_Inarray *array) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Applies a quick sort to the array.
+ * @details This applies a quick sort to the @a array.
  *
  * @param[in] array The array object
  * @param[in] compare The compare function
  *
- * @details This applies a quick sort to the @a array.
- *
  * @note The data given to the @a compare function is a pointer to the member
  *       memory itself, do no change it.
  *
@@ -566,15 +555,14 @@ EAPI void eina_inarray_sort(Eina_Inarray *array,
 
 /**
  * @brief Searches for a member (linear walk).
+ * @details This walks through an array by linearly looking for the given data compared by
+ *          the @p compare function.
  *
  * @param[in] array The array object
  * @param[in] data The member to search using the @p compare function
  * @param[in] compare The compare function
  * @return The member index, otherwise @c -1 if not found
  *
- * @details This walks through an array by linearly looking for the given data compared by
- *          the @p compare function.
- *
  * @note The data given to the @p compare function is a pointer to the member
  *       memory itself, do no change it.
  *
@@ -607,14 +595,13 @@ EAPI int eina_inarray_search_sorted(const Eina_Inarray *array,
 
 /**
  * @brief Calls @p function for each array member.
+ * @details This calls @p function for every given data in @p array.
  *
  * @param[in] array The array object
  * @param[in] function The callback function
  * @param[in] user_data The user data given to a callback @a function
  * @return #EINA_TRUE if it successfully iterates all the items of the array
  *
- * @details This calls @p function for every given data in @p array.
- *
  * @note This is a safe way to iterate over an array. @p function should return #EINA_TRUE
  *       as long as you want the function to continue iterating, by
  *       returning #EINA_FALSE it stops and returns #EINA_FALSE as the result.
@@ -631,15 +618,14 @@ EAPI Eina_Bool eina_inarray_foreach(const Eina_Inarray *array,
 
 /**
  * @brief Removes all the members that match.
+ * @details This removes all the entries in @p array, where the @p match function
+ *          returns #EINA_TRUE.
  *
  * @param[in] array The array object
  * @param[in] match The match function
  * @param[in] user_data The user data given to callback @p match
  * @return The number of removed entries, otherwise @c -1 on error
  *
- * @details This removes all the entries in @p array, where the @p match function
- *          returns #EINA_TRUE.
- *
  * @since 1.2
  */
 EAPI int eina_inarray_foreach_remove(Eina_Inarray *array,
@@ -669,13 +655,12 @@ EAPI unsigned int eina_inarray_count(const Eina_Inarray *array) EINA_ARG_NONNULL
 
 /**
  * @brief Returns a new iterator associated to an array.
+ * @details This function returns a newly allocated iterator associated to
+ *          @p array.
  *
  * @param[in] array The array object
  * @return A new iterator
  *
- * @details This function returns a newly allocated iterator associated to
- *          @p array.
- *
  * @note If the memory cannot be allocated, @c NULL is returned.
  *       Otherwise, a valid iterator is returned.
  *
@@ -689,13 +674,12 @@ EAPI Eina_Iterator *eina_inarray_iterator_new(const Eina_Inarray *array) EINA_MA
 
 /**
  * @brief Returns a new reversed iterator associated to an array.
+ * @details This function returns a newly allocated iterator associated to
+ *          @p array.
  *
  * @param[in] array The array object
  * @return A new iterator
  *
- * @details This function returns a newly allocated iterator associated to
- *          @p array.
- *
  * @note Unlike eina_inarray_iterator_new(), this walks through the array backwards.
  *
  * @note If the memory cannot be allocated, @c NULL is returned.
@@ -711,13 +695,12 @@ EAPI Eina_Iterator *eina_inarray_iterator_reversed_new(const Eina_Inarray *array
 
 /**
  * @brief Returns a new accessor associated to an array.
+ * @details This function returns a newly allocated accessor associated to
+ *          @p array.
  *
  * @param[in] array The array object
  * @return A new accessor
  *
- * @details This function returns a newly allocated accessor associated to
- *          @p array.
- *
  * @note If the memory cannot be allocated, @c NULL is returned
  *       Otherwise, a valid accessor is returned.
  *
diff --git a/src/lib/eina/eina_inlist.h b/src/lib/eina/eina_inlist.h
index 243e651088..79a6c6ea0f 100644
--- a/src/lib/eina/eina_inlist.h
+++ b/src/lib/eina/eina_inlist.h
@@ -420,9 +420,9 @@ struct _Eina_Inlist
 
 
 /**
- * Add a new node to end of a list.
+ * @brief Adds a new node to end of a list.
  *
- * @note this code is meant to be fast: appends are O(1) and do not
+ * @note This code is meant to be fast: appends are O(1) and do not
  *       walk @a in_list.
  *
  * @note @a in_item is considered to be in no list. If it was in another
@@ -430,18 +430,18 @@ struct _Eina_Inlist
  *       check of @a new_l prev and next pointers is done, so it's safe
  *       to have them uninitialized.
  *
- * @param in_list existing list head or @c NULL to create a new list.
- * @param in_item new list node, must not be @c NULL.
+ * @param in_list Existing list head or @c NULL to create a new list.
+ * @param in_item New list node, must not be @c NULL.
  *
- * @return the new list head. Use it and not @a in_list anymore.
+ * @return The new list head. Use it and not @a in_list anymore.
  */
 EAPI Eina_Inlist *eina_inlist_append(Eina_Inlist *in_list,
                                      Eina_Inlist *in_item) EINA_ARG_NONNULL(2) EINA_WARN_UNUSED_RESULT;
 
 /**
- * Add a new node to beginning of list.
+ * @brief Adds a new node to beginning of list.
  *
- * @note this code is meant to be fast: appends are O(1) and do not
+ * @note This code is meant to be fast: appends are O(1) and do not
  *       walk @a in_list.
  *
  * @note @a new_l is considered to be in no list. If it was in another
@@ -449,18 +449,18 @@ EAPI Eina_Inlist *eina_inlist_append(Eina_Inlist *in_list,
  *       check of @a new_l prev and next pointers is done, so it's safe
  *       to have them uninitialized.
  *
- * @param in_list existing list head or @c NULL to create a new list.
- * @param in_item new list node, must not be @c NULL.
+ * @param in_list Existing list head or @c NULL to create a new list.
+ * @param in_item New list node, must not be @c NULL.
  *
- * @return the new list head. Use it and not @a in_list anymore.
+ * @return The new list head. Use it and not @a in_list anymore.
  */
 EAPI Eina_Inlist *eina_inlist_prepend(Eina_Inlist *in_list,
                                       Eina_Inlist *in_item) EINA_ARG_NONNULL(2) EINA_WARN_UNUSED_RESULT;
 
 /**
- * Add a new node after the given relative item in list.
+ * @brief Adds a new node after the given relative item in list.
  *
- * @note this code is meant to be fast: appends are O(1) and do not
+ * @note This code is meant to be fast: appends are O(1) and do not
  *       walk @a in_list.
  *
  * @note @a in_item_l is considered to be in no list. If it was in another
@@ -473,20 +473,20 @@ EAPI Eina_Inlist *eina_inlist_prepend(Eina_Inlist *in_list,
  *       will lead to problems. Giving NULL @a in_relative is the same as
  *       eina_list_append().
  *
- * @param in_list existing list head or @c NULL to create a new list.
- * @param in_item new list node, must not be @c NULL.
- * @param in_relative reference node, @a in_item will be added after it.
+ * @param in_list Existing list head or @c NULL to create a new list.
+ * @param in_item New list node, must not be @c NULL.
+ * @param in_relative Reference node, @a in_item will be added after it.
  *
- * @return the new list head. Use it and not @a list anymore.
+ * @return The new list head. Use it and not @a list anymore.
  */
 EAPI Eina_Inlist *eina_inlist_append_relative(Eina_Inlist *in_list,
                                               Eina_Inlist *in_item,
                                               Eina_Inlist *in_relative) EINA_ARG_NONNULL(2) EINA_WARN_UNUSED_RESULT;
 
 /**
- * Add a new node before the given relative item in list.
+ * @brief Adds a new node before the given relative item in list.
  *
- * @note this code is meant to be fast: appends are O(1) and do not
+ * @note This code is meant to be fast: appends are O(1) and do not
  *       walk @a in_list.
  *
  * @note @a in_item is considered to be in no list. If it was in another
@@ -499,20 +499,20 @@ EAPI Eina_Inlist *eina_inlist_append_relative(Eina_Inlist *in_list,
  *       will lead to problems. Giving NULL @a in_relative is the same as
  *       eina_list_prepend().
  *
- * @param in_list existing list head or @c NULL to create a new list.
- * @param in_item new list node, must not be @c NULL.
- * @param in_relative reference node, @a in_item will be added before it.
+ * @param in_list Existing list head or @c NULL to create a new list.
+ * @param in_item New list node, must not be @c NULL.
+ * @param in_relative Reference node, @a in_item will be added before it.
  *
- * @return the new list head. Use it and not @a in_list anymore.
+ * @return The new list head. Use it and not @a in_list anymore.
  */
 EAPI Eina_Inlist *eina_inlist_prepend_relative(Eina_Inlist *in_list,
                                                Eina_Inlist *in_item,
                                                Eina_Inlist *in_relative) EINA_ARG_NONNULL(2) EINA_WARN_UNUSED_RESULT;
 
 /**
- * Remove node from list.
+ * @brief Removes node from list.
  *
- * @note this code is meant to be fast: appends are O(1) and do not
+ * @note This code is meant to be fast: appends are O(1) and do not
  *       walk @a list.
  *
  * @note @a in_item is considered to be inside @a in_list, no checks are
@@ -521,22 +521,22 @@ EAPI Eina_Inlist *eina_inlist_prepend_relative(Eina_Inlist *in_list,
  *       it will be different from @a list and the wrong new head will
  *       be returned.
  *
- * @param in_list existing list head, must not be @c NULL.
- * @param in_item existing list node, must not be @c NULL.
+ * @param in_list Existing list head, must not be @c NULL.
+ * @param in_item Existing list node, must not be @c NULL.
  *
- * @return the new list head. Use it and not @a list anymore.
+ * @return The new list head. Use it and not @a list anymore.
  */
 EAPI Eina_Inlist   *eina_inlist_remove(Eina_Inlist *in_list,
                                        Eina_Inlist *in_item) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;