From 7760613107f164f14e706deb96c0ae9ac6614417 Mon Sep 17 00:00:00 2001
From: "Myoungwoon Roy, Kim" <myoungwoon.kim@samsung.com>
Date: Thu, 16 Feb 2017 10:16:49 -0800
Subject: [PATCH] doxygen: fix typos and some wrong expressions in Edje and Eet
 API reference documentation.

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

Test Plan: Doxygen Revision

Reviewers: stefan, cedric, raster, Jaehyun_Cho, jpeg

Subscribers: conr2d

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

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
---
 src/lib/edje/Edje.h        |    2 +-
 src/lib/edje/Edje_Common.h |  296 +++--
 src/lib/edje/Edje_Edit.h   | 2193 +++++++++++++++++++++++-------------
 src/lib/edje/Edje_Legacy.h |   40 +-
 src/lib/eet/Eet.h          |  777 ++++++-------
 5 files changed, 1960 insertions(+), 1348 deletions(-)

diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index c13292f3d9..82f3cbac2d 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -197,7 +197,7 @@ param in edje programs
 
 /**
  * @file Edje.h
- * @brief Edje Graphical Design Library
+ * @brief Edje Graphical Design Library.
  *
  * These routines are used for Edje.
  */
diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h
index 243a28ca00..c39e0ceb06 100644
--- a/src/lib/edje/Edje_Common.h
+++ b/src/lib/edje/Edje_Common.h
@@ -2,11 +2,11 @@
 
 /**
  * @internal
+ * @ingroup Edje_General_Group
  *
  * @typedef Edje_Version
  * Type for edje version
  *
- * @ingroup Edje_General_Group
  */
 typedef struct _Edje_Version
 {
@@ -75,6 +75,7 @@ struct _Edje_Size_Class
 
 /**
  * @defgroup Edje_Object_Communication_Interface_Signal Edje Communication Interface: Signal
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with signals.
  *
@@ -85,17 +86,15 @@ struct _Edje_Size_Class
  * emit a signal from @b code to a @b theme or create handles for
  * the ones emitted from @b themes. Signals are identified by strings.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 typedef void         (*Edje_Signal_Cb)          (void *data, Evas_Object *obj, const char *emission, const char *source); /**< Edje signal callback functions's prototype definition. @c data will have the auxiliary data pointer set at the time the callback registration. @c obj will be a pointer the Edje object where the signal comes from. @c emission will identify the exact signal's emission string and @c source the exact signal's source one. */
 
 /**
- * @brief Get extra data passed to callbacks.
+ * @brief Gets extra data passed to callbacks.
  *
- * @return the extra data for that callback.
+ * @return The extra data for that callback.
  *
  * Some callbacks pass extra information. This function gives access to that
  * extra information. It's somehow like event_info in smart callbacks.
@@ -123,7 +122,7 @@ EAPI void *       edje_object_signal_callback_extra_data_get(void);
  */
 
 /**
- * @brief Initialize the Edje library.
+ * @brief Initializes the Edje library.
  *
  * @return The new init count. The initial value is zero.
  *
@@ -144,7 +143,7 @@ EAPI void *       edje_object_signal_callback_extra_data_get(void);
 EAPI int          edje_init                       (void);
 
 /**
- * @brief Shutdown the Edje library.
+ * @brief Shuts down the Edje library.
  *
  * @return The number of times the library has been initialized
  *         without being shutdown.
@@ -165,7 +164,7 @@ EAPI int          edje_init                       (void);
 EAPI int		edje_shutdown			(void);
 
 /**
- * @brief Set the edje append fontset.
+ * @brief Sets the edje append fontset.
  *
  * @param fonts The fontset to append.
  *
@@ -175,10 +174,10 @@ EAPI int		edje_shutdown			(void);
 EAPI void		edje_fontset_append_set		(const char *fonts);
 
 /**
- * Get data from the file level data block of an edje mapped file
+ * @brief Gets data from the file level data block of an edje mapped file.
  * @param f The mapped edje file
  * @param key The data key
- * @return The string value of the data or NULL if no key is found.
+ * @return The string value of the data, or @c NULL if no key is found.
  * Must be freed by the user when no longer needed.
  *
  * If an edje file test.edj is built from the following edc:
@@ -194,10 +193,10 @@ EAPI void		edje_fontset_append_set		(const char *fonts);
 EAPI char             *edje_mmap_data_get(const Eina_File *f, const char *key);
 
 /**
- * Get data from the file level data block of an edje file
+ * @brief Gets data from the file level data block of an edje file.
  * @param file The path to the .edj file
  * @param key The data key
- * @return The string value of the data or NULL if no key is found.
+ * @return The string value of the data, or @c NULL if no key is found.
  * Must be freed by the user when no longer needed.
  *
  * If an edje file test.edj is built from the following edc:
@@ -215,9 +214,9 @@ EAPI char             *edje_mmap_data_get(const Eina_File *f, const char *key);
 EAPI char        *edje_file_data_get              (const char *file, const char *key);
 
 /**
- * @brief Load a new module in Edje.
+ * @brief Loads a new module in Edje.
  * @param module The name of the module that will be added to Edje.
- * @return EINA_TRUE if the module was successfully loaded. Otherwise, EINA_FALSE.
+ * @return @c EINA_TRUE if the module was successfully loaded. Otherwise, @c EINA_FALSE.
  *
  * Modules are used to add functionality to Edje.
  * So, when a module is loaded, its functionality should be available for use.
@@ -237,7 +236,7 @@ EAPI Eina_Bool               edje_module_load                (const char *module
 EAPI const Eina_List        *edje_available_modules_get      (void);
 
 /**
- * @brief Get the edje append fontset.
+ * @brief Gets the edje append fontset.
  *
  * @return The edje append fontset.
  *
@@ -250,7 +249,7 @@ EAPI const Eina_List        *edje_available_modules_get      (void);
 EAPI const char		*edje_fontset_append_get	(void);
 
 /**
- * @brief Set the file cache size.
+ * @brief Sets the file cache size.
  *
  * @param count The file cache size in edje file units. Default is 16.
  *
@@ -265,7 +264,7 @@ EAPI const char		*edje_fontset_append_get	(void);
 EAPI void         edje_file_cache_set             (int count);
 
 /**
- * @brief Return the file cache size.
+ * @brief Returns the file cache size.
  *
  * @return The file cache size in edje file units. Default is 16.
  *
@@ -279,7 +278,7 @@ EAPI void         edje_file_cache_set             (int count);
 EAPI int          edje_file_cache_get             (void);
 
 /**
- * @brief Clean the file cache.
+ * @brief Cleans the file cache.
  *
  * This function cleans the file cache entries, but keeps this cache's
  * size to the last value set.
@@ -291,7 +290,7 @@ EAPI int          edje_file_cache_get             (void);
 EAPI void         edje_file_cache_flush           (void);
 
 /**
- * @brief Set the collection cache size.
+ * @brief Sets the collection cache size.
  *
  * @param count The collection cache size, in edje object units. Default is 16.
  *
@@ -307,7 +306,7 @@ EAPI void         edje_file_cache_flush           (void);
 EAPI void         edje_collection_cache_set       (int count);
 
 /**
- * @brief Return the collection cache size.
+ * @brief Returns the collection cache size.
  *
  * @return The collection cache size, in edje object units. Default is 16.
  *
@@ -321,7 +320,7 @@ EAPI void         edje_collection_cache_set       (int count);
 EAPI int          edje_collection_cache_get       (void);
 
 /**
- * @brief Clean the collection cache.
+ * @brief Cleans the collection cache.
  *
  * This function cleans the collection cache, but keeps this cache's
  * size to the last value set.
@@ -592,28 +591,28 @@ typedef struct _Edje_External_Type_Info Edje_External_Type_Info;
 
 /**
  * @defgroup Edje_External_Plugin_Development_Group Edje Development of External Plugins
+ * @ingroup Edje_External_Group
  *
  * @brief Functions to register, unregister EXTERNAL types and develop the plugins.
  *
- * This group dicusses functions useful for the development of new plugins.
+ * This group discusses functions useful for the development of new plugins.
  * These functions deal with the newly EXTERNAL types by registering, unregistering and manipulating them.
  *
- * @ingroup Edje_External_Group
  *
  * @{
  */
 
 /**
- * Register a type to be used by EXTERNAL parts.
+ * @brief Registers a type to be used by EXTERNAL parts.
  *
  * Parts of type EXTERNAL will call user defined functions
  * to create and manipulate the object that's allocated in that part. This is
  * done by expecifying in the @c source property of the part the name of the
  * external to use, which must be one registered with this function.
  *
- * @param type_name name to register and be known by edje's "source:"
+ * @param type_name Name to register and be known by edje's "source:"
  *        parameter of "type: EXTERNAL" parts.
- * @param type_info meta-information describing how to interact with it.
+ * @param type_info Meta-information describing how to interact with it.
  *
  * @return @c EINA_TRUE on success, @c EINA_FALSE on failure (like
  *         type already registered).
@@ -623,7 +622,7 @@ typedef struct _Edje_External_Type_Info Edje_External_Type_Info;
 EAPI Eina_Bool    edje_external_type_register             (const char *type_name, const Edje_External_Type *type_info);
 
 /**
- * Unregister a previously registered EXTERNAL type.
+ * @brief Unregisters a previously registered EXTERNAL type.
  *
  * @param type_name name to unregister. It should have been registered with
  *        edje_external_type_register() before.
@@ -636,7 +635,7 @@ EAPI Eina_Bool    edje_external_type_register             (const char *type_name
 EAPI Eina_Bool    edje_external_type_unregister           (const char *type_name);
 
 /**
- * Register a batch of types and their information.
+ * @brief Registers a batch of types and their information.
  *
  * When several types will be registered it is recommended to use this
  * function instead of several calls to edje_external_type_register(), as it
@@ -661,7 +660,7 @@ EAPI Eina_Bool    edje_external_type_unregister           (const char *type_name
 EAPI void         edje_external_type_array_register       (const Edje_External_Type_Info *array);
 
 /**
- * Unregister a batch of given external type previously registered.
+ * @brief Unregisters a batch of given external type previously registered.
  *
  * @param array @c NULL terminated array, should be the same as the
  *        one used to register with edje_external_type_array_register()
@@ -671,7 +670,7 @@ EAPI void         edje_external_type_array_register       (const Edje_External_T
 EAPI void         edje_external_type_array_unregister     (const Edje_External_Type_Info *array);
 
 /**
- * Return the current ABI version for Edje_External_Type structure.
+ * @brief Returns the current ABI version for Edje_External_Type structure.
  *
  * Always check this number before accessing Edje_External_Type in
  * your own software. If the number is not the same, your software may
@@ -693,7 +692,7 @@ EAPI unsigned int edje_external_type_abi_version_get      (void) EINA_CONST;
 
 /**
  *
- * @return an iterator of all the registered EXTERNAL types.
+ * @return An iterator of all the registered EXTERNAL types.
  *
  * Each item in the iterator is an @c Eina_Hash_Tuple which has the type
  * of the external in the @c key and #Edje_External_Type as @c data.
@@ -737,7 +736,7 @@ EAPI unsigned int edje_external_type_abi_version_get      (void) EINA_CONST;
 EAPI Eina_Iterator                  *edje_external_iterator_get     (void);
 
 /**
- * Conevenience function to find a specific parameter in a list of them.
+ * @brief Convenience function to find a specific parameter in a list of them.
  *
  * @param params The list of parameters for the external
  * @param key The parameter to look for
@@ -747,7 +746,7 @@ EAPI Eina_Iterator                  *edje_external_iterator_get     (void);
 EAPI Edje_External_Param            *edje_external_param_find       (const Eina_List *params, const char *key);
 
 /**
- * Get the value of the given parameter of integer type.
+ * @brief Gets the value of the given parameter of integer type.
  *
  * Look for the @p key parameter in the @p params list and return its value in
  * @p ret. If the parameter is found and is of type
@@ -759,13 +758,13 @@ EAPI Edje_External_Param            *edje_external_param_find       (const Eina_
  * @param key Name of the parameter to fetch
  * @param ret Int pointer where to store the value, must not be NULL.
  *
- * @return EINA_TRUE if the parameter was found and is of integer type,
- * EINA_FALSE otherwise.
+ * @return @c EINA_TRUE if the parameter was found and is of integer type,
+ * @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool                       edje_external_param_int_get    (const Eina_List *params, const char *key, int *ret);
 
 /**
- * Get the value of the given parameter of double type.
+ * @brief Gets the value of the given parameter of double type.
  *
  * Look for the @p key parameter in the @p params list and return its value in
  * @p ret. If the parameter is found and is of type
@@ -777,13 +776,13 @@ EAPI Eina_Bool                       edje_external_param_int_get    (const Eina_
  * @param key Name of the parameter to fetch
  * @param ret Double pointer where to store the value, must not be NULL.
  *
- * @return EINA_TRUE if the parameter was found and is of double type,
- * EINA_FALSE otherwise.
+ * @return @c EINA_TRUE if the parameter was found and is of double type,
+ * @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool                       edje_external_param_double_get (const Eina_List *params, const char *key, double *ret);
 
 /**
- * Get the value of the given parameter of string type.
+ * @brief Gets the value of the given parameter of string type.
  *
  * Look for the @p key parameter in the @p params list and return its value in
  * @p ret. If the parameter is found and is of type
@@ -797,13 +796,13 @@ EAPI Eina_Bool                       edje_external_param_double_get (const Eina_
  * @param key Name of the parameter to fetch
  * @param ret String pointer where to store the value, must not be NULL.
  *
- * @return EINA_TRUE if the parameter was found and is of string type,
- * EINA_FALSE otherwise.
+ * @return @c EINA_TRUE if the parameter was found and is of string type,
+ * @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool                       edje_external_param_string_get (const Eina_List *params, const char *key, const char **ret);
 
 /**
- * Get the value of the given parameter of boolean type.
+ * @brief Gets the value of the given parameter of boolean type.
  *
  * Look for the @p key parameter in the @p params list and return its value in
  * @p ret. If the parameter is found and is of type
@@ -815,13 +814,13 @@ EAPI Eina_Bool                       edje_external_param_string_get (const Eina_
  * @param key Name of the parameter to fetch
  * @param ret Eina_Bool pointer where to store the value, must not be NULL.
  *
- * @return EINA_TRUE if the parameter was found and is of boolean type,
- * EINA_FALSE otherwise.
+ * @return @c EINA_TRUE if the parameter was found and is of boolean type,
+ * @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool                       edje_external_param_bool_get   (const Eina_List *params, const char *key, Eina_Bool *ret);
 
 /**
- * Get the value of the given parameter of choice type.
+ * @brief Gets the value of the given parameter of choice type.
  *
  * Look for the @p key parameter in the @p params list and return its value in
  * @p ret. If the parameter is found and is of type
@@ -841,7 +840,7 @@ EAPI Eina_Bool                       edje_external_param_bool_get   (const Eina_
 EAPI Eina_Bool                       edje_external_param_choice_get (const Eina_List *params, const char *key, const char **ret);
 
 /**
- * Get the array of parameters information about a type given its name.
+ * @brief Gets the array of parameters information about a type given its name.
  *
  * @note the type names and other strings are static, that means they are
  *       @b NOT translated. One must use
@@ -857,7 +856,7 @@ EAPI Eina_Bool                       edje_external_param_choice_get (const Eina_
 EAPI const Edje_External_Param_Info *edje_external_param_info_get   (const char *type_name);
 
 /**
- * Get the #Edje_External_Type that defines an EXTERNAL type registered with
+ * @brief Gets the #Edje_External_Type that defines an EXTERNAL type registered with
  * the name @p type_name.
  */
 EAPI const Edje_External_Type       *edje_external_type_get         (const char *type_name);
@@ -889,6 +888,7 @@ EAPI const Edje_External_Type       *edje_external_type_get         (const char
 
 /**
  * @defgroup Edje_Object_Scale Edje Scale
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with scaling objects
  *
@@ -899,13 +899,12 @@ EAPI const Edje_External_Type       *edje_external_type_get         (const char
  * Scaling affects the values of minimum/maximum @b part sizes, which
  * are @b multiplied by it. Font sizes are scaled, too.
  *
- * @ingroup Edje_Object_Group
  *
  * @{
  */
 
 /**
- * @brief Set Edje's global scaling factor.
+ * @brief Sets Edje's global scaling factor.
  *
  * @param scale The global scaling factor (the default value is @c 1.0)
  *
@@ -924,9 +923,9 @@ EAPI const Edje_External_Type       *edje_external_type_get         (const char
 EAPI void         edje_scale_set                  (double scale);
 
 /**
- * @brief Retrieve Edje's global scaling factor.
+ * @brief Retrieves Edje's global scaling factor.
  *
- * @return The global scaling factor
+ * @return The global scaling factor.
  *
  * This function returns Edje's global scaling factor.
  *
@@ -941,6 +940,7 @@ EAPI double       edje_scale_get                  (void);
 
 /**
  * @defgroup Edje_Text_Entry Edje Text Entry
+ * @ingroup Edje_Part_Text
  *
  * @brief Functions that deal with text entries
  *
@@ -953,7 +953,6 @@ EAPI double       edje_scale_get                  (void);
  *
  * Use the functions of this section to handle the user input of text.
  *
- * @ingroup Edje_Part_Text
  *
  * @{
  */
@@ -1039,12 +1038,12 @@ typedef void         (*Edje_Markup_Filter_Cb)   (void *data, Evas_Object *obj, c
  * @param obj The Evas_Object to filter.
  * @param part Edje part name
  * @param item Item of container
- * @return must be an Evas_Object.
+ * @return Must be an Evas_Object.
  */
 typedef Evas_Object *(*Edje_Item_Provider_Cb)   (void *data, Evas_Object *obj, const char *part, const char *item);
 
 /**
- * @brief Show last character in password mode.
+ * @brief Shows last character in password mode.
  *
  * @param password_show_last If TRUE enable last character show in password mode.
  *
@@ -1058,7 +1057,7 @@ typedef Evas_Object *(*Edje_Item_Provider_Cb)   (void *data, Evas_Object *obj, c
 EAPI void edje_password_show_last_set(Eina_Bool password_show_last);
 
 /**
- * @brief Set the timeout value in last show password mode.
+ * @brief Sets the timeout value in last show password mode.
  *
  * @param password_show_last_timeout The timeout value.
  *
@@ -1078,6 +1077,7 @@ EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout)
 
 /**
  * @defgroup Edje_Object_Color_Class Edje Class: Color
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with Color Classes
  *
@@ -1090,13 +1090,11 @@ EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout)
  * will affect all parts with that color class, while at a object level will
  * affect only the parts inside an specified object.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 /**
- * @brief Set Edje color class.
+ * @brief Sets Edje color class.
  *
  * @param color_class
  * @param r Object Red value
@@ -1128,15 +1126,15 @@ EAPI void edje_password_show_last_timeout_set(double password_show_last_timeout)
  *
  * @see edje_color_class_set().
  *
- * @note unlike Evas, Edje colors are @b not pre-multiplied. That is,
+ * @note Unlike Evas, Edje colors are @b not pre-multiplied. That is,
  *       half-transparent white is 255 255 255 128.
  *
- * @return Eina_Bool, EINA_TRUE on success and EINA_FALSE on failure.
+ * @return Eina_Bool, @c EINA_TRUE on success and @c EINA_FALSE on failure.
  */
 EAPI Eina_Bool    edje_color_class_set            (const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
 
 /**
- * @brief Get Edje color class.
+ * @brief Gets Edje color class.
  *
  * @param color_class
  * @param r Object Red value
@@ -1152,7 +1150,7 @@ EAPI Eina_Bool    edje_color_class_set            (const char *color_class, int
  * @param b3 Shadow Blue value
  * @param a3 Shadow Alpha value
  *
- * @return EINA_TRUE if found or EINA_FALSE if not found and all
+ * @return @c EINA_TRUE if found or @c EINA_FALSE if not found and all
  *         values are zeroed.
  *
  * This function gets the color values for a process level color
@@ -1166,13 +1164,13 @@ EAPI Eina_Bool    edje_color_class_set            (const char *color_class, int
  *
  * @see edje_color_class_set().
  *
- * @note unlike Evas, Edje colors are @b not pre-multiplied. That is,
+ * @note Unlike Evas, Edje colors are @b not pre-multiplied. That is,
  *       half-transparent white is 255 255 255 128.
  */
 EAPI Eina_Bool    edje_color_class_get            (const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
 
 /**
- * @brief Delete edje color class.
+ * @brief Deletes edje color class.
  *
  * @param color_class
  *
@@ -1199,7 +1197,7 @@ EAPI void         edje_color_class_del            (const char *color_class);
 EAPI Eina_List   *edje_color_class_list           (void);
 
 /**
- * @brief Iterate over all the active class of an application.
+ * @brief Iterates over all the active class of an application.
  *
  * @return an iterator of Edje_Color_Class of the currently active color class
  *
@@ -1211,7 +1209,7 @@ EAPI Eina_List   *edje_color_class_list           (void);
 EAPI Eina_Iterator *edje_color_class_active_iterator_new(void);
 
 /**
- * @brief Iterate over all the color class provided by an Edje file.
+ * @brief Iterates over all the color class provided by an Edje file.
  *
  * @return an iterator of Edje_Color_Class provided by the Edje file.
  *
@@ -1226,6 +1224,7 @@ EAPI Eina_Iterator *edje_mmap_color_class_iterator_new(Eina_File *f);
 
 /**
  * @defgroup Edje_Object_Part Edje Part
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with layout components
  *
@@ -1239,15 +1238,13 @@ EAPI Eina_Iterator *edje_mmap_color_class_iterator_new(Eina_File *f);
  * This section has some functions specific for some types and others that
  * could be applied to any type.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 /**
  * @typedef Edje_Part_Type
  *
- * All possible "part" types in Edje
+ * All possible "part" types in Edje.
  */
 typedef enum _Edje_Part_Type
 {
@@ -1277,6 +1274,7 @@ typedef enum _Edje_Part_Type
 
 /**
  * @defgroup Edje_Part_Text Edje Text Part
+ * @ingroup Edje_Object_Part
  *
  * @brief Functions that deal with parts of type text
  *
@@ -1286,8 +1284,6 @@ typedef enum _Edje_Part_Type
  * a input panel, where one can set a virtual keyboard to handle
  * keyboard entry easily.
  *
- * @ingroup Edje_Object_Part
- *
  * @{
  */
 
@@ -1302,7 +1298,7 @@ typedef enum _Edje_Part_Type
 /**
  * @typedef Edje_Text_Effect
  *
- * All possible text effects in Edje
+ * All possible text effects in Edje.
  */
 typedef enum _Edje_Text_Effect
 {
@@ -1333,10 +1329,10 @@ typedef enum _Edje_Text_Effect
 /**
  * @typedef (*Edje_Text_Change_Cb)
  *
- * Callback prototype for Edje_Text_Change
- * @param data user provided data to pass to the callback
- * @param obj the Evas_Object
- * @param The edje part
+ * Callback prototype for Edje_Text_Change.
+ * @param data User provided data to pass to the callback
+ * @param obj The Evas_Object
+ * @param part The edje part
  */
 typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, const char *part);
 /**
@@ -1345,8 +1341,9 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
 
 /**
  * @defgroup Edje_Text_Selection Edje Text Selection
+ * @ingroup Edje_Part_Text
  *
- * @brief Functions that deal with selection in text parts
+ * @brief Functions that deal with selection in text parts.
  *
  * Selection is a known functionality for texts in the whole computational
  * world. It is a block of text marked for further manipulation.
@@ -1354,8 +1351,6 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
  * Edje is responsible for handling this functionality through the
  * following functions.
  *
- * @ingroup Edje_Part_Text
- *
  * @{
  */
 /**
@@ -1364,8 +1359,9 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
 
 /**
  * @defgroup Edje_Text_Cursor Edje Text Cursor
+ * @ingroup Edje_Part_Text
  *
- * @brief Functions that deal with cursor in text parts
+ * @brief Functions that deal with cursor in text parts.
  *
  * Cursor is a known functionality for texts in the whole computational
  * world. It marks a position in the text from where one may want
@@ -1374,8 +1370,6 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
  * Edje is responsible for handling this functionality through the
  * following functions.
  *
- * @ingroup Edje_Part_Text
- *
  * @{
  */
 
@@ -1385,6 +1379,7 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
 
 /**
  * @defgroup Edje_Part_Swallow Edje Swallow Part
+ * @ingroup Edje_Object_Part
  *
  * @brief Functions that deal with parts of type swallow and swallowed objects.
  *
@@ -1397,7 +1392,6 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
  * objects that are not native of Edje. In this last case, Edje will
  * only treat the Evas_Object properties of the swallowed objects.
  *
- * @ingroup Edje_Object_Part
  *
  * @{
  */
@@ -1405,7 +1399,7 @@ typedef void         (*Edje_Text_Change_Cb)     (void *data, Evas_Object *obj, c
 /**
  * @typedef Edje_Aspect_Control
  *
- * All Edje aspect control values
+ * All Edje aspect control values.
  *
  */
 typedef enum _Edje_Aspect_Control
@@ -1423,6 +1417,7 @@ typedef enum _Edje_Aspect_Control
 
 /**
  * @defgroup Edje_Object_Geometry_Group Edje Object Geometry
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with object's geometry.
  *
@@ -1434,8 +1429,6 @@ typedef enum _Edje_Aspect_Control
  * the appearance in the screen of the parts inside. Most times
  * that is what you want.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 /**
@@ -1444,6 +1437,7 @@ typedef enum _Edje_Aspect_Control
 
 /**
  * @defgroup Edje_Part_Drag Edje Drag
+ * @ingroup Edje_Object_Part
  *
  * @brief Functions that deal with dragable parts.
  *
@@ -1456,7 +1450,6 @@ typedef enum _Edje_Aspect_Control
  *
  * @see @ref tutorial_edje_drag
  *
- * @ingroup Edje_Object_Part
  *
  * @{
  */
@@ -1467,14 +1460,13 @@ typedef enum _Edje_Aspect_Control
 
 /**
  * @defgroup Edje_Part_Box Edje Box Part
+ * @ingroup Edje_Object_Part
  *
  * @brief Functions that deal with parts of type box.
  *
  * Box is a container type for parts, that means it can contain
  * other parts.
  *
- * @ingroup Edje_Object_Part
- *
  * @{
  */
 
@@ -1508,21 +1500,20 @@ EAPI void         edje_box_layout_register        (const char *name, Evas_Object
 
 /**
  * @defgroup Edje_Part_Table Edje Table Part
+ * @ingroup Edje_Object_Part
  *
  * @brief Functions that deal with parts of type table.
  *
  * Table is a container type for parts, that means it can contain
  * other parts.
  *
- * @ingroup Edje_Object_Part
- *
  * @{
  */
 
 /**
  * @typedef Edje_Object_Table_Homogeneous_Mode
  *
- * Table homogeneous modes
+ * Table homogeneous modes.
  *
  */
 typedef enum _Edje_Object_Table_Homogeneous_Mode
@@ -1538,8 +1529,8 @@ typedef enum _Edje_Object_Table_Homogeneous_Mode
 
 /**
  * @defgroup Edje_Object_Text_Class Edje Class: Text
- *
- * @brief Functions that deal with Text Classes
+ * @ingroup Edje_Object_Group
+ * @brief Functions that deal with Text Classes.
  *
  * Sometimes we want to change the text of two or more parts equally and
  * that's when we use text classes.
@@ -1550,19 +1541,17 @@ typedef enum _Edje_Object_Table_Homogeneous_Mode
  * all parts with that text class, while at object level will affect only
  * the parts inside an specified object.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 /**
- * @brief Set the Edje text class.
+ * @brief Sets the Edje text class.
  *
  * @param text_class The text class name
  * @param font The font name
  * @param size The font size
  *
- * @return @c EINA_TRUE, on success or @c EINA_FALSE, on error
+ * @return @c EINA_TRUE on success, or @c EINA_FALSE on error
  *
  * This function updates all Edje members at the process level which
  * belong to this text class with the new font attributes.
@@ -1578,13 +1567,13 @@ typedef enum _Edje_Object_Table_Homogeneous_Mode
 EAPI Eina_Bool    edje_text_class_set             (const char *text_class, const char *font, Evas_Font_Size size);
 
 /**
- * @brief Get the font and the font size from Edje text class.
+ * @brief Gets the font and the font size from Edje text class.
  *
  * @param text_class The text class name
  * @param font The font name
  * @param size The font size
  *
- * @return @c EINA_TRUE, on success or @c EINA_FALSE, on error
+ * @return @c EINA_TRUE on success, or @c EINA_FALSE on error
  *
  * This function gets the font and the font name from the specified Edje
  * text class. The font string will only be valid until the text class is
@@ -1596,7 +1585,7 @@ EAPI Eina_Bool    edje_text_class_set             (const char *text_class, const
 EAPI Eina_Bool    edje_text_class_get             (const char *text_class, const char **font, Evas_Font_Size *size);
 
 /**
- * @brief Delete the text class.
+ * @brief Deletes the text class.
  *
  * @param text_class The text class name string
  *
@@ -1607,7 +1596,7 @@ EAPI Eina_Bool    edje_text_class_get             (const char *text_class, const
 EAPI void         edje_text_class_del             (const char *text_class);
 
 /**
- * @brief List text classes.
+ * @brief Lists text classes.
  *
  * @return A list of text class names (strings). These strings are
  * stringshares and the list must be free()'d by the caller.
@@ -1647,6 +1636,7 @@ EAPI Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
 
 /**
  * @defgroup Edje_Object_Size_Class Edje Class: Size
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with Size Classes
  *
@@ -1659,13 +1649,11 @@ EAPI Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
  * all parts with that size class, while at object level will affect only
  * the parts inside an specified object.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 /**
- * @brief Set the Edje size class.
+ * @brief Sets the Edje size class.
  *
  * @param size_class The size class name
  * @param minw The min width
@@ -1673,7 +1661,7 @@ EAPI Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
  * @param maxw The max width
  * @param maxh The max height
  *
- * @return @c EINA_TRUE, on success or @c EINA_FALSE, on error
+ * @return @c EINA_TRUE on success, or @c EINA_FALSE on error
  *
  * This function updates all Edje members at the process level which
  * belong to this size class with the new min and max attributes.
@@ -1685,7 +1673,7 @@ EAPI Eina_Iterator *edje_mmap_text_class_iterator_new(Eina_File *f);
 EAPI Eina_Bool    edje_size_class_set             (const char *size_class, Evas_Coord minw, Evas_Coord minh, Evas_Coord maxw, Evas_Coord maxh);
 
 /**
- * @brief Get the Edje size class.
+ * @brief Gets the Edje size class.
  *
  * @param size_class The size class name
  * @param minw The min width
@@ -1693,7 +1681,7 @@ EAPI Eina_Bool    edje_size_class_set             (const char *size_class, Evas_
  * @param maxw The max width
  * @param maxh The max height
  *
- * @return @c EINA_TRUE, on success or @c EINA_FALSE, on error
+ * @return @c EINA_TRUE on success, or @c EINA_FALSE on error
  *
  * This function gets the min and max size from the specified Edje
  * size class.
@@ -1703,7 +1691,7 @@ EAPI Eina_Bool    edje_size_class_set             (const char *size_class, Evas_
 EAPI Eina_Bool    edje_size_class_get             (const char *size_class, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord *maxw, Evas_Coord *maxh);
 
 /**
- * @brief Delete the size class.
+ * @brief Deletes the size class.
  *
  * @param size_class The size class name
  *
@@ -1715,7 +1703,7 @@ EAPI Eina_Bool    edje_size_class_get             (const char *size_class, Evas_
 EAPI void         edje_size_class_del             (const char *size_class);
 
 /**
- * @brief List size classes.
+ * @brief Lists size classes.
  *
  * @return A list of size class names (strings). These strings are
  * stringshares and the list must be eina_stringshare_del()'ed by the caller.
@@ -1728,9 +1716,9 @@ EAPI void         edje_size_class_del             (const char *size_class);
 EAPI Eina_List   *edje_size_class_list            (void);
 
 /**
- * @brief Iterate over all active classes of an application.
+ * @brief Iterates over all active classes of an application.
  *
- * @return an iterator of Edje_Size_Class of the currently active size class
+ * @return An iterator of Edje_Size_Class of the currently active size class
  *
  * This function only iterates over the Edje_Size_Class in use by
  * an application.
@@ -1740,7 +1728,7 @@ EAPI Eina_List   *edje_size_class_list            (void);
 EAPI Eina_Iterator *edje_size_class_active_iterator_new(void);
 
 /**
- * @brief Iterate over all size classes provided by an Edje file.
+ * @brief Iterates over all size classes provided by an Edje file.
  *
  * @return an iterator of Edje_Size_Class provided by the Edje file.
  *
@@ -1754,6 +1742,7 @@ EAPI Eina_Iterator *edje_mmap_size_class_iterator_new(Eina_File *f);
 
 /**
  * @defgroup Edje_Object_File Edje Object File
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions to deals with EDJ files.
  *
@@ -1767,13 +1756,11 @@ EAPI Eina_Iterator *edje_mmap_size_class_iterator_new(Eina_File *f);
  * either by loading them or retrieving information of the EDC
  * file about objects.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 /**
- * Get a list of groups in an edje mapped file
+ * @brief Gets a list of groups in an edje mapped file.
  * @param f The mapped file
  *
  * @return The Eina_List of group names (char *)
@@ -1784,7 +1771,7 @@ EAPI Eina_Iterator *edje_mmap_size_class_iterator_new(Eina_File *f);
 EAPI Eina_List        *edje_mmap_collection_list(Eina_File *f);
 
 /**
- * Free file collection list
+ * @brief Frees file collection list.
  * @param lst The Eina_List of groups
  *
  * Frees the list returned by edje_mmap_collection_list().
@@ -1792,27 +1779,27 @@ EAPI Eina_List        *edje_mmap_collection_list(Eina_File *f);
 EAPI void              edje_mmap_collection_list_free(Eina_List *lst);
 
 /**
- * Determine whether a group matching glob exists in an edje mapped file.
+ * @brief Determines whether a group matching glob exists in an edje mapped file.
  * @param f The mapped file
  * @param glob A glob to match on
  *
- * @return 1 if a match is found, 0 otherwise
+ * @return @c 1 if a match is found, @c 0 otherwise
  */
 EAPI Eina_Bool         edje_mmap_group_exists(Eina_File *f, const char *glob);
 
 /**
- * Determine whether a group have 3D Scene.
+ * @brief Determines whether a group have 3D Scene.
  * @param f The mapped file
  * @param glob The group name
  *
- * @return 1 if a Scene is found is found, 0 otherwise
+ * @return @c 1 if a Scene is found is found, @c 0 otherwise
  *
  * @since 1.18
  */
 EAPI Eina_Bool         edje_mmap_3d_has(Eina_File *f, const char *group);
 
 /**
- * @brief Iterate over all the opened Edje file.
+ * @brief Iterates over all the opened Edje file.
  *
  * @return an iterator of Eina_File currently opened Edje file.
  *
@@ -1821,7 +1808,7 @@ EAPI Eina_Bool         edje_mmap_3d_has(Eina_File *f, const char *group);
 EAPI Eina_Iterator *edje_file_iterator_new(void);
 
 /**
- * Get a list of groups in an edje file
+ * @brief Gets a list of groups in an edje file.
  * @param file The path to the edje file
  *
  * @return The Eina_List of group names (char *)
@@ -1835,7 +1822,7 @@ EAPI Eina_Iterator *edje_file_iterator_new(void);
 EAPI Eina_List        *edje_file_collection_list  (const char *file);
 
 /**
- * Free file collection list
+ * @brief Frees file collection list.
  * @param lst The Eina_List of groups
  *
  * Frees the list returned by edje_file_collection_list().
@@ -1843,16 +1830,16 @@ EAPI Eina_List        *edje_file_collection_list  (const char *file);
 EAPI void             edje_file_collection_list_free (Eina_List *lst);
 
 /**
- * Determine whether a group matching glob exists in an edje file.
+ * @brief Determines whether a group matching glob exists in an edje file.
  * @param file The file path
  * @param glob A glob to match on
  *
- * @return 1 if a match is found, 0 otherwise
+ * @return @c 1 if a match is found, @c 0 otherwise
  */
 EAPI Eina_Bool        edje_file_group_exists      (const char *file, const char *glob);
 
 /**
- * Converts the given Edje file load error code into a string
+ * @brief Converts the given Edje file load error code into a string
  * describing it in English.
  *
  * @param error the error code, a value in ::Edje_Load_Error.
@@ -1873,13 +1860,11 @@ EAPI const char	      *edje_load_error_str	  (Edje_Load_Error error);
 
 /**
  * @defgroup Edje_Object_Animation Edje Object Animation
- *
+ * @ingroup Edje_Object_Group
  * @brief Functions that deal with animations.
  *
  * Edje has the ability to animate objects. One can start, stop, play,
- * pause, freeze and thaw edje animations using the functions of this section.
- *
- * @ingroup Edje_Object_Group
+ * pause, freeze, and thaw edje animations using the functions of this section.
  *
  * @{
  */
@@ -1887,7 +1872,7 @@ EAPI const char	      *edje_load_error_str	  (Edje_Load_Error error);
 /**
  * @typedef Edje_Tween_Mode
  *
- * Available tween mode for edje animations
+ * Available tween mode for edje animations.
  */
 typedef enum _Edje_Tween_Mode
 {
@@ -1946,7 +1931,7 @@ typedef enum _Edje_Action_Type
 } Edje_Action_Type;
 
 /**
- * @brief Set edje trasitions' frame time.
+ * @brief Sets edje transitions' frame time.
  *
  * @param t The frame time, in seconds. Default value is 1/30.
  *
@@ -1961,7 +1946,7 @@ typedef enum _Edje_Action_Type
 EAPI void         edje_frametime_set              (double t);
 
 /**
- * @brief Get edje trasitions' frame time.
+ * @brief Gets edje transitions' frame time.
  *
  * @return The frame time, in seconds.
  *
@@ -1974,7 +1959,7 @@ EAPI void         edje_frametime_set              (double t);
 EAPI double       edje_frametime_get              (void);
 
 /**
- * @brief Freeze Edje objects.
+ * @brief Freezes Edje objects.
  *
  * This function freezes all Edje animations in the current process.
  *
@@ -1986,7 +1971,7 @@ EAPI double       edje_frametime_get              (void);
 EAPI void         edje_freeze                     (void);
 
 /**
- * @brief Thaw Edje objects.
+ * @brief Thaws Edje objects.
  *
  * This function thaws all Edje animations in the current process.
  *
@@ -1998,7 +1983,7 @@ EAPI void         edje_freeze                     (void);
 EAPI void         edje_thaw                       (void);
 
 /**
- * @brief Set's Edje language.
+ * @brief Sets Edje language.
  *
  * This function sets the given language.
  *
@@ -2009,9 +1994,9 @@ EAPI void         edje_thaw                       (void);
 EAPI void         edje_language_set               (const char *locale);
 
 /**
- * @brief Set edje transition duration factor.
+ * @brief Sets edje transition duration factor.
  *
- * @param scale The edje trasition's duration factor (the default value is @c 1.0)
+ * @param scale The edje transition's duration factor (the default value is @c 1.0)
  *
  * This function sets the edje transition duration factor
  * It will affect the speed of transitions
@@ -2032,7 +2017,7 @@ EAPI void         edje_language_set               (const char *locale);
 EAPI void         edje_transition_duration_factor_set        (double scale);
 
 /**
- * @brief Retrieve transitions duration factor.
+ * @brief Retrieves transitions duration factor.
  *
  * @return The edje transition duration factor
  *
@@ -2051,6 +2036,7 @@ EAPI double       edje_transition_duration_factor_get                  (void);
 
 /**
  * @defgroup Edje_Object_Communication_Interface_Message Edje Communication Interface: Message
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with messages.
  *
@@ -2065,8 +2051,6 @@ EAPI double       edje_transition_duration_factor_get                  (void);
  *
  * @note Messages must be handled by scripts.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
@@ -2143,7 +2127,7 @@ struct _Edje_Message_String_Float_Set
 typedef void         (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg); /**< Edje message handler callback functions's prototype definition. @c data will have the auxiliary data pointer set at the time the callback registration. @c obj will be a pointer the Edje object where the message comes from. @c type will identify the type of the given message and @c msg will be a pointer the message's contents, de facto, which depend on @c type. */
 
 /**
- * @brief Process all queued up edje messages.
+ * @brief Processes all queued up edje messages.
  *
  * This function triggers the processing of messages addressed to any
  * (alive) edje objects.
@@ -2157,6 +2141,7 @@ EAPI void         edje_message_signal_process             (void);
 
 /**
  * @defgroup Edje_Perspective Edje Perspective
+ * @ingroup Edje_Object_Group
  *
  * @brief Functions that deal with 3D projection of an 2D object.
  *
@@ -2169,13 +2154,11 @@ EAPI void         edje_message_signal_process             (void);
  * affecting all the objects inside that have no particular perspective
  * set already.
  *
- * @ingroup Edje_Object_Group
- *
  * @{
  */
 
 /**
- * Creates a new perspective in the given canvas.
+ * @brief Creates a new perspective in the given canvas.
  *
  * @param e The given canvas (Evas).
  * @return An @ref Edje_Perspective object for this canvas, or @c NULL on errors.
@@ -2188,7 +2171,7 @@ EAPI void         edje_message_signal_process             (void);
  */
 EAPI Edje_Perspective       *edje_perspective_new            (Evas *e);
 /**
- * Delete the given perspective object.
+ * @brief Deletes the given perspective object.
  *
  * @param ps A valid perspective object, or @c NULL.
  *
@@ -2200,7 +2183,7 @@ EAPI Edje_Perspective       *edje_perspective_new            (Evas *e);
  */
 EAPI void                    edje_perspective_free           (Edje_Perspective *ps);
 /**
- * Setup the transform for this perspective object.
+ * @brief Sets up the transform for this perspective object.
  *
  * This sets the parameters of the perspective transformation. X, Y and Z
  * values are used. The px and py points specify the "infinite distance" point
@@ -2223,7 +2206,7 @@ EAPI void                    edje_perspective_free           (Edje_Perspective *
  */
 EAPI void                    edje_perspective_set            (Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
 /**
- * Make this perspective object be global for its canvas.
+ * @brief Makes this perspective object be global for its canvas.
  *
  * @param ps The given perspective object
  * @param global @c EINA_TRUE if the perspective should be global, @c
@@ -2247,7 +2230,7 @@ EAPI void                    edje_perspective_set            (Edje_Perspective *
  */
 EAPI void                    edje_perspective_global_set     (Edje_Perspective *ps, Eina_Bool global);
 /**
- * Get whether the given perspective object is global or not.
+ * @brief Gets whether the given perspective object is global or not.
  *
  * @param ps The given perspective object.
  * @return @c EINA_TRUE if this perspective object is global, @c EINA_FALSE
@@ -2257,7 +2240,7 @@ EAPI void                    edje_perspective_global_set     (Edje_Perspective *
  */
 EAPI Eina_Bool               edje_perspective_global_get     (const Edje_Perspective *ps);
 /**
- * Get the global perspective object set for this canvas.
+ * @brief Gets the global perspective object set for this canvas.
  *
  * @param e The given canvas (Evas).
  * @return The perspective object set as global for this canvas. Or @c NULL
@@ -2276,6 +2259,7 @@ EAPI const Edje_Perspective *edje_evas_global_perspective_get(const Evas *e);
 
 /**
  * @defgroup Edje_Audio Edje Audio
+ * @ingroup Edje_Audio
  *
  * @brief Functions to manipulate audio abilities in edje.
  *
@@ -2288,8 +2272,6 @@ EAPI const Edje_Perspective *edje_evas_global_perspective_get(const Evas *e);
  * affecting all the objects inside that have no particular perspective
  * set already.
  *
- * @ingroup Edje_Audio
- *
  * @{
  */
 
@@ -2315,7 +2297,7 @@ typedef enum _Edje_Channel
 } Edje_Channel;
 
 /**
- * Set the mute state of audio for the process as a whole
+ * @brief Sets the mute state of audio for the process as a whole.
  *
  * @param channel The channel to set the mute state of
  * @param mute The mute state
@@ -2329,7 +2311,7 @@ typedef enum _Edje_Channel
 EAPI void edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute);
 
 /**
- * Get the mute state of the given channel
+ * @brief Gets the mute state of the given channel.
  *
  * @param channel The channel to get the mute state of
  * @return The mute state of the channel
@@ -2341,7 +2323,7 @@ EAPI void edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute);
 EAPI Eina_Bool edje_audio_channel_mute_get(Edje_Channel channel);
 
 /**
- * Get the part name of an edje part object
+ * @brief Gets the part name of an edje part object.
  * @param obj An edje part object
  * @return The name of the part, if the object is an edje part, or @c NULL
  * @note If this function returns @c NULL, @p obj was not an Edje part object
@@ -2353,7 +2335,7 @@ EAPI const char *edje_object_part_object_name_get(const Evas_Object *obj);
 #ifdef EFL_BETA_API_SUPPORT
 
 /**
- * Create scene and root node which contains all 3D parts of edje object
+ * @brief Creates scene and root node which contains all 3D parts of edje object.
  * @param obj An edje part object
  * @param root node to collect all 3D parts
  * @param scene
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 2b6c1c610c..7bb5a07c1f 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -194,12 +194,13 @@ extern "C" {
 /******************************************************************************/
 /**************************   GENERAL API   ***********************************/
 /******************************************************************************/
-/** @name General API
- *  General functions that don't fit in other cateories.
+/**
+ * @name General API
+ * General functions that don't fit in other categories.
  */ //@{
 
-/** Adds an editable Edje object to the canvas.
- *
+/**
+ * @brief Adds an editable Edje object to the canvas.
  * An Edje_Edit object is, for the most part, a standard Edje object. Only
  * difference is you can use the Edje_Edit API on them.
  *
@@ -209,19 +210,20 @@ extern "C" {
  */
 EAPI Evas_Object * edje_edit_object_add(Evas *e);
 
-/** Free a generic Eina_List of (char *) allocated by an edje_edit_*_get() function.
- *
+/**
+ * @brief Frees a generic Eina_List of (char *) allocated by an edje_edit_*_get() function.
  * @param lst List of strings to free.
  */
 EAPI void edje_edit_string_list_free(Eina_List *lst);
 
-/** Free a generic string (char *) allocated by an edje_edit_*_get() function.
- *
+/**
+ * @brief Frees a generic string (char *) allocated by an edje_edit_*_get() function.
  * @param str String to free.
  */
 EAPI void edje_edit_string_free(const char *str);
 
-/** Get the name of the program that compiled the edje file.
+/**
+ * @brief Gets the name of the program that compiled the edje file.
  * Can be 'edje_cc' or 'edje_edit'
  *
  * @param obj Object being edited.
@@ -230,8 +232,8 @@ EAPI void edje_edit_string_free(const char *str);
  */
 EAPI const char * edje_edit_compiler_get(Evas_Object *obj);
 
-/** Save the modified edje object back to his file.
- *
+/**
+ * @brief Saves the modified edje object back to his file.
  * Use this function when you are done with your editing, all the change made
  * to the current loaded group will be saved back to the original file.
  *
@@ -246,8 +248,8 @@ EAPI const char * edje_edit_compiler_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_save(Evas_Object *obj);
 
-/** Saves every group back into the file.
- *
+/**
+ * @brief Saves every group back into the file.
  * @param obj Object to save.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
@@ -256,8 +258,8 @@ EAPI Eina_Bool edje_edit_save(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_save_all(Evas_Object *obj);
 
-/** Save every group into new file.
- *
+/**
+ * @brief Saves every group into new file.
  * Use this function when you need clean eet dictionary in .edj file from
  * unnecessary text entries (e.g. names of deleted groups etc.).
  *
@@ -271,8 +273,8 @@ EAPI Eina_Bool edje_edit_save_all(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_clean_save_as(Evas_Object *obj, const char* new_file_name);
 
-/** Save the group(s) back to the file, without generation source code.
- *
+/**
+ * @brief Saves the group(s) back to the file, without generation source code.
  * This function saves changes in group(s) back into the edj file. Process of
  * saving takes a bit time in compare with @see edje_edit_save() and @see edje_edit_save_all(),
  * because this function DOES NOT generate source code for groups.
@@ -292,7 +294,8 @@ EAPI Eina_Bool edje_edit_clean_save_as(Evas_Object *obj, const char* new_file_na
  */
 EAPI Eina_Bool edje_edit_without_source_save(Evas_Object *obj, Eina_Bool current_group);
 
-/** Print on standard output many information about the internal status
+/**
+ * @brief Prints on standard output many information about the internal status
  * of the edje object.
  *
  * This is probably only useful to debug.
@@ -306,12 +309,13 @@ EAPI void edje_edit_print_internal_status(Evas_Object *obj);
 /******************************************************************************/
 /**************************   GROUPS API   ************************************/
 /******************************************************************************/
-/** @name Groups API
- *  Functions to deal with groups property (see @ref edcref).
+/**
+ * @name Groups API
+ * Functions to deal with groups property (see @ref edcref).
  */ //@{
 
 /**
- * @brief Add an edje (empty) group to an edje object's group set.
+ * @brief Adds an edje (empty) group to an edje object's group set.
  *
  * @param obj The pointer to edje object.
  * @param name The name of the group.
@@ -330,7 +334,7 @@ EAPI void edje_edit_print_internal_status(Evas_Object *obj);
 EAPI Eina_Bool edje_edit_group_add(Evas_Object *obj, const char *name);
 
 /**
- * @brief Copy whole group and all it's data into separate group.
+ * @brief Copies whole group and all it's data into separate group.
  *
  * @param obj The pointer to edje object.
  * @param group_name The name of the group.
@@ -354,7 +358,7 @@ EAPI Eina_Bool edje_edit_group_add(Evas_Object *obj, const char *name);
 EAPI Eina_Bool edje_edit_group_copy(Evas_Object *obj, const char *group_name, const char *copy_name);
 
 /**
- * @brief Delete the specified group from the edje file.
+ * @brief Deletes the specified group from the edje file.
  *
  * @param obj The pointer to the edje object.
  * @param group_name Group to delete.
@@ -375,8 +379,8 @@ EAPI Eina_Bool edje_edit_group_copy(Evas_Object *obj, const char *group_name, co
  */
 EAPI Eina_Bool edje_edit_group_del(Evas_Object *obj, const char *group_name);
 
-/** Check if a group with the given name exist in the edje.
- *
+/**
+ * @brief Checks if a group with the given name exist in the edje.
  * @param obj Object being edited.
  * @param group Group name to check for.
  *
@@ -384,7 +388,8 @@ EAPI Eina_Bool edje_edit_group_del(Evas_Object *obj, const char *group_name);
  */
 EAPI Eina_Bool edje_edit_group_exist(Evas_Object *obj, const char *group);
 
-/** Set a new name for the current open group.
+/**
+ * @brief Sets a new name for the current open group.
  *
  * You can only rename a group that is currently loaded
  * Note that the relative getter function don't exist as it doesn't make sense ;)
@@ -395,7 +400,8 @@ EAPI Eina_Bool edje_edit_group_exist(Evas_Object *obj, const char *group);
  */
 EAPI Eina_Bool edje_edit_group_name_set(Evas_Object *obj, const char *new_name);
 
-/** Get the group minimum width.
+/**
+ * @brief Gets the group minimum width.
  *
  * @param obj Object being edited.
  *
@@ -403,7 +409,8 @@ EAPI Eina_Bool edje_edit_group_name_set(Evas_Object *obj, const char *new_name);
  */
 EAPI int edje_edit_group_min_w_get(Evas_Object *obj);
 
-/** Set the group minimum width.
+/**
+ * @brief Sets the group minimum width.
  *
  * @param obj Object being edited.
  * @param w New minimum width for the group.
@@ -412,15 +419,17 @@ EAPI int edje_edit_group_min_w_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_min_w_set(Evas_Object *obj, int w);
 
-/** Get the group minimum height.
+/**
+ * @brief Gets the group minimum height.
  *
  * @param obj Object being edited.
  *
- * @return The minimum height set for the group. -1 if an error occurred.
+ * @return The minimum height set for the group. @c -1 if an error occurred.
  */
 EAPI int edje_edit_group_min_h_get(Evas_Object *obj);
 
-/** Set the group minimum height.
+/**
+ * @brief Sets the group minimum height.
  *
  * @param obj Object being edited.
  * @param h New minimum height for the group.
@@ -429,15 +438,17 @@ EAPI int edje_edit_group_min_h_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_min_h_set(Evas_Object *obj, int h);
 
-/** Get the group maximum width.
+/**
+ * @brief Gets the group maximum width.
  *
  * @param obj Object being edited.
  *
- * @return The maximum width set for the group. -1 if an error occurred.
+ * @return The maximum width set for the group. @c -1 if an error occurred.
  */
 EAPI int edje_edit_group_max_w_get(Evas_Object *obj);
 
-/** Set the group maximum width.
+/**
+ * @brief Sets the group maximum width.
  *
  * @param obj Object being edited.
  * @param w New maximum width for the group.
@@ -446,15 +457,17 @@ EAPI int edje_edit_group_max_w_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_max_w_set(Evas_Object *obj, int w);
 
-/** Get the group maximum height.
+/**
+ * @brief Gets the group maximum height.
  *
  * @param obj Object being edited.
  *
- * @return The maximum height set for the group. -1 if an error occurred.
+ * @return The maximum height set for the group. @c -1 if an error occurred.
  */
 EAPI int edje_edit_group_max_h_get(Evas_Object *obj);
 
-/** Set the group maximum height.
+/**
+ * @brief Sets the group maximum height.
  *
  * @param obj Object being edited.
  * @param h New maximum height for the group.
@@ -463,7 +476,8 @@ EAPI int edje_edit_group_max_h_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_max_h_set(Evas_Object *obj, int h);
 
-/** Get the group broadcast_signal.
+/**
+ * @brief Gets the group broadcast_signal.
  *
  * @param obj Object being edited.
  *
@@ -472,7 +486,8 @@ EAPI Eina_Bool edje_edit_group_max_h_set(Evas_Object *obj, int h);
  */
 EAPI Eina_Bool edje_edit_group_broadcast_signal_get(Evas_Object *obj);
 
-/** Set the group broadcast signal.
+/**
+ * @brief Sets the group broadcast signal.
  *
  * @param obj Object being edited.
  * @param bs @c EINA_TRUE if group will accept broadcast signal, @c EINA_FALSE otherwise.
@@ -485,7 +500,8 @@ EAPI Eina_Bool edje_edit_group_broadcast_signal_set(Evas_Object *obj, Eina_Bool
 //@}
 
 
-/** Retrieves a list with the item names inside the vertical limits block at the group level.
+/**
+ * @brief Retrieves a list with the item names inside the vertical limits block at the group level.
  *
  * @param obj Object being edited.
  *
@@ -493,7 +509,8 @@ EAPI Eina_Bool edje_edit_group_broadcast_signal_set(Evas_Object *obj, Eina_Bool
  */
 EAPI Eina_List * edje_edit_group_limits_vertical_list_get(Evas_Object *obj);
 
-/** Delete given pair name-value from the vertical limits block at the group level.
+/**
+ * @brief Deletes given pair name-value from the vertical limits block at the group level.
  *
  * @param obj Object being edited.
  * @param name Limit name.
@@ -503,7 +520,8 @@ EAPI Eina_List * edje_edit_group_limits_vertical_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_limits_vertical_del(Evas_Object *obj, const char *name, int value);
 
-/** Add given pair name-value to the vertical limits block at the group level.
+/**
+ * @brief Adds given pair name-value to the vertical limits block at the group level.
  *
  * @param obj Object being edited.
  * @param name Limit name.
@@ -513,7 +531,8 @@ EAPI Eina_Bool edje_edit_group_limits_vertical_del(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_group_limits_vertical_add(Evas_Object *obj, const char *name, int value);
 
-/** Retrieves a list with the item names inside the horizontal limits block at the group level.
+/**
+ * @brief Retrieves a list with the item names inside the horizontal limits block at the group level.
  *
  * @param obj Object being edited.
  *
@@ -521,7 +540,8 @@ EAPI Eina_Bool edje_edit_group_limits_vertical_add(Evas_Object *obj, const char
  */
 EAPI Eina_List * edje_edit_group_limits_horizontal_list_get(Evas_Object *obj);
 
-/** Delete given pair name-value from the horizontal limits block at the group level.
+/**
+ * @brief Deletes given pair name-value from the horizontal limits block at the group level.
  *
  * @param obj Object being edited.
  * @param name Limit name.
@@ -531,7 +551,8 @@ EAPI Eina_List * edje_edit_group_limits_horizontal_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_limits_horizontal_del(Evas_Object *obj, const char *name, int value);
 
-/** Add given pair name-value to the horizontal limits block at the group level.
+/**
+ * @brief Adds given pair name-value to the horizontal limits block at the group level.
  *
  * @param obj Object being edited.
  * @param name Limit name.
@@ -541,7 +562,8 @@ EAPI Eina_Bool edje_edit_group_limits_horizontal_del(Evas_Object *obj, const cha
  */
 EAPI Eina_Bool edje_edit_group_limits_horizontal_add(Evas_Object *obj, const char *name, int value);
 
-/** Free an Eina_List of (Edje_Edit_List *) allocated by an edje_edit_limits_vertical_list_get() or edje_edit_limits_horizontal_list_get() functions.
+/**
+ @brief Frees an Eina_List of (Edje_Edit_List *) allocated by an edje_edit_limits_vertical_list_get() or edje_edit_limits_horizontal_list_get() functions.
  *
  * @param lst List to free.
  */
@@ -550,12 +572,13 @@ EAPI void edje_edit_limits_list_free(Eina_List *lst);
 /******************************************************************************/
 /**************************   ALIAS API   **************************************/
 /******************************************************************************/
-/** @name Alias API
- *  Functions to deal with aliases that just another names of the group in the edje (see @ref edcref).
+/**
+ * @name Alias API
+ * Functions to deal with aliases that just another names of the group in the edje (see @ref edcref).
  */ //@{
 
 /**
- * Retrieves a list of aliases for this group.
+ * @brief Retrieves a list of aliases for this group.
  * If given group name is an alias name then this function will return NULL.
  *
  * @attention After you done using returned list, please use edje_edit_string_list_free to free this list.
@@ -568,7 +591,7 @@ EAPI void edje_edit_limits_list_free(Eina_List *lst);
 EAPI Eina_List * edje_edit_group_aliases_get(Evas_Object *obj, const char *group_name);
 
 /**
- * Check if this group is an alias name.
+ * @brief Checks if this group is an alias name.
  *
  * @param obj Object being edited.
  * @param alias_name Group name that is alias.
@@ -578,7 +601,7 @@ EAPI Eina_List * edje_edit_group_aliases_get(Evas_Object *obj, const char *group
 EAPI Eina_Bool edje_edit_group_alias_is(Evas_Object *obj, const char *alias_name);
 
 /**
- * Return the main group name that is aliased by given alias name.
+ * @brief Returns the main group name that is aliased by given alias name.
  *
  * @attention After you done using this string, please use edje_edit_string_free to free this string.
  *
@@ -590,7 +613,7 @@ EAPI Eina_Bool edje_edit_group_alias_is(Evas_Object *obj, const char *alias_name
 EAPI const char * edje_edit_group_aliased_get(Evas_Object *obj, const char *alias_name);
 
 /**
- * Add new alias to the given group.
+ * @brief Adds new alias to the given group.
  *
  * @attention when aliasing a group, be sure that the given group_name is no an alias.
  *
@@ -606,11 +629,13 @@ EAPI Eina_Bool edje_edit_group_alias_add(Evas_Object *obj, const char *group_nam
 /******************************************************************************/
 /**************************   DATA API   **************************************/
 /******************************************************************************/
-/** @name Data API
- *  Functions to deal with data embedded in the edje (see @ref edcref).
+/**
+ * @name Data API
+ * Functions to deal with data embedded in the edje (see @ref edcref).
  */ //@{
 
-/** Retrieves a list with the item names inside the data block.
+/**
+ * @brief Retrieves a list with the item names inside the data block.
  *
  * @param obj Object being edited.
  *
@@ -618,7 +643,8 @@ EAPI Eina_Bool edje_edit_group_alias_add(Evas_Object *obj, const char *group_nam
  */
 EAPI Eina_List * edje_edit_data_list_get(Evas_Object *obj);
 
-/** Create a new *global* data object in the given edje file.
+/**
+ * @brief Creates a new *global* data object in the given edje file.
  *
  * If another data entry with the same name exists, nothing is created and
  * EINA_FALSE is returned.
@@ -631,7 +657,8 @@ EAPI Eina_List * edje_edit_data_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_data_add(Evas_Object *obj, const char *itemname, const char *value);
 
-/** Delete the given data object from edje.
+/**
+ * @brief Deletes the given data object from edje.
  *
  * @param obj Object being edited.
  * @param itemname Data entry to remove from the global data block.
@@ -640,7 +667,8 @@ EAPI Eina_Bool edje_edit_data_add(Evas_Object *obj, const char *itemname, const
  */
 EAPI Eina_Bool edje_edit_data_del(Evas_Object *obj, const char *itemname);
 
-/** Get the data associated with the given itemname.
+/**
+ * @brief Gets the data associated with the given itemname.
  *
  * @param obj Object being edited.
  * @param itemname Name of the data entry to fetch the value for.
@@ -649,7 +677,8 @@ EAPI Eina_Bool edje_edit_data_del(Evas_Object *obj, const char *itemname);
  */
 EAPI const char * edje_edit_data_value_get(Evas_Object *obj, const char *itemname);
 
-/** Set the data associated with the given itemname.
+/**
+ * @brief Sets the data associated with the given itemname.
  *
  * @param obj Object being edited.
  * @param itemname Name of data entry to change the value.
@@ -659,7 +688,8 @@ EAPI const char * edje_edit_data_value_get(Evas_Object *obj, const char *itemnam
  */
 EAPI Eina_Bool edje_edit_data_value_set(Evas_Object *obj, const char *itemname, const char *value);
 
-/** Change the name of the given data object.
+/**
+ * @brief Changes the name of the given data object.
  *
  * @param obj Object being edited.
  * @param itemname Data entry to rename.
@@ -669,7 +699,8 @@ EAPI Eina_Bool edje_edit_data_value_set(Evas_Object *obj, const char *itemname,
  */
 EAPI Eina_Bool edje_edit_data_name_set(Evas_Object *obj, const char *itemname, const char *newname);
 
-/** Retrieves a list with the item names inside the data block at the group level.
+/**
+ * @brief Retrieves a list with the item names inside the data block at the group level.
  *
  * @param obj Object being edited.
  *
@@ -677,7 +708,8 @@ EAPI Eina_Bool edje_edit_data_name_set(Evas_Object *obj, const char *itemname, c
  */
 EAPI Eina_List * edje_edit_group_data_list_get(Evas_Object *obj);
 
-/** Create a new data object in the given edje file *belonging to the current group*.
+/**
+ * @brief Creates a new data object in the given edje file *belonging to the current group*.
  *
  * If another data entry with the same name exists,
  * nothing is created and EINA_FALSE is returned.
@@ -690,7 +722,8 @@ EAPI Eina_List * edje_edit_group_data_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_group_data_add(Evas_Object *obj, const char *itemname, const char *value);
 
-/** Delete the given data object from the group.
+/**
+ * @brief Deletes the given data object from the group.
  *
  * @param obj Object being edited.
  * @param itemname Name of the data entry to remove.
@@ -699,7 +732,8 @@ EAPI Eina_Bool edje_edit_group_data_add(Evas_Object *obj, const char *itemname,
  */
 EAPI Eina_Bool edje_edit_group_data_del(Evas_Object *obj, const char *itemname);
 
-/** Get the data associated with the given itemname.
+/**
+ * @brief Gets the data associated with the given itemname.
  *
  * @param obj Object being edited.
  * @param itemname Name of the data entry.
@@ -708,7 +742,8 @@ EAPI Eina_Bool edje_edit_group_data_del(Evas_Object *obj, const char *itemname);
  */
 EAPI const char * edje_edit_group_data_value_get(Evas_Object *obj, const char *itemname);
 
-/** Set the data associated with the given itemname.
+/**
+ * @brief Sets the data associated with the given itemname.
  *
  * @param obj Object being edited.
  * @param itemname Name of the data entry to set the value.
@@ -718,7 +753,8 @@ EAPI const char * edje_edit_group_data_value_get(Evas_Object *obj, const char *i
  */
 EAPI Eina_Bool edje_edit_group_data_value_set(Evas_Object *obj, const char *itemname, const char *value);
 
-/** Change the name of the given data object.
+/**
+ * @brief Changes the name of the given data object.
  *
  * @param obj Object being edited.
  * @param itemname Name of the data entry to rename.
@@ -733,11 +769,13 @@ EAPI Eina_Bool edje_edit_group_data_name_set(Evas_Object *obj, const char *itemn
 /*****************************************************************************/
 /***********************   SIZE CLASSES API   ********************************/
 /*****************************************************************************/
-/** @name Size Classes API
- *  Functions to deal with Size Classes (see @ref edcref).
+/**
+ * @name Size Classes API
+ * Functions to deal with Size Classes (see @ref edcref).
  */ //@{
 
-/** Get the list of all the Size Classes in the given edje object.
+/**
+ * @brief Gets the list of all the Size Classes in the given edje object.
  *
  * @param obj Object being edited.
  *
@@ -751,7 +789,8 @@ EAPI Eina_Bool edje_edit_group_data_name_set(Evas_Object *obj, const char *itemn
 EAPI Eina_List *
 edje_edit_size_classes_list_get(Evas_Object *obj);
 
-/** Create a new size class object in the given edje.
+/**
+ * @brief Creates a new size class object in the given edje.
  *
  * If class is already exist then nothing is created and EINA_FALSE returned.
  *
@@ -765,7 +804,8 @@ edje_edit_size_classes_list_get(Evas_Object *obj);
 EAPI Eina_Bool
 edje_edit_size_class_add(Evas_Object *obj, const char *name);
 
-/** Delete size class object from edje.
+/**
+ * @brief Deletes size class object from edje.
  *
  * @param obj Object being edited.
  * @param name Size class to delete.
@@ -777,7 +817,8 @@ edje_edit_size_class_add(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_size_class_del(Evas_Object *obj, const char *name);
 
-/** Change name of a size class.
+/**
+ * @brief Changes name of a size class.
  *
  * @param obj Object being edited.
  * @param name Size class to rename.
@@ -790,7 +831,8 @@ edje_edit_size_class_del(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_size_class_name_set(Evas_Object *obj, const char *name, const char *newname);
 
-/** Return width min size of specified size class.
+/**
+ * @brief Returns width min size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to fetch values.
@@ -802,7 +844,8 @@ edje_edit_size_class_name_set(Evas_Object *obj, const char *name, const char *ne
 EAPI Evas_Coord
 edje_edit_size_class_min_w_get(Evas_Object *obj, const char *class_name);
 
-/** Set width min size of specified size class.
+/**
+ * @brief Sets width min size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to set values.
@@ -815,7 +858,8 @@ edje_edit_size_class_min_w_get(Evas_Object *obj, const char *class_name);
 EAPI Eina_Bool
 edje_edit_size_class_min_w_set(Evas_Object *obj, const char *class_name, Evas_Coord size);
 
-/** Return width max size of specified size class.
+/**
+ * @brief Returns width max size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to fetch values.
@@ -827,7 +871,8 @@ edje_edit_size_class_min_w_set(Evas_Object *obj, const char *class_name, Evas_Co
 EAPI Evas_Coord
 edje_edit_size_class_max_w_get(Evas_Object *obj, const char *class_name);
 
-/** Set width max size of specified size class.
+/**
+ * @brief Sets width max size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to set values.
@@ -840,7 +885,8 @@ edje_edit_size_class_max_w_get(Evas_Object *obj, const char *class_name);
 EAPI Eina_Bool
 edje_edit_size_class_max_w_set(Evas_Object *obj, const char *class_name, Evas_Coord size);
 
-/** Return height min size of specified size class.
+/**
+ * @brief Returns height min size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to fetch values.
@@ -852,7 +898,8 @@ edje_edit_size_class_max_w_set(Evas_Object *obj, const char *class_name, Evas_Co
 EAPI Evas_Coord
 edje_edit_size_class_min_h_get(Evas_Object *obj, const char *class_name);
 
-/** Set height min size of specified size class.
+/**
+ * @brief Sets height min size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to set values.
@@ -865,7 +912,8 @@ edje_edit_size_class_min_h_get(Evas_Object *obj, const char *class_name);
 EAPI Eina_Bool
 edje_edit_size_class_min_h_set(Evas_Object *obj, const char *class_name, Evas_Coord size);
 
-/** Return height max size of specified size class.
+/**
+ * @brief Returns height max size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to fetch values.
@@ -877,7 +925,8 @@ edje_edit_size_class_min_h_set(Evas_Object *obj, const char *class_name, Evas_Co
 EAPI Evas_Coord
 edje_edit_size_class_max_h_get(Evas_Object *obj, const char *class_name);
 
-/** Set height max size of specified size class.
+/**
+ * @brief Sets height max size of specified size class.
  *
  * @param obj Object being edited.
  * @param class_name Size class to set values.
@@ -894,11 +943,13 @@ edje_edit_size_class_max_h_set(Evas_Object *obj, const char *class_name, Evas_Co
 /*****************************************************************************/
 /***********************   TEXT CLASSES API   ********************************/
 /*****************************************************************************/
-/** @name Text Classes API
- *  Functions to deal with Text Classes (see @ref edcref).
+/**
+ * @name Text Classes API
+ * Functions to deal with Text Classes (see @ref edcref).
  */ //@{
 
-/** Get the list of all the Text Classes in the given edje object.
+/**
+ * @brief Gets the list of all the Text Classes in the given edje object.
  *
  * @param obj Object being edited.
  *
@@ -912,7 +963,8 @@ edje_edit_size_class_max_h_set(Evas_Object *obj, const char *class_name, Evas_Co
 EAPI Eina_List *
 edje_edit_text_classes_list_get(Evas_Object *obj);
 
-/** Create a new text class object in the given edje.
+/**
+ * @brief Creates a new text class object in the given edje.
  *
  * If class is already exist then nothing is created and EINA_FALSE returned.
  *
@@ -926,7 +978,8 @@ edje_edit_text_classes_list_get(Evas_Object *obj);
 EAPI Eina_Bool
 edje_edit_text_class_add(Evas_Object *obj, const char *name);
 
-/** Delete text class object from edje.
+/**
+ * @brief Deletes text class object from edje.
  *
  * @param obj Object being edited.
  * @param name Text class to delete.
@@ -938,7 +991,8 @@ edje_edit_text_class_add(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_text_class_del(Evas_Object *obj, const char *name);
 
-/** Change name of a text class.
+/**
+ * @brief Changes name of a text class.
  *
  * @param obj Object being edited.
  * @param name Text class to rename.
@@ -951,7 +1005,8 @@ edje_edit_text_class_del(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_text_class_name_set(Evas_Object *obj, const char *name, const char *newname);
 
-/** Return font name of specified text class.
+/**
+ * @brief Returns font name of specified text class.
  *
  * @param obj Object being edited.
  * @param class_name Text class to fetch values.
@@ -963,7 +1018,8 @@ edje_edit_text_class_name_set(Evas_Object *obj, const char *name, const char *ne
 EAPI Eina_Stringshare *
 edje_edit_text_class_font_get(Evas_Object *obj, const char *class_name);
 
-/** Set font for the given text class.
+/**
+ * @brief Sets font for the given text class.
  *
  * NULL is possible value.
  *
@@ -978,7 +1034,8 @@ edje_edit_text_class_font_get(Evas_Object *obj, const char *class_name);
 EAPI Eina_Bool
 edje_edit_text_class_font_set(Evas_Object *obj, const char *class_name, const char *font);
 
-/** Return font size of specified text class.
+/**
+ * @brief Returns font size of specified text class.
  *
  * @param obj Object being edited.
  * @param class_name Text class to fetch values.
@@ -990,7 +1047,8 @@ edje_edit_text_class_font_set(Evas_Object *obj, const char *class_name, const ch
 EAPI Evas_Font_Size
 edje_edit_text_class_size_get(Evas_Object *obj, const char *class_name);
 
-/** Set font size for specified text class
+/**
+ * @brief Sets font size for specified text class
  *
  * @param obj Object being edited.
  * @param class_name Text class to set values.
@@ -1008,11 +1066,13 @@ edje_edit_text_class_size_set(Evas_Object *obj, const char *class_name, Evas_Fon
 /******************************************************************************/
 /***********************   COLOR CLASSES API   ********************************/
 /******************************************************************************/
-/** @name Color Classes API
- *  Functions to deal with Color Classes (see @ref edcref).
+/**
+ * @name Color Classes API
+ * Functions to deal with Color Classes (see @ref edcref).
  */ //@{
 
-/** Get the list of all the Color Classes in the given edje object.
+/**
+ * @brief Gets the list of all the Color Classes in the given edje object.
  *
  * @param obj Object being edited.
  *
@@ -1020,7 +1080,8 @@ edje_edit_text_class_size_set(Evas_Object *obj, const char *class_name, Evas_Fon
  */
 EAPI Eina_List * edje_edit_color_classes_list_get(Evas_Object *obj);
 
-/** Create a new color class object in the given edje.
+/**
+ * @brief Creates a new color class object in the given edje.
  *
  * If another class with the same name exists nothing is created and EINA_FALSE is returned.
  *
@@ -1031,7 +1092,8 @@ EAPI Eina_List * edje_edit_color_classes_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_color_class_add(Evas_Object *obj, const char *name);
 
-/** Delete the given class object from edje.
+/**
+ * @brief Deletes the given class object from edje.
  *
  * @param obj Object being edited.
  * @param name Color class to delete.
@@ -1040,7 +1102,8 @@ EAPI Eina_Bool edje_edit_color_class_add(Evas_Object *obj, const char *name);
  */
 EAPI Eina_Bool edje_edit_color_class_del(Evas_Object *obj, const char *name);
 
-/** Get all the colors that compose the class.
+/**
+ * @brief Gets all the colors that compose the class.
  *
  * You can pass NULL to colors you are not intrested in.
  *
@@ -1063,7 +1126,8 @@ EAPI Eina_Bool edje_edit_color_class_del(Evas_Object *obj, const char *name);
  */
 EAPI Eina_Bool edje_edit_color_class_colors_get(Evas_Object *obj, const char *class_name, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
 
-/** Set the colors for the given color class.
+/**
+ * @brief Sets the colors for the given color class.
  *
  * If you set a color to -1 it will not be touched.
  *
@@ -1086,7 +1150,8 @@ EAPI Eina_Bool edje_edit_color_class_colors_get(Evas_Object *obj, const char *cl
  */
 EAPI Eina_Bool edje_edit_color_class_colors_set(Evas_Object *obj, const char *class_name, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
 
-/** Change the name of a color class.
+/**
+ * @brief Changes the name of a color class.
  *
  * @param obj Object being edited.
  * @param name Color class to rename.
@@ -1096,7 +1161,8 @@ EAPI Eina_Bool edje_edit_color_class_colors_set(Evas_Object *obj, const char *cl
  */
 EAPI Eina_Bool edje_edit_color_class_name_set(Evas_Object *obj, const char *name, const char *newname);
 
-/** Get the description of a color class.
+/**
+ * @brief Gets the description of a color class.
  *
  * @param obj Object being edited.
  * @param name Color class to get the description of.
@@ -1106,7 +1172,8 @@ EAPI Eina_Bool edje_edit_color_class_name_set(Evas_Object *obj, const char *name
  */
 EAPI Eina_Stringshare *edje_edit_color_class_description_get(Evas_Object *obj, const char *class_name);
 
-/** Change the description of a color class.
+/**
+ * @brief Changes the description of a color class.
  *
  * @param obj Object being edited.
  * @param name Color class to edit.
@@ -1122,11 +1189,13 @@ EAPI Eina_Bool edje_edit_color_class_description_set(Evas_Object *obj, const cha
 /******************************************************************************/
 /**************************   TEXT STYLES *************************************/
 /******************************************************************************/
-/** @name Text styles API
- *  Functions to deal with text styles (see @ref edcref).
+/**
+ * @name Text styles API
+ * Functions to deal with text styles (see @ref edcref).
  */ //@{
 
-/** Get the list of all the text styles in the given edje object.
+/**
+ * @brief Gets the list of all the text styles in the given edje object.
  *
  * @param obj Object being edited.
  *
@@ -1134,7 +1203,8 @@ EAPI Eina_Bool edje_edit_color_class_description_set(Evas_Object *obj, const cha
  */
 EAPI Eina_List * edje_edit_styles_list_get(Evas_Object *obj);
 
-/** Create a new text style object in the given edje.
+/**
+ * @brief Creates a new text style object in the given edje.
  *
  * If another style with the same name exists nothing is created and EINA_FALSE is returned.
  *
@@ -1145,7 +1215,8 @@ EAPI Eina_List * edje_edit_styles_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_style_add(Evas_Object *obj, const char *style);
 
-/** Delete the given text style and all the child tags.
+/**
+ * @brief Deletes the given text style and all the child tags.
  *
  * @param obj Object being edited.
  * @param style Style to delete.
@@ -1154,7 +1225,8 @@ EAPI Eina_Bool edje_edit_style_add(Evas_Object *obj, const char *style);
  */
 EAPI Eina_Bool edje_edit_style_del(Evas_Object *obj, const char *style);
 
-/** Get the list of all the tags name in the given text style.
+/**
+ * @brief Gets the list of all the tags name in the given text style.
  *
  * @param obj Object being edited.
  * @param style Style to get the tags for.
@@ -1163,7 +1235,8 @@ EAPI Eina_Bool edje_edit_style_del(Evas_Object *obj, const char *style);
  */
 EAPI Eina_List * edje_edit_style_tags_list_get(Evas_Object *obj, const char *style);
 
-/** Get the value of the given tag.
+/**
+ * @brief Gets the value of the given tag.
  *
  * @param obj Object being edited.
  * @param style Style containing the tag being.
@@ -1173,7 +1246,8 @@ EAPI Eina_List * edje_edit_style_tags_list_get(Evas_Object *obj, const char *sty
  */
 EAPI const char * edje_edit_style_tag_value_get(Evas_Object *obj, const char *style, const char *tag);
 
-/** Set the value of the given tag.
+/**
+ * @brief Sets the value of the given tag.
  *
  * @param obj Object being edited.
  * @param style Style containing the tag to change.
@@ -1184,7 +1258,8 @@ EAPI const char * edje_edit_style_tag_value_get(Evas_Object *obj, const char *st
  */
 EAPI Eina_Bool edje_edit_style_tag_value_set(Evas_Object *obj, const char *style, const char *tag, const char *new_value);
 
-/** Set the name of the given tag.
+/**
+ * @brief Sets the name of the given tag.
  *
  * @param obj Object being edited.
  * @param style Style containing the tag to rename.
@@ -1195,7 +1270,8 @@ EAPI Eina_Bool edje_edit_style_tag_value_set(Evas_Object *obj, const char *style
  */
 EAPI Eina_Bool edje_edit_style_tag_name_set(Evas_Object *obj, const char *style, const char *tag, const char *new_name);
 
-/** Add a new tag to the given text style.
+/**
+ @ @brief Adds a new tag to the given text style.
  *
  * If another tag with the same name exists nothing is created and EINA_FALSE is returned.
  *
@@ -1207,7 +1283,8 @@ EAPI Eina_Bool edje_edit_style_tag_name_set(Evas_Object *obj, const char *style,
  */
 EAPI Eina_Bool edje_edit_style_tag_add(Evas_Object *obj, const char *style, const char *tag_name);
 
-/** Delete the given tag.
+/**
+ * @brief Deletes the given tag.
  *
  * @param obj Object being edited.
  * @param style Style from where to remove the tag.
@@ -1222,11 +1299,13 @@ EAPI Eina_Bool edje_edit_style_tag_del(Evas_Object *obj, const char *style, cons
 /******************************************************************************/
 /************************   EXTERNALS API   ***********************************/
 /******************************************************************************/
-/** @name Externals API
- *  Functions to deal with list of external modules (see @ref edcref).
+/**
+ * @name Externals API
+ * Functions to deal with list of external modules (see @ref edcref).
  */ //@{
 
-/** Get the list of all the externals requested in the given edje object.
+/**
+ * @brief Gets the list of all the externals requested in the given edje object.
  *
  * @param obj Object being edited.
  *
@@ -1234,7 +1313,8 @@ EAPI Eina_Bool edje_edit_style_tag_del(Evas_Object *obj, const char *style, cons
  */
 EAPI Eina_List * edje_edit_externals_list_get(Evas_Object *obj);
 
-/** Add an external module to be requested on edje load.
+/**
+ * @brief Adds an external module to be requested on edje load.
  *
  * @param obj Object being edited.
  * @param external Name of the external module to add to the list of autoload.
@@ -1243,7 +1323,8 @@ EAPI Eina_List * edje_edit_externals_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_external_add(Evas_Object *obj, const char *external);
 
-/** Delete the given external from the list.
+/**
+ * @brief Deletes the given external from the list.
  *
  * @param obj Object being edited.
  * @param external Name of the external module to remove from the autoload list.
@@ -1257,11 +1338,13 @@ EAPI Eina_Bool edje_edit_external_del(Evas_Object *obj, const char *external);
 /******************************************************************************/
 /**************************   PARTS API   *************************************/
 /******************************************************************************/
-/** @name Parts API
- *  Functions to deal with part objects (see @ref edcref).
+/**
+ * @name Parts API
+ * Functions to deal with part objects (see @ref edcref).
  */ //@{
 
-/** Get the select mode for a textblock part
+/**
+ * @brief Gets the select mode for a textblock part.
 
  * @param obj Object being edited.
  * @param part Name of the part.
@@ -1271,7 +1354,8 @@ EAPI Eina_Bool edje_edit_external_del(Evas_Object *obj, const char *external);
  */
 EAPI Edje_Edit_Select_Mode edje_edit_part_select_mode_get(Evas_Object *obj, const char *part);
 
-/** Set the select mode for a textblock part
+/**
+ * @brief Sets the select mode for a textblock part.
  *
  * @param obj Object being edited.
  * @param part Name of the part.
@@ -1283,7 +1367,8 @@ EAPI Edje_Edit_Select_Mode edje_edit_part_select_mode_get(Evas_Object *obj, cons
  */
 EAPI Eina_Bool edje_edit_part_select_mode_set(Evas_Object *obj, const char *part, Edje_Edit_Select_Mode mode);
 
-/** Get the edit mode for a textblock part
+/**
+ * @brief Gets the edit mode for a textblock part.
  *
  * @param obj Object being edited.
  * @param part Name of the part.
@@ -1293,7 +1378,8 @@ EAPI Eina_Bool edje_edit_part_select_mode_set(Evas_Object *obj, const char *part
  */
 EAPI Edje_Edit_Entry_Mode edje_edit_part_entry_mode_get(Evas_Object *obj, const char *part);
 
-/** Set the edit mode for a textblock part
+/**
+ * @brief Sets the edit mode for a textblock part.
  *
  * @param obj Object being edited.
  * @param part Name of the part.
@@ -1305,7 +1391,8 @@ EAPI Edje_Edit_Entry_Mode edje_edit_part_entry_mode_get(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_part_entry_mode_set(Evas_Object *obj, const char *part, Edje_Edit_Entry_Mode mode);
 
-/** Get the list of all the parts in the given edje object.
+/**
+ * @brief Gets the list of all the parts in the given edje object.
  *
  * @param obj Object being edited.
  *
@@ -1316,7 +1403,8 @@ EAPI Eina_Bool edje_edit_part_entry_mode_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_List * edje_edit_parts_list_get(Evas_Object *obj);
 
-/** Create a new part in the given edje.
+/**
+ * @brief Creates a new part in the given edje.
  *
  * If another part with the same name just exists nothing is created and EINA_FALSE is returned.
  * Note that this function also create a default description for the part.
@@ -1329,7 +1417,8 @@ EAPI Eina_List * edje_edit_parts_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type);
 
-/** Create a new part of type EXTERNAL in the given edje.
+/**
+ * @brief Creates a new part of type EXTERNAL in the given edje.
  *
  * If another part with the same name just exists nothing is created and EINA_FALSE is returned.
  * Note that this function also create a default description for the part.
@@ -1342,7 +1431,8 @@ EAPI Eina_Bool edje_edit_part_add(Evas_Object *obj, const char *name, Edje_Part_
  */
 EAPI Eina_Bool edje_edit_part_external_add(Evas_Object *obj, const char *name, const char *source);
 
-/** Delete the given part from the edje.
+/**
+ * @brief Deletes the given part from the edje.
  *
  * All the reference to this part will be zeroed.
  *
@@ -1353,7 +1443,8 @@ EAPI Eina_Bool edje_edit_part_external_add(Evas_Object *obj, const char *name, c
  */
 EAPI Eina_Bool edje_edit_part_del(Evas_Object *obj, const char *part);
 
-/** Copy the given part in edje.
+/**
+ * @brief Copies the given part in edje.
  *
  * If another part with the same name just exists nothing is created and EINA_FALSE is returned.
  *
@@ -1366,7 +1457,8 @@ EAPI Eina_Bool edje_edit_part_del(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_copy(Evas_Object *obj, const char *part, const char *new_copy);
 
-/** Check if a part with the given name exist in the edje object.
+/**
+ * @brief Checks if a part with the given name exist in the edje object.
  *
  * @param obj Object being edited.
  * @param part Name of part to check for its existence.
@@ -1375,7 +1467,8 @@ EAPI Eina_Bool edje_edit_part_copy(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_part_exist(Evas_Object *obj, const char *part);
 
-/** Get the name of part stacked above the one passed.
+/**
+ * @brief Gets the name of part stacked above the one passed.
  *
  * @param obj Object being edited.
  * @param part Name of part of which to check the one above.
@@ -1385,7 +1478,8 @@ EAPI Eina_Bool edje_edit_part_exist(Evas_Object *obj, const char *part);
  */
 EAPI const char * edje_edit_part_above_get(Evas_Object *obj, const char *part);
 
-/** Get the name of part stacked below the one passed.
+/**
+ * @brief Gets the name of part stacked below the one passed.
  *
  * @param obj Object being edited.
  * @param part Name of part of which to check the one below.
@@ -1395,7 +1489,8 @@ EAPI const char * edje_edit_part_above_get(Evas_Object *obj, const char *part);
  */
 EAPI const char * edje_edit_part_below_get(Evas_Object *obj, const char *part);
 
-/** Move the given part below the previous one.
+/**
+ * @brief Moves the given part below the previous one.
  *
  * @param obj Object being edited.
  * @param part Name of part to move one step below.
@@ -1404,7 +1499,8 @@ EAPI const char * edje_edit_part_below_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_restack_below(Evas_Object *obj, const char *part);
 
-/** Move the given part below the part named below.
+/**
+ * @brief Moves the given part below the part named below.
  *
  * @param obj Object being edited.
  * @param part Name of part which will be moved.
@@ -1414,7 +1510,8 @@ EAPI Eina_Bool edje_edit_part_restack_below(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_restack_part_below(Evas_Object *obj, const char* part, const char *below);
 
-/** Move the given part above the next one.
+/**
+ * @brief Moves the given part above the next one.
  *
  * @param obj Object being edited.
  * @param part Name of part to move one step above.
@@ -1423,7 +1520,8 @@ EAPI Eina_Bool edje_edit_part_restack_part_below(Evas_Object *obj, const char* p
  */
 EAPI Eina_Bool edje_edit_part_restack_above(Evas_Object *obj, const char *part);
 
-/** Move the given part above the part named above.
+/**
+ * @brief Moves the given part above the part named above.
  *
  * @param obj Object being edited.
  * @param part Name of part which will be moved.
@@ -1433,7 +1531,8 @@ EAPI Eina_Bool edje_edit_part_restack_above(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_restack_part_above(Evas_Object *obj, const char* part, const char *above);
 
-/** Set a new name for part.
+/**
+ * @brief Sets a new name for part.
  *
  * Note that the relative getter function don't exist as it don't make sense ;)
  *
@@ -1445,25 +1544,28 @@ EAPI Eina_Bool edje_edit_part_restack_part_above(Evas_Object *obj, const char* p
  */
 EAPI Eina_Bool edje_edit_part_name_set(Evas_Object *obj, const char *part, const char *new_name);
 
-/** Get api's name of a part.
+/**
+ * @brief Gets api's name of a part.
  *
  * @param obj Object being edited.
  * @param part Name of the part.
  *
- * @return name of the api if successful, NULL otherwise.
+ * @return Name of the API if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_part_api_name_get(Evas_Object *obj, const char *part);
 
-/** Get api's description of a part.
+/**
+ * @brief Gets api's description of a part.
  *
  * @param obj Object being edited.
  * @param part Name of the part.
  *
- * @return description of the api if successful, NULL otherwise.
+ * @return Description of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_part_api_description_get(Evas_Object *obj, const char *part);
 
-/** Set api's name of a part.
+/**
+ * @brief Sets api's name of a part.
  *
  * @param obj Object being edited.
  * @param part Name of the part.
@@ -1473,7 +1575,8 @@ EAPI const char * edje_edit_part_api_description_get(Evas_Object *obj, const cha
  */
 EAPI Eina_Bool edje_edit_part_api_name_set(Evas_Object *obj, const char *part, const char *name);
 
-/** Set api's description of a part.
+/**
+ * @brief Sets api's description of a part.
  *
  * @param obj Object being edited.
  * @param part Name of part.
@@ -1483,7 +1586,8 @@ EAPI Eina_Bool edje_edit_part_api_name_set(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_part_api_description_set(Evas_Object *obj, const char *part, const char *description);
 
-/** Get the type of a part.
+/**
+ * @brief Gets the type of a part.
  *
  * @param obj Object being edited.
  * @param part Name of part to get the type of.
@@ -1492,7 +1596,8 @@ EAPI Eina_Bool edje_edit_part_api_description_set(Evas_Object *obj, const char *
  */
 EAPI Edje_Part_Type edje_edit_part_type_get(Evas_Object *obj, const char *part);
 
-/** Get the clip_to part.
+/**
+ * @brief Gets the clip_to part.
  *
  * @param obj Object being edited.
  * @param part Name of the part whose clipper to get.
@@ -1501,7 +1606,8 @@ EAPI Edje_Part_Type edje_edit_part_type_get(Evas_Object *obj, const char *part);
  */
 EAPI const char * edje_edit_part_clip_to_get(Evas_Object *obj, const char *part);
 
-/** Set a part to clip part to.
+/**
+ * @brief Sets a part to clip part to.
  *
  * @param obj Object being edited.
  * @param part Part to set the clipper to.
@@ -1511,7 +1617,8 @@ EAPI const char * edje_edit_part_clip_to_get(Evas_Object *obj, const char *part)
  */
 EAPI Eina_Bool edje_edit_part_clip_to_set(Evas_Object *obj, const char *part, const char *clip_to);
 
-/** Get the source of part.
+/**
+ * @brief Gets the source of part.
  *
  * The meaning of this parameter varies depending on the type of the part.
  * For GROUP parts, it's the name of another group in the Edje file which will
@@ -1528,7 +1635,8 @@ EAPI Eina_Bool edje_edit_part_clip_to_set(Evas_Object *obj, const char *part, co
  */
 EAPI const char * edje_edit_part_source_get(Evas_Object *obj, const char *part);
 
-/** Set the source of part.
+/**
+ * @brief Sets the source of part.
  *
  * If setting source of the part will lead to recursive reference
  * (when A source to B, and B is going to be source to A because of this function),
@@ -1549,7 +1657,8 @@ EAPI const char * edje_edit_part_source_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_source_set(Evas_Object *obj, const char *part, const char *source);
 
-/** Get the source2 of part.
+/**
+ * @brief Gets the source2 of part.
  *
  * Only available to TEXTBLOCK parts. It is used for the group to be loaded and
  * used for selection display OVER the selected text. source is used for under
@@ -1563,7 +1672,8 @@ EAPI Eina_Bool edje_edit_part_source_set(Evas_Object *obj, const char *part, con
  */
 EAPI const char * edje_edit_part_source2_get(Evas_Object *obj, const char *part);
 
-/** Set the source2 of part.
+/**
+ * @brief Sets the source2 of part.
  *
  * @param obj Object being edited.
  * @param part Part to set the source of.
@@ -1576,7 +1686,8 @@ EAPI const char * edje_edit_part_source2_get(Evas_Object *obj, const char *part)
  */
 EAPI Eina_Bool edje_edit_part_source2_set(Evas_Object *obj, const char *part, const char *source);
 
-/** Get the source3 of part.
+/**
+ * @brief Gets the source3 of part.
  *
  * Only available to TEXTBLOCK parts. It is used for the group to be loaded and
  * used for cursor display UNDER the cursor position. source4 is used for over
@@ -1590,7 +1701,8 @@ EAPI Eina_Bool edje_edit_part_source2_set(Evas_Object *obj, const char *part, co
  */
 EAPI const char * edje_edit_part_source3_get(Evas_Object *obj, const char *part);
 
-/** Set the source3 of part.
+/**
+ * @brief Sets the source3 of part.
  *
  * @param obj Object being edited.
  * @param part Part to set the source of.
@@ -1605,7 +1717,8 @@ EAPI const char * edje_edit_part_source3_get(Evas_Object *obj, const char *part)
  */
 EAPI Eina_Bool edje_edit_part_source3_set(Evas_Object *obj, const char *part, const char *source);
 
-/** Get the source4 of part.
+/**
+ * @brief Gets the source4 of part.
  *
  * Only available to TEXTBLOCK parts. It is used for the group to be loaded and
  * used for cursor display OVER the cursor position. source3 is used for under
@@ -1619,7 +1732,8 @@ EAPI Eina_Bool edje_edit_part_source3_set(Evas_Object *obj, const char *part, co
  */
 EAPI const char * edje_edit_part_source4_get(Evas_Object *obj, const char *part);
 
-/** Set the source4 of part.
+/**
+ * @brief Sets the source4 of part.
  *
  * @param obj Object being edited.
  * @param part Part to set the source of.
@@ -1634,7 +1748,8 @@ EAPI const char * edje_edit_part_source4_get(Evas_Object *obj, const char *part)
  */
 EAPI Eina_Bool edje_edit_part_source4_set(Evas_Object *obj, const char *part, const char *source);
 
-/** Get the source5 of part.
+/**
+ * @brief Gets the source5 of part.
  *
  * Only available to TEXTBLOCK parts. It is used for the group to be loaded and
  * used for anchors display UNDER the anchor position. source6 is used for over
@@ -1648,7 +1763,8 @@ EAPI Eina_Bool edje_edit_part_source4_set(Evas_Object *obj, const char *part, co
  */
 EAPI const char * edje_edit_part_source5_get(Evas_Object *obj, const char *part);
 
-/** Set the source5 of part.
+/**
+ * @brief Sets the source5 of part.
  *
  * @param obj Object being edited.
  * @param part Part to set the source of.
@@ -1661,7 +1777,8 @@ EAPI const char * edje_edit_part_source5_get(Evas_Object *obj, const char *part)
  */
 EAPI Eina_Bool edje_edit_part_source5_set(Evas_Object *obj, const char *part, const char *source);
 
-/** Get the source6 of part.
+/**
+ * @brief Gets the source6 of part.
  *
  * Only available to TEXTBLOCK parts. It is used for the group to be loaded and
  * used for anchor display OVER the anchor position. source5 is used for under
@@ -1675,7 +1792,8 @@ EAPI Eina_Bool edje_edit_part_source5_set(Evas_Object *obj, const char *part, co
  */
 EAPI const char * edje_edit_part_source6_get(Evas_Object *obj, const char *part);
 
-/** Set the source6 of part.
+/**
+ * @brief Sets the source6 of part.
  *
  * @param obj Object being edited.
  * @param part Part to set the source of.
@@ -1688,7 +1806,8 @@ EAPI const char * edje_edit_part_source6_get(Evas_Object *obj, const char *part)
  */
 EAPI Eina_Bool edje_edit_part_source6_set(Evas_Object *obj, const char *part, const char *source);
 
-/** Get the effect for a given part.
+/**
+ * @brief Gets the effect for a given part.
  *
  * Gets the effect used for parts of type TEXT. See @ref edcref for more details.
  *
@@ -1699,7 +1818,8 @@ EAPI Eina_Bool edje_edit_part_source6_set(Evas_Object *obj, const char *part, co
  */
 EAPI Edje_Text_Effect edje_edit_part_effect_get(Evas_Object *obj, const char *part);
 
-/** Set the effect for a given part.
+/**
+ * @brief Sets the effect for a given part.
  * Effects and shadow directions can be combined.
  *
  * For effect and shadow direction list please look at Edje Part Text ref page.
@@ -1714,7 +1834,8 @@ EAPI Edje_Text_Effect edje_edit_part_effect_get(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_part_effect_set(Evas_Object *obj, const char *part, Edje_Text_Effect effect);
 
-/** Get the current selected state in part.
+/**
+ * @brief Gets the current selected state in part.
  *
  * @param obj Object being edited.
  * @param part Part to get the selected state of.
@@ -1724,7 +1845,8 @@ EAPI Eina_Bool edje_edit_part_effect_set(Evas_Object *obj, const char *part, Edj
  */
 EAPI const char * edje_edit_part_selected_state_get(Evas_Object *obj, const char *part, double *value);
 
-/** Set the current state in part.
+/**
+ * @brief Sets the current state in part.
  *
  * @param obj Object being edited.
  * @param part Part to set the state of.
@@ -1735,7 +1857,8 @@ EAPI const char * edje_edit_part_selected_state_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_part_selected_state_set(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get mouse_events for part.
+/**
+ * @brief Gets mouse_events for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if the mouse events is accepted.
@@ -1744,37 +1867,41 @@ EAPI Eina_Bool edje_edit_part_selected_state_set(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_part_mouse_events_get(Evas_Object *obj, const char *part);
 
-/** Set mouse_events for part.
+/**
+ * @brief Sets mouse_events for part.
  *
  * @param obj Object being edited.
  * @param part The part to set if the mouse events is accepted.
- * @param mouse_events EINA_TRUE if part will accept mouse events, @c EINA_FALSE otherwise.
+ * @param mouse_events @c EINA_TRUE if part will accept mouse events, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_mouse_events_set(Evas_Object *obj, const char *part, Eina_Bool mouse_events);
 
-/** Get anti-alising for part.
+/**
+ * @brief Gets anti-aliasing for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if the anti-aliasing is accepted.
  *
- * @return @c EINA_TRUE if part will draw anti-alised, @c EINA_FALSE otherwise.
+ * @return @c EINA_TRUE if part will draw anti-aliased, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_anti_alias_get(Evas_Object *obj, const char *part);
 
-/** Set anti-alising for part.
+/**
+ * @brief Sets anti-aliasing for part.
  *
  * @param obj Object being edited.
  * @param part The part to set if the anti-aliasing is accepted.
- * @param mouse_events EINA_TRUE if part should to draw anti-aliased, @c EINA_FALSE otherwise.
+ * @param mouse_events @c EINA_TRUE if part should to draw anti-aliased, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_anti_alias_set(Evas_Object *obj, const char *part, Eina_Bool anti_alias);
 
 
-/** Get repeat_events for part.
+/**
+ * @brief Gets repeat_events for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if it will pass all events to the other parts.
@@ -1783,17 +1910,19 @@ EAPI Eina_Bool edje_edit_part_anti_alias_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_part_repeat_events_get(Evas_Object *obj, const char *part);
 
-/** Set repeat_events for part.
+/**
+ * @brief Sets repeat_events for part.
  *
  * @param obj Object being edited.
  * @param part Part to set if will repeat all the received mouse events to other parts.
- * @param repeat_events EINA_TRUE if the events received will propagate to other parts, @c EINA_FALSE otherwise
+ * @param repeat_events @c EINA_TRUE if the events received will propagate to other parts, @c EINA_FALSE otherwise
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_repeat_events_set(Evas_Object *obj, const char *part, Eina_Bool repeat_events);
 
-/** Get use_alternate_font_metrics variable for part.
+/**
+ * @brief Gets use_alternate_font_metrics variable for part.
  *
  * @param obj Object being edited.
  * @param part Part to get use_alternate_font_metrics for text or textblock part is enabled.
@@ -1804,7 +1933,8 @@ EAPI Eina_Bool edje_edit_part_repeat_events_set(Evas_Object *obj, const char *pa
 EAPI Eina_Bool
 edje_edit_part_use_alternate_font_metrics_get(Evas_Object *obj, const char *part);
 
-/** Set use_alternate_font_metrics variable for part.
+/**
+ * @brief Sets use_alternate_font_metrics variable for part.
  *
  * @param obj Object being edited.
  * @param part Part to set use_alternate_font_metrics for text or textblock part is enabled.
@@ -1816,7 +1946,8 @@ edje_edit_part_use_alternate_font_metrics_get(Evas_Object *obj, const char *part
 EAPI Eina_Bool
 edje_edit_part_use_alternate_font_metrics_set(Evas_Object *obj, const char *part, Eina_Bool use);
 
-/** Get multiline for part.
+/**
+ * @brief Gets multiline for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if editing multiple lines for text or textblock part is enabled.
@@ -1826,18 +1957,20 @@ edje_edit_part_use_alternate_font_metrics_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_part_multiline_get(Evas_Object *obj, const char *part);
 
-/** Set multiline for part.
+/**
+ * @brief Sets multiline for part.
  *
  * @param obj Object being edited.
  * @param part Part to set if editing multiple lines for text or textblock part is enabled.
- * @param multiline EINA_TRUE if multiple lines for editing is enabled, @c EINA_FALSE otherwise
+ * @param multiline @c EINA_TRUE if multiple lines for editing is enabled, @c EINA_FALSE otherwise
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.11
  */
 EAPI Eina_Bool edje_edit_part_multiline_set(Evas_Object *obj, const char *part, Eina_Bool multiline);
 
-/** Get precise_is_inside for part.
+/**
+ * @brief Gets precise_is_inside for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if it will enable point collision detection for the part.
@@ -1847,7 +1980,8 @@ EAPI Eina_Bool edje_edit_part_multiline_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_part_precise_is_inside_get(Evas_Object *obj, const char *part);
 
-/** Set precise_is_inside for part.
+/**
+ * @brief Sets precise_is_inside for part.
  *
  * @param obj Object being edited.
  * @param part Part to set if it will enable point collision detection for the part.
@@ -1858,7 +1992,8 @@ EAPI Eina_Bool edje_edit_part_precise_is_inside_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_part_precise_is_inside_set(Evas_Object *obj, const char *part, Eina_Bool precise_is_inside);
 
-/** Get accessibility for part.
+/**
+ * @brief Gets accessibility for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if it uses accessibility feature.
@@ -1868,7 +2003,8 @@ EAPI Eina_Bool edje_edit_part_precise_is_inside_set(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_part_access_get(Evas_Object *obj, const char *part);
 
-/** Set accessibility for part.
+/**
+ * @brief Sets accessibility for part.
  *
  * @param obj Object being edited.
  * @param part Part to set if it uses accessibility feature.
@@ -1879,7 +2015,8 @@ EAPI Eina_Bool edje_edit_part_access_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_access_set(Evas_Object *obj, const char *part, Eina_Bool access);
 
-/** Get ignore_flags for part.
+/**
+ * @brief Gets ignore_flags for part.
  *
  * @param obj Object being edited.
  * @param part Part to get which event_flags are being ignored.
@@ -1888,7 +2025,8 @@ EAPI Eina_Bool edje_edit_part_access_set(Evas_Object *obj, const char *part, Ein
  */
 EAPI Evas_Event_Flags edje_edit_part_ignore_flags_get(Evas_Object *obj, const char *part);
 
-/** Set ignore_flags for part.
+/**
+ * @brief Sets ignore_flags for part.
  *
  * @param obj Object being edited.
  * @param part Part to set which event flags will be ignored.
@@ -1898,7 +2036,8 @@ EAPI Evas_Event_Flags edje_edit_part_ignore_flags_get(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_part_ignore_flags_set(Evas_Object *obj, const char *part, Evas_Event_Flags ignore_flags);
 
-/** Get mask_flags for part.
+/**
+ * @brief Gets mask_flags for part.
  *
  * @param obj Object being edited.
  * @param part Part to get which event_flags are being masked.
@@ -1907,7 +2046,8 @@ EAPI Eina_Bool edje_edit_part_ignore_flags_set(Evas_Object *obj, const char *par
  */
 EAPI Evas_Event_Flags edje_edit_part_mask_flags_get(Evas_Object *obj, const char *part);
 
-/** Set mask_flags for part.
+/**
+ * @brief Sets mask_flags for part.
  *
  * @param obj Object being edited.
  * @param part Part to set which event flags will be masked.
@@ -1917,7 +2057,8 @@ EAPI Evas_Event_Flags edje_edit_part_mask_flags_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_part_mask_flags_set(Evas_Object *obj, const char *part, Evas_Event_Flags mask_flags);
 
-/** Get pointer_mode of a part.
+/**
+ * @brief Gets pointer_mode of a part.
  *
  * @param obj Object being edited.
  * @param part Part name to get it's pointer_mode.
@@ -1927,7 +2068,8 @@ EAPI Eina_Bool edje_edit_part_mask_flags_set(Evas_Object *obj, const char *part,
  */
 EAPI Evas_Object_Pointer_Mode edje_edit_part_pointer_mode_get(Evas_Object *obj, const char *part);
 
-/** Get pointer_mode of a part.
+/**
+ * @brief Gets pointer_mode of a part.
  *
  * Note that Ponter Mode can be:
  * - EVAS_OBJECT_POINTER_MODE_AUTOGRAB - default, X11-like
@@ -1943,7 +2085,8 @@ EAPI Evas_Object_Pointer_Mode edje_edit_part_pointer_mode_get(Evas_Object *obj,
  */
 EAPI Eina_Bool edje_edit_part_pointer_mode_set(Evas_Object *obj, const char *part, Evas_Object_Pointer_Mode pointer_mode);
 
-/** Get cursor_mode of a part.
+/**
+ * @brief Gets cursor_mode of a part.
  *
  * Note that Cursor Mode can be:
  * 0 - UNDER cursor mode means the cursor will draw below the character pointed
@@ -1959,7 +2102,8 @@ EAPI Eina_Bool edje_edit_part_pointer_mode_set(Evas_Object *obj, const char *par
  */
 EAPI unsigned char edje_edit_part_cursor_mode_get(Evas_Object *obj, const char *part);
 
-/** Get pointer_mode of a part.
+/**
+ * @brief Gets pointer_mode of a part.
  *
  * Note that Cursor Mode can be:
  * 0 - UNDER cursor mode means the cursor will draw below the character pointed
@@ -1976,7 +2120,8 @@ EAPI unsigned char edje_edit_part_cursor_mode_get(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_part_cursor_mode_set(Evas_Object *obj, const char *part, unsigned char cursor_mode);
 
-/** Set scale property for the part.
+/**
+ * @brief Sets scale property for the part.
  *
  * This property tells Edje that the given part should be scaled by the
  * Edje scale factor.
@@ -1989,7 +2134,8 @@ EAPI Eina_Bool edje_edit_part_cursor_mode_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_part_scale_set(Evas_Object *obj, const char *part, Eina_Bool scale);
 
-/** Get scale for the part.
+/**
+ * @brief Gets scale for the part.
  *
  * @param obj Object being edited.
  * @param part Part to get the scale value of.
@@ -1998,45 +2144,50 @@ EAPI Eina_Bool edje_edit_part_scale_set(Evas_Object *obj, const char *part, Eina
  */
 EAPI Eina_Bool edje_edit_part_scale_get(Evas_Object *obj, const char *part);
 
-/** Get horizontal dragable state for part.
+/**
+ * @brief Gets horizontal dragable state for part.
  *
  * @param obj Object being edited.
- * @param part Part to get if can be dragged horizontally;
+ * @param part Part to get if can be dragged horizontally.
  *
- * @return 1 (or -1) if the part can be dragged horizontally, 0 otherwise.
+ * @return @c 1 (or -1) if the part can be dragged horizontally, @c 0 otherwise.
  */
 EAPI int edje_edit_part_drag_x_get(Evas_Object *obj, const char *part);
 
-/** Set horizontal dragable state for part.
+/**
+ * @brief Sets horizontal dragable state for part.
  *
  * @param obj Object being edited.
  * @param part Part to set if should be dragged horizontally.
- * @param drag 1 (or -1) if the part should be dragged horizontally, 0 otherwise.
+ * @param drag @c 1 (or -1) if the part should be dragged horizontally, @c 0 otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_drag_x_set(Evas_Object *obj, const char *part, int drag);
 
-/** Get vertical dragable state for part.
+/**
+ * @brief Gets vertical dragable state for part.
  *
  * @param obj Object being edited.
  * @param part Part to get if can be dragged vertically.
  *
- * @return 1 (or - 1) if the part can be dragged vertically, 0 otherwise.
+ * @return @c 1 (or - 1) if the part can be dragged vertically, @c 0 otherwise.
  */
 EAPI int edje_edit_part_drag_y_get(Evas_Object *obj, const char *part);
 
-/** Set vertical dragable state for part.
+/**
+ * @brief Sets vertical dragable state for part.
  *
  * @param obj Object being edited.
  * @param part Part to set if should be dragged vertically.
- * @param drag 1 (or -1) of the part shpuld be dragged vertically, 0 otherwise.
+ * @param drag @c 1 (or -1) of the part should be dragged vertically, @c 0 otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_drag_y_set(Evas_Object *obj, const char *part, int drag);
 
-/** Get horizontal dragable step for part.
+/**
+ * @brief Gets horizontal dragable step for part.
  *
  * @param obj Object being edited.
  * @param part Part to get the drag horizontal step value.
@@ -2045,7 +2196,8 @@ EAPI Eina_Bool edje_edit_part_drag_y_set(Evas_Object *obj, const char *part, int
  */
 EAPI int edje_edit_part_drag_step_x_get(Evas_Object *obj, const char *part);
 
-/** Set horizontal dragable state for part.
+/**
+ * @brief Sets horizontal dragable state for part.
  *
  * @param obj Object being edited.
  * @param part Part to set the drag horizontal step value.
@@ -2055,7 +2207,8 @@ EAPI int edje_edit_part_drag_step_x_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_drag_step_x_set(Evas_Object *obj, const char *part, int step);
 
-/** Get vertical dragable step for part.
+/**
+ * @brief Gets vertical dragable step for part.
  *
  * @param obj Object being edited.
  * @param part Part to get the drag vertical step value.
@@ -2064,7 +2217,8 @@ EAPI Eina_Bool edje_edit_part_drag_step_x_set(Evas_Object *obj, const char *part
  */
 EAPI int edje_edit_part_drag_step_y_get(Evas_Object *obj, const char *part);
 
-/** Set vertical dragable state for part.
+/**
+ * @brief Sets vertical dragable state for part.
  *
  * @param obj Object being edited.
  * @param part Part to set the drag vertical step value.
@@ -2074,16 +2228,18 @@ EAPI int edje_edit_part_drag_step_y_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_drag_step_y_set(Evas_Object *obj, const char *part, int step);
 
-/** Get horizontal dragable count for part.
+/**
+ * @brief Gets horizontal dragable count for part.
  *
  * @param obj Object being edited.
  * @param part Part to get the drag horizontal count value.
  *
- * @return horizontal dragable count value
+ * @return Horizontal dragable count value
  */
 EAPI int edje_edit_part_drag_count_x_get(Evas_Object *obj, const char *part);
 
-/** Set horizontal dragable count for part.
+/**
+ * @brief Sets horizontal dragable count for part.
  *
  * @param obj Object being edited.
  * @param part Part to set the drag horizontal count value.
@@ -2093,16 +2249,18 @@ EAPI int edje_edit_part_drag_count_x_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_drag_count_x_set(Evas_Object *obj, const char *part, int count);
 
-/** Get vertical dragable count for part.
+/**
+ * @brief Gets vertical dragable count for part.
  *
  * @param obj Object being edited.
  * @param part Part to get the drag vertical count value.
  *
- * @return vertical dragable count value
+ * @return Vertical dragable count value
  */
 EAPI int edje_edit_part_drag_count_y_get(Evas_Object *obj, const char *part);
 
-/** Set vertical dragable count for part.
+/**
+ * @brief Sets vertical dragable count for part.
  *
  * @param obj Object being edited.
  * @param part Part to set the drag vertical count value.
@@ -2112,26 +2270,29 @@ EAPI int edje_edit_part_drag_count_y_get(Evas_Object *obj, const char *part);
  */
 EAPI Eina_Bool edje_edit_part_drag_count_y_set(Evas_Object *obj, const char *part, int count);
 
-/** Get the name of the part that is used as 'confine' for the given draggies.
+/**
+ * @brief Gets the name of the part that is used as 'confine' for the given draggies.
  *
  * @param obj Object being edited.
  * @param part Part to get the name that is used as 'confine' for the given draggies.
  *
- * @return The name of the confine part or NULL (if unset).
+ * @return The name of the confine part, or NULL (if unset).
  */
 EAPI const char * edje_edit_part_drag_confine_get(Evas_Object *obj, const char *part);
 
-/** Set the name of the part that is used as 'confine' for the given draggies.
+/**
+ * @brief Sets the name of the part that is used as 'confine' for the given draggies.
  *
  * @param obj Object being edited.
  * @param part Part to set the name that is used as 'confine' for the given draggies.
- * @param confine The name of the confine part or NULL to unset confine.
+ * @param confine The name of the confine part, or NULL to unset confine.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_part_drag_confine_set(Evas_Object *obj, const char *part, const char *confine);
 
-/** Get the name of the part that is used as the receiver of the drag event.
+/**
+ * @brief Gets the name of the part that is used as the receiver of the drag event.
  *
  * @param obj Object being edited.
  * @param part Part to get the name that is used as the receiver of the drag event.
@@ -2140,7 +2301,8 @@ EAPI Eina_Bool edje_edit_part_drag_confine_set(Evas_Object *obj, const char *par
  */
 EAPI const char * edje_edit_part_drag_event_get(Evas_Object *obj, const char *part);
 
-/** Set the name of the part that will receive events from the given draggies.
+/**
+ * @brief Sets the name of the part that will receive events from the given draggies.
  *
  * @param obj Object being edited.
  * @param part Part to set the name that will receive events from the given draggies.
@@ -2150,20 +2312,22 @@ EAPI const char * edje_edit_part_drag_event_get(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_part_drag_event_set(Evas_Object *obj, const char *part, const char *event);
 
-/** Get the name of the part that is used as 'threshold' for the given draggies.
+/**
+ * @brief Gets the name of the part that is used as 'threshold' for the given draggies.
  *
  * @param obj Object being edited.
  * @param part Part to get the name that is used as 'threshold' for the given draggies.
  *
- * @return The name of the threshold part or NULL (if unset).
+ * @return The name of the threshold part, or NULL (if unset).
  */
 EAPI const char * edje_edit_part_drag_threshold_get(Evas_Object *obj, const char *part);
 
-/** Set the name of the part that is used as 'threshold' for the given draggies.
+/**
+ * @brief Sets the name of the part that is used as 'threshold' for the given draggies.
  *
  * @param obj Object being edited.
  * @param part Part to set the name that is used as 'threshold' for the given draggies.
- * @param threshold The name of the threshold part or NULL to unset confine.
+ * @param threshold The name of the threshold part, or NULL to unset confine.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
@@ -2173,11 +2337,13 @@ EAPI Eina_Bool edje_edit_part_drag_threshold_set(Evas_Object *obj, const char *p
 /******************************************************************************/
 /*******************************      BOX API      ****************************/
 /******************************************************************************/
-/** @name Box Description API
- *  Functions to deal with box (see @ref edcref).
+/**
+ * @name Box Description API
+ * Functions to deal with box (see @ref edcref).
  */ //@{
 
-/** Get primary layout of the box.
+/**
+ * @brief Gets primary layout of the box.
  *
  * @note The returned string should be freed with @c eina_stringshare_del().
  * @param obj Object being edited.
@@ -2190,7 +2356,8 @@ EAPI Eina_Bool edje_edit_part_drag_threshold_set(Evas_Object *obj, const char *p
  */
 EAPI Eina_Stringshare * edje_edit_state_box_layout_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set primary layout of the box.
+/**
+ * @brief Sets primary layout of the box.
  *
  * When trying to set primary layout to NULL, function will use
  * alternative layout instead.
@@ -2218,7 +2385,8 @@ EAPI Eina_Stringshare * edje_edit_state_box_layout_get(Evas_Object *obj, const c
  */
 EAPI Eina_Bool edje_edit_state_box_layout_set(Evas_Object *obj, const char *part, const char *state, double value, char *layout);
 
-/** Get fallback layout of the box.
+/**
+ * @brief Gets fallback layout of the box.
  *
  * @note The returned string should be freed with @c eina_stringshare_del().
  * @param obj Object being edited.
@@ -2231,7 +2399,8 @@ EAPI Eina_Bool edje_edit_state_box_layout_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Stringshare * edje_edit_state_box_alt_layout_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set fallback layout of the box.
+/**
+ * @brief Sets fallback layout of the box.
  *
  * When trying to set fallback layout to NULL, function will use
  * default layout ("horizontal") instead.
@@ -2263,11 +2432,13 @@ EAPI Eina_Bool edje_edit_state_box_alt_layout_set(Evas_Object *obj, const char *
 /******************************************************************************/
 /**************************   TABLE API   *************************************/
 /******************************************************************************/
-/** @name Table Description API
- *  Functions to deal with table (see @ref edcref).
+/**
+ * @name Table Description API
+ * Functions to deal with table (see @ref edcref).
  */ //@{
 
-/** Set homogeneous mode for TABLE part.
+/**
+ * @brief Sets homogeneous mode for TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that have TABLE type.
@@ -2285,7 +2456,8 @@ EAPI Eina_Bool edje_edit_state_box_alt_layout_set(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool
 edje_edit_state_table_homogeneous_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char homogeneous);
-/** Get homogeneous mode for TABLE part.
+/**
+ * @brief Gets homogeneous mode for TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that have TABLE type.
@@ -2297,7 +2469,7 @@ edje_edit_state_table_homogeneous_set(Evas_Object *obj, const char *part, const
  *     @li EDJE_OBJECT_TABLE_HOMOGENEOUS_TABLE,
  *     @li EDJE_OBJECT_TABLE_HOMOGENEOUS_ITEM
  *
- * @return Table homogeneous mode on success or 0 on any error.
+ * @return Table homogeneous mode on success, or @c 0 on any error.
  * @since 1.14
  */
 EAPI unsigned char edje_edit_state_table_homogeneous_get(Evas_Object *obj, const char *part, const char *state, double value);
@@ -2306,13 +2478,18 @@ EAPI unsigned char edje_edit_state_table_homogeneous_get(Evas_Object *obj, const
 /******************************************************************************/
 /***********************   TABLE & BOX API   **********************************/
 /******************************************************************************/
-/** @name "Container" Description API
+/**
+ * @name "Container" Description API
  * Functions to deal both with box and table (see @ref edcref).
  * Those functions called edje_edit_state_container_<something> because they
  * are working both for TABLE and BOX at same time.
  */ //@{
 
-/** Get whether vertical or horizontal minimum size's of the box are equal
+/**
+ * @deprecated Use edje_edit_state_container_min_h_get() and
+ * edje_edit_state_container_min_v_get() instead.
+ *
+ * @brief Gets whether vertical or horizontal minimum size's of the box are equal
  * to the minimum vertical or horizontal size of items
  * (function for BOX or TABLE part.
  * If EINA_TRUE - is equal, if EINA_FALSE - is not)
@@ -2324,16 +2501,14 @@ EAPI unsigned char edje_edit_state_table_homogeneous_get(Evas_Object *obj, const
  * @param h Variable to store horizontal min value.
  * @param v Variable to store vertical min value.
  *
- * @deprecated Use edje_edit_state_container_min_h_get() and
- * edje_edit_state_container_min_v_get() instead.
- *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.14
  */
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_state_container_min_get(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool *h, Eina_Bool *v);
 
-/** Get whether horizontal min size of the container is equal to the min
+/**
+ * @brief Gets whether horizontal min size of the container is equal to the min
  * horizontal size of items (BOX and TABLE part functions).
  *
  * @param obj Object being edited.
@@ -2348,7 +2523,8 @@ EAPI Eina_Bool edje_edit_state_container_min_get(Evas_Object *obj, const char *p
 EAPI Eina_Bool
 edje_edit_state_container_min_h_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get whether vertical min size of the container is equal to the min vertical
+/**
+ * @brief Gets whether vertical min size of the container is equal to the min vertical
  * size of items (BOX and TABLE part functions).
  *
  * @param obj Object being edited.
@@ -2363,7 +2539,11 @@ edje_edit_state_container_min_h_get(Evas_Object *obj, const char *part, const ch
 EAPI Eina_Bool
 edje_edit_state_container_min_v_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set whether vertical or horizontal minimum size's of the box are equal
+/**
+ * @deprecated Use edje_edit_state_container_min_h_set() and
+ * edje_edit_state_container_min_v_set() instead.
+ *
+ * @brief Sets whether vertical or horizontal minimum size's of the box are equal
  * to the minimum vertical or horizontal size of items
  * (function for BOX or TABLE part.
  * If EINA_TRUE - is equal, if EINA_FALSE - is not)
@@ -2375,16 +2555,14 @@ edje_edit_state_container_min_v_get(Evas_Object *obj, const char *part, const ch
  * @param h horizontal min value.
  * @param v vertical min value.
  *
- * @deprecated Use edje_edit_state_container_min_h_set() and
- * edje_edit_state_container_min_v_set() instead.
- *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.14
  */
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_state_container_min_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool h, Eina_Bool v);
 
-/** Set whether horizontal min size of the container should be equal to the min
+/**
+ * @brief Sets whether horizontal min size of the container should be equal to the min
  * horizontal size of items (BOX and TABLE part functions).
  *
  * @param obj Object being edited.
@@ -2400,7 +2578,8 @@ EAPI Eina_Bool edje_edit_state_container_min_set(Evas_Object *obj, const char *p
 EAPI Eina_Bool
 edje_edit_state_container_min_h_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool h);
 
-/** Set whether vertical min size of the container should be equal to the min
+/**
+ * @brief Sets whether vertical min size of the container should be equal to the min
  * vertical size of items (BOX and TABLE part functions).
  *
  * @param obj Object being edited.
@@ -2415,7 +2594,11 @@ edje_edit_state_container_min_h_set(Evas_Object *obj, const char *part, const ch
 EAPI Eina_Bool
 edje_edit_state_container_min_v_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool v);
 
-/** Get x and y paddings for BOX or TABLE part.
+/**
+ * @deprecated Use edje_edit_state_container_padding_x_get() and
+ * edje_edit_state_container_padding_y_get() instead.
+ *
+ * @brief Gets x and y paddings for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that have BOX/TABLE type.
@@ -2424,16 +2607,14 @@ edje_edit_state_container_min_v_set(Evas_Object *obj, const char *part, const ch
  * @param x Variable to store x padding.
  * @param y Variable to store y padding.
  *
- * @deprecated Use edje_edit_state_container_padding_x_get() and
- * edje_edit_state_container_padding_y_get() instead.
- *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.14
  */
 EINA_DEPRECATED EAPI Eina_Bool
 edje_edit_state_container_padding_get(Evas_Object *obj, const char *part, const char *state, double value, int *x, int *y);
 
-/** Get x padding for BOX or TABLE part.
+/**
+ * @brief Gets x padding for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2446,7 +2627,8 @@ edje_edit_state_container_padding_get(Evas_Object *obj, const char *part, const
 EAPI int
 edje_edit_state_container_padding_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get y padding for BOX or TABLE part.
+/**
+ * @brief Gets y padding for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2459,7 +2641,11 @@ edje_edit_state_container_padding_x_get(Evas_Object *obj, const char *part, cons
 EAPI int
 edje_edit_state_container_padding_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set x and y paddings for BOX or TABLE part.
+/**
+ * @deprecated Use edje_edit_state_container_padding_x_set() and
+ * edje_edit_state_container_padding_y_set() instead.
+ *
+ * @brief Sets x and y paddings for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that have BOX/TABLE type.
@@ -2468,16 +2654,14 @@ edje_edit_state_container_padding_y_get(Evas_Object *obj, const char *part, cons
  * @param x Value for setting x padding.
  * @param y Value for setting y padding.
  *
- * @deprecated Use edje_edit_state_container_padding_x_set() and
- * edje_edit_state_container_padding_y_set() instead.
- *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.14
  */
 EINA_DEPRECATED EAPI Eina_Bool
 edje_edit_state_container_padding_set(Evas_Object *obj, const char *part, const char *state, double value, int x, int y);
 
-/** Set x padding for BOX or TABLE part.
+/**
+ * @brief Sets x padding for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2491,7 +2675,8 @@ edje_edit_state_container_padding_set(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_state_container_padding_x_set(Evas_Object *obj, const char *part, const char *state, double value, int x);
 
-/** Set y padding for BOX or TABLE part.
+/**
+ * @brief Sets y padding for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2505,7 +2690,11 @@ edje_edit_state_container_padding_x_set(Evas_Object *obj, const char *part, cons
 EAPI Eina_Bool
 edje_edit_state_container_padding_y_set(Evas_Object *obj, const char *part, const char *state, double value, int y);
 
-/** Set x and y align for BOX or TABLE part.
+/**
+ * @deprecated Use edje_edit_state_container_align_x_set() and
+ * edje_edit_state_container_align_y_set() instead.
+ *
+ * @brief Sets x and y align for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that have BOX/TABLE type.
@@ -2514,16 +2703,14 @@ edje_edit_state_container_padding_y_set(Evas_Object *obj, const char *part, cons
  * @param x Variable to store x value.
  * @param y Variable to store y value.
  *
- * @deprecated Use edje_edit_state_container_align_x_set() and
- * edje_edit_state_container_align_y_set() instead.
- *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.14
  */
 EINA_DEPRECATED EAPI Eina_Bool
 edje_edit_state_container_align_set(Evas_Object *obj, const char *part, const char *state, double value, double x, double y);
 
-/** Set x align for BOX or TABLE part.
+/**
+ * @brief Sets x align for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2537,7 +2724,8 @@ edje_edit_state_container_align_set(Evas_Object *obj, const char *part, const ch
 EAPI Eina_Bool
 edje_edit_state_container_align_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set y align for BOX or TABLE part.
+/**
+ * @brief Sets y align for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2551,7 +2739,11 @@ edje_edit_state_container_align_x_set(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_state_container_align_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
-/** Get x and y align for BOX or TABLE part.
+/**
+ * @deprecated Use edje_edit_state_container_align_x_set() and
+ * edje_edit_state_container_align_y_set() instead.
+ *
+ * @brief Gets x and y align for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that have BOX/TABLE type.
@@ -2560,16 +2752,14 @@ edje_edit_state_container_align_y_set(Evas_Object *obj, const char *part, const
  * @param x Value for setting x align.
  * @param y Value for setting y align.
  *
- * @deprecated Use edje_edit_state_container_align_x_set() and
- * edje_edit_state_container_align_y_set() instead.
- *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  * @since 1.14
  */
 EINA_DEPRECATED EAPI Eina_Bool
 edje_edit_state_container_align_get(Evas_Object *obj, const char *part, const char *state, double value, double *x, double *y);
 
-/** Get x align for BOX or TABLE part.
+/**
+ * @brief Gets x align for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2581,7 +2771,8 @@ edje_edit_state_container_align_get(Evas_Object *obj, const char *part, const ch
  */
 EAPI double
 edje_edit_state_container_align_x_get(Evas_Object *obj, const char *part, const char *state, double value);
-/** Get y align for BOX or TABLE part.
+/**
+ * @brief Gets y align for BOX or TABLE part.
  *
  * @param obj Object being edited.
  * @param part Part that has BOX/TABLE type.
@@ -2598,11 +2789,13 @@ edje_edit_state_container_align_y_get(Evas_Object *obj, const char *part, const
 /******************************************************************************/
 /**************************   BOX & TABLE ITEMS API   *************************/
 /******************************************************************************/
-/** @name Items API
- *  Functions to deal with table and box part's items (see @ref edcref).
+/**
+ * @name Items API
+ * Functions to deal with table and box part's items (see @ref edcref).
  */ //@{
 
-/** Append new item to box or table part.
+/**
+ * @brief Appends new item to box or table part.
  *
  * @param obj Object being edited.
  * @param part Part to add a new item. This part should have BOX or TABLE type.
@@ -2614,7 +2807,8 @@ edje_edit_state_container_align_y_get(Evas_Object *obj, const char *part, const
  */
 EAPI Eina_Bool edje_edit_part_item_append(Evas_Object *obj, const char *part, const char *item_name, const char *source_group);
 
-/** Insert new item to box or table part before specified existing item.
+/**
+ * @brief Inserts new item to box or table part before specified existing item.
  *
  * @param obj Object being edited.
  * @param part Part to add a new item. This part should have BOX or TABLE type.
@@ -2629,7 +2823,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_insert_before(Evas_Object *obj, const char *part, const char *item_name, const char *item_before, const char *source_group);
 
-/** Insert new item to box or table part before specified existing item.
+/**
+ * @brief Inserts new item to box or table part before specified existing item.
  *
  * @param obj Object being edited.
  * @param part Part to add a new item. This part should have BOX or TABLE type.
@@ -2643,7 +2838,8 @@ edje_edit_part_item_insert_before(Evas_Object *obj, const char *part, const char
 EAPI Eina_Bool
 edje_edit_part_item_insert_before_index(Evas_Object *obj, const char *part, const char *item_name, unsigned int index, const char *source_group);
 
-/** Insert new item to box or table part after specified existing item.
+/**
+ * @brief Inserts new item to box or table part after specified existing item.
  *
  * @param obj Object being edited.
  * @param part Part to add a new item. This part should have BOX or TABLE type.
@@ -2658,7 +2854,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_insert_after(Evas_Object *obj, const char *part, const char *item_name, const char *item_after, const char *source_group);
 
-/** Insert new item to box or table part after specified existing item.
+/**
+ * @brief Inserts new item to box or table part after specified existing item.
  *
  * @param obj Object being edited.
  * @param part Part to add a new item. This part should have BOX or TABLE type.
@@ -2672,7 +2869,8 @@ edje_edit_part_item_insert_after(Evas_Object *obj, const char *part, const char
 EAPI Eina_Bool
 edje_edit_part_item_insert_after_index(Evas_Object *obj, const char *part, const char *item_name, unsigned int index, const char *source_group);
 
-/** Insert new item to box or table part directly into specified position.
+/**
+ * @brief Inserts new item to box or table part directly into specified position.
  *
  * @param obj Object being edited.
  * @param part Part to add a new item. This part should have BOX or TABLE type.
@@ -2687,7 +2885,8 @@ edje_edit_part_item_insert_after_index(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_part_item_insert_at(Evas_Object *obj, const char *part, const char *item_name, const char *source_group, unsigned int place);
 
-/** Restack existing item above.
+/**
+ * @brief Restacks existing item above.
  *
  * @param obj Object being edited.
  * @param part Part which contain items. This part should have BOX or TABLE type.
@@ -2700,7 +2899,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_move_above(Evas_Object *obj, const char *part, const char *item_name);
 
-/** Restack existing item above.
+/**
+ * @brief Restacks existing item above.
  *
  * @param obj Object being edited.
  * @param part Part which contain items. This part should have BOX or TABLE type.
@@ -2712,7 +2912,8 @@ edje_edit_part_item_move_above(Evas_Object *obj, const char *part, const char *i
 EAPI Eina_Bool
 edje_edit_part_item_move_above_index(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Restack existing item below.
+/**
+ * @brief Restacks existing item below.
  *
  * @param obj Object being edited.
  * @param part Part which contain items. This part should have BOX or TABLE type.
@@ -2725,7 +2926,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_move_below(Evas_Object *obj, const char *part, const char *item_name);
 
-/** Restack existing item below.
+/**
+ * @brief Restacks existing item below.
  *
  * @param obj Object being edited.
  * @param part Part which contain items. This part should have BOX or TABLE type.
@@ -2737,7 +2939,8 @@ edje_edit_part_item_move_below(Evas_Object *obj, const char *part, const char *i
 EAPI Eina_Bool
 edje_edit_part_item_move_below_index(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Get the list of all part items in the given edje.
+/**
+ * @brief Gets the list of all part items in the given edje.
  *
  * @param obj Object being edited.
  * @param part Name of part which is TABLE or BOX part and contain items.
@@ -2748,7 +2951,8 @@ edje_edit_part_item_move_below_index(Evas_Object *obj, const char *part, unsigne
 EINA_DEPRECATED
 EAPI Eina_List * edje_edit_part_items_list_get(Evas_Object *obj, const char *part);
 
-/** Get the conunt of part items in the given edje.
+/**
+ * @brief Gets the count of part items in the given edje.
  *
  * @param obj Object being edited.
  * @param part Name of part which is TABLE or BOX part and contain items.
@@ -2759,7 +2963,8 @@ EAPI Eina_List * edje_edit_part_items_list_get(Evas_Object *obj, const char *par
 EAPI int
 edje_edit_part_items_count_get(Evas_Object *obj, const char *part);
 
-/** Delete item from box or table part.
+/**
+ * @brief Deletes item from box or table part.
  *
  * @param obj Object being edited.
  * @param part Part to delete exist item. This part should have BOX or TABLE type.
@@ -2771,7 +2976,8 @@ edje_edit_part_items_count_get(Evas_Object *obj, const char *part);
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_del(Evas_Object *obj, const char *part, const char* name);
 
-/** Delete item from box or table part by index.
+/**
+ * @brief Deletes item from box or table part by index.
  *
  * @param obj Object being edited.
  * @param part Part to delete exist item. This part should have BOX or TABLE type.
@@ -2783,7 +2989,8 @@ EAPI Eina_Bool edje_edit_part_item_del(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_part_item_index_del(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set name for item from table or box items.
+/**
+ * @brief Sets name for item from table or box items.
  *
  * @param obj Object being edited.
  * @param part Part to change item's source. This part should have BOX or TABLE type.
@@ -2796,7 +3003,8 @@ edje_edit_part_item_index_del(Evas_Object *obj, const char *part, unsigned int i
 EAPI Eina_Bool
 edje_edit_part_item_index_name_set(Evas_Object *obj, const char *part, unsigned int index, const char *name);
 
-/** Get name for item from table or box items.
+/**
+ * @brief Gets name for item from table or box items.
  *
  * @param obj Object being edited.
  * @param part Part to return item's source. This part should have BOX or TABLE type.
@@ -2808,7 +3016,8 @@ edje_edit_part_item_index_name_set(Evas_Object *obj, const char *part, unsigned
 EAPI const char *
 edje_edit_part_item_index_name_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set source for item from table or box items.
+/**
+ * @brief Sets source for item from table or box items.
  *
  * @param obj Object being edited.
  * @param part Part to change item's source. This part should have BOX or TABLE type.
@@ -2821,7 +3030,8 @@ edje_edit_part_item_index_name_get(Evas_Object *obj, const char *part, unsigned
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_source_set(Evas_Object *obj, const char *part, const char *item_name, const char *source_group);
 
-/** Set source for item from table or box items.
+/**
+ * @brief Sets source for item from table or box items.
  *
  * @param obj Object being edited.
  * @param part Part to change item's source. This part should have BOX or TABLE type.
@@ -2834,7 +3044,8 @@ EAPI Eina_Bool edje_edit_part_item_source_set(Evas_Object *obj, const char *part
 EAPI Eina_Bool
 edje_edit_part_item_index_source_set(Evas_Object *obj, const char *part, unsigned int index, const char *source_group);
 
-/** Get source for item from table or box items.
+/**
+ * @brief Gets source for item from table or box items.
  *
  * @param obj Object being edited.
  * @param part Part to return item's source. This part should have BOX or TABLE type.
@@ -2846,7 +3057,8 @@ edje_edit_part_item_index_source_set(Evas_Object *obj, const char *part, unsigne
 EINA_DEPRECATED
 EAPI const char * edje_edit_part_item_source_get(Evas_Object *obj, const char *part, const char *item_name);
 
-/** Get source for item from table or box items.
+/**
+ * @brief Gets source for item from table or box items.
  *
  * @param obj Object being edited.
  * @param part Part to return item's source. This part should have BOX or TABLE type.
@@ -2858,7 +3070,8 @@ EAPI const char * edje_edit_part_item_source_get(Evas_Object *obj, const char *p
 EAPI const char *
 edje_edit_part_item_index_source_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Get the minimum width value of a part's item.
+/**
+ * @brief Gets the minimum width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -2870,7 +3083,8 @@ edje_edit_part_item_index_source_get(Evas_Object *obj, const char *part, unsigne
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_min_w_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the minimum width value of a part's item.
+/**
+ * @brief Sets the minimum width value of a part's item.
  * The minimum width should be greater than 0.
  *
  * @param obj Object being edited.
@@ -2884,7 +3098,8 @@ EAPI int edje_edit_part_item_min_w_get(Evas_Object *obj, const char *part, const
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_min_w_set(Evas_Object *obj, const char *part, const char *item, int min_w);
 
-/** Get the minimum height value of a part's item.
+/**
+ * @brief Gets the minimum height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -2896,7 +3111,8 @@ EAPI Eina_Bool edje_edit_part_item_min_w_set(Evas_Object *obj, const char *part,
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_min_h_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the minimum height value of a part's item.
+/**
+ * @brief Sets the minimum height value of a part's item.
  * The minimum height should be greater than 0.
  *
  * @param obj Object being edited.
@@ -2910,7 +3126,8 @@ EAPI int edje_edit_part_item_min_h_get(Evas_Object *obj, const char *part, const
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_min_h_set(Evas_Object *obj, const char *part, const char *item, int min_h);
 
-/** Get the maximum width value of a part's item.
+/**
+ * @brief Gets the maximum width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -2922,7 +3139,8 @@ EAPI Eina_Bool edje_edit_part_item_min_h_set(Evas_Object *obj, const char *part,
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_max_w_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the maximum width value of a part's item.
+/**
+ * @brief Sets the maximum width value of a part's item.
  * The maximum width should be greater than -1.
  * The value -1 means that state doesn't have any boundaries on width direction.
  * (it can be any size that is bigger than it's min)
@@ -2938,7 +3156,8 @@ EAPI int edje_edit_part_item_max_w_get(Evas_Object *obj, const char *part, const
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_max_w_set(Evas_Object *obj, const char *part, const char *item, int max_w);
 
-/** Get the maximum height value of a part's item.
+/**
+ * @brief Gets the maximum height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -2950,7 +3169,8 @@ EAPI Eina_Bool edje_edit_part_item_max_w_set(Evas_Object *obj, const char *part,
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_max_h_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the maximum height value of a part's item.
+/**
+ * @brief Sets the maximum height value of a part's item.
  * The maximum height should be greater than -1.
  * The value -1 means that state doesn't have any boundaries on height direction.
  * (it can be any size that is bigger than it's min)
@@ -2966,7 +3186,8 @@ EAPI int edje_edit_part_item_max_h_get(Evas_Object *obj, const char *part, const
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_max_h_set(Evas_Object *obj, const char *part, const char *item, int max_h);
 
-/** Get the aspect width value of a part's item.
+/**
+ * @brief Gets the aspect width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -2978,7 +3199,8 @@ EAPI Eina_Bool edje_edit_part_item_max_h_set(Evas_Object *obj, const char *part,
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_aspect_w_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the aspect width value of a part's item.
+/**
+ * @brief Sets the aspect width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -2991,7 +3213,8 @@ EAPI int edje_edit_part_item_aspect_w_get(Evas_Object *obj, const char *part, co
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_aspect_w_set(Evas_Object *obj, const char *part, const char *item, int aspect_w);
 
-/** Get the aspect height value of a part's item.
+/**
+ * @brief Gets the aspect height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3003,7 +3226,8 @@ EAPI Eina_Bool edje_edit_part_item_aspect_w_set(Evas_Object *obj, const char *pa
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_aspect_h_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the aspect height value of a part's item.
+/**
+ * @brief Sets the aspect height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3016,7 +3240,8 @@ EAPI int edje_edit_part_item_aspect_h_get(Evas_Object *obj, const char *part, co
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_aspect_h_set(Evas_Object *obj, const char *part, const char *item, int aspect_h);
 
-/** Get the prefer width value of a part's item.
+/**
+ * @brief Gets the prefer width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3028,7 +3253,8 @@ EAPI Eina_Bool edje_edit_part_item_aspect_h_set(Evas_Object *obj, const char *pa
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_prefer_w_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Get aspect mode for an item of TABLE or BOX.
+/**
+ * @brief Gets aspect mode for an item of TABLE or BOX.
  *
  * This may return next values:
  * - EDJE_ASPECT_CONTROL_NONE
@@ -3048,7 +3274,8 @@ EINA_DEPRECATED
 EAPI Edje_Aspect_Control
 edje_edit_part_item_aspect_mode_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set aspect mode for an item of TABLE or BOX.
+/**
+ * @brief Sets aspect mode for an item of TABLE or BOX.
  *
  * Mode may be next:
  * - EDJE_ASPECT_CONTROL_NONE
@@ -3068,7 +3295,8 @@ edje_edit_part_item_aspect_mode_get(Evas_Object *obj, const char *part, const ch
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_aspect_mode_set(Evas_Object *obj, const char *part, const char *item, Edje_Aspect_Control mode);
 
-/** Set the prefer width value of a part's item.
+/**
+ * @brief Sets the prefer width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3081,7 +3309,8 @@ EAPI Eina_Bool edje_edit_part_item_aspect_mode_set(Evas_Object *obj, const char
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_prefer_w_set(Evas_Object *obj, const char *part, const char *item, int prefer_w);
 
-/** Get the prefer height value of a part's item.
+/**
+ * @brief Gets the prefer height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3093,7 +3322,8 @@ EAPI Eina_Bool edje_edit_part_item_prefer_w_set(Evas_Object *obj, const char *pa
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_prefer_h_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the prefer height value of a part's item.
+/**
+ * @brief Sets the prefer height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3106,7 +3336,8 @@ EAPI int edje_edit_part_item_prefer_h_get(Evas_Object *obj, const char *part, co
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_prefer_h_set(Evas_Object *obj, const char *part, const char *item, int prefer_h);
 
-/** Get the spread width value of a part's item.
+/**
+ * @brief Gets the spread width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3118,7 +3349,8 @@ EAPI Eina_Bool edje_edit_part_item_prefer_h_set(Evas_Object *obj, const char *pa
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_spread_w_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the spread width value of a part's item.
+/**
+ * @brief Sets the spread width value of a part's item.
  *
  * @attention be careful, if you set up huge number (like 10 or 100). width and height of
  * spread is being multiplied and you will get huge number of objects that may "eat"
@@ -3136,7 +3368,8 @@ EAPI int edje_edit_part_item_spread_w_get(Evas_Object *obj, const char *part, co
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_spread_w_set(Evas_Object *obj, const char *part, const char *item, int spread_w);
 
-/** Get the spread height value of a part's item.
+/**
+ * @brief Gets the spread height value of a part's item.
  *
  * @attention be careful, if you set up huge number (like 10 or 100). width and height of
  * spread is being multiplied and you will get huge number of objects that may "eat"
@@ -3153,7 +3386,8 @@ EAPI Eina_Bool edje_edit_part_item_spread_w_set(Evas_Object *obj, const char *pa
 EINA_DEPRECATED
 EAPI int edje_edit_part_item_spread_h_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the spread height value of a part's item.
+/**
+ * @brief Sets the spread height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3166,7 +3400,8 @@ EAPI int edje_edit_part_item_spread_h_get(Evas_Object *obj, const char *part, co
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_spread_h_set(Evas_Object *obj, const char *part, const char *item, int spread_h);
 
-/** Get the minimum width value of a part's item.
+/**
+ * @brief Gets the minimum width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3178,7 +3413,8 @@ EAPI Eina_Bool edje_edit_part_item_spread_h_set(Evas_Object *obj, const char *pa
 EAPI int
 edje_edit_part_item_index_min_w_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the minimum width value of a part's item.
+/**
+ * @brief Sets the minimum width value of a part's item.
  * The minimum width should be greater than 0.
  *
  * @param obj Object being edited.
@@ -3192,7 +3428,8 @@ edje_edit_part_item_index_min_w_get(Evas_Object *obj, const char *part, unsigned
 EAPI Eina_Bool
 edje_edit_part_item_index_min_w_set(Evas_Object *obj, const char *part, unsigned int index, int min_w);
 
-/** Get the minimum height value of a part's item.
+/**
+ * @brief Gets the minimum height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3204,7 +3441,8 @@ edje_edit_part_item_index_min_w_set(Evas_Object *obj, const char *part, unsigned
 EAPI int
 edje_edit_part_item_index_min_h_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the minimum height value of a part's item.
+/**
+ * @brief Sets the minimum height value of a part's item.
  * The minimum height should be greater than 0.
  *
  * @param obj Object being edited.
@@ -3218,7 +3456,8 @@ edje_edit_part_item_index_min_h_get(Evas_Object *obj, const char *part, unsigned
 EAPI Eina_Bool
 edje_edit_part_item_index_min_h_set(Evas_Object *obj, const char *part, unsigned int index, int min_h);
 
-/** Get the maximum width value of a part's item.
+/**
+ * @brief Gets the maximum width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3230,7 +3469,8 @@ edje_edit_part_item_index_min_h_set(Evas_Object *obj, const char *part, unsigned
 EAPI int
 edje_edit_part_item_index_max_w_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the maximum width value of a part's item.
+/**
+ * @brief Sets the maximum width value of a part's item.
  * The maximum width should be greater than -1.
  * The value -1 means that state doesn't have any boundaries on width direction.
  * (it can be any size that is bigger than it's min)
@@ -3246,7 +3486,8 @@ edje_edit_part_item_index_max_w_get(Evas_Object *obj, const char *part, unsigned
 EAPI Eina_Bool
 edje_edit_part_item_index_max_w_set(Evas_Object *obj, const char *part, unsigned int index, int max_w);
 
-/** Get the maximum height value of a part's item.
+/**
+ * @brief Gets the maximum height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3258,7 +3499,8 @@ edje_edit_part_item_index_max_w_set(Evas_Object *obj, const char *part, unsigned
 EAPI int
 edje_edit_part_item_index_max_h_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the maximum height value of a part's item.
+/**
+ * @brief Sets the maximum height value of a part's item.
  * The maximum height should be greater than -1.
  * The value -1 means that state doesn't have any boundaries on height direction.
  * (it can be any size that is bigger than it's min)
@@ -3274,7 +3516,8 @@ edje_edit_part_item_index_max_h_get(Evas_Object *obj, const char *part, unsigned
 EAPI Eina_Bool
 edje_edit_part_item_index_max_h_set(Evas_Object *obj, const char *part, unsigned int index, int max_h);
 
-/** Get the aspect width value of a part's item.
+/**
+ * @brief Gets the aspect width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3286,7 +3529,8 @@ edje_edit_part_item_index_max_h_set(Evas_Object *obj, const char *part, unsigned
 EAPI int
 edje_edit_part_item_index_aspect_w_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the aspect width value of a part's item.
+/**
+ * @brief Sets the aspect width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3299,7 +3543,8 @@ edje_edit_part_item_index_aspect_w_get(Evas_Object *obj, const char *part, unsig
 EAPI Eina_Bool
 edje_edit_part_item_index_aspect_w_set(Evas_Object *obj, const char *part, unsigned int index, int aspect_w);
 
-/** Get the aspect height value of a part's item.
+/**
+ * @brief Gets the aspect height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3311,7 +3556,8 @@ edje_edit_part_item_index_aspect_w_set(Evas_Object *obj, const char *part, unsig
 EAPI int
 edje_edit_part_item_index_aspect_h_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the aspect height value of a part's item.
+/**
+ * @brief Sets the aspect height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3324,7 +3570,8 @@ edje_edit_part_item_index_aspect_h_get(Evas_Object *obj, const char *part, unsig
 EAPI Eina_Bool
 edje_edit_part_item_index_aspect_h_set(Evas_Object *obj, const char *part, unsigned int index, int aspect_h);
 
-/** Get the prefer width value of a part's item.
+/**
+ * @brief Gets the prefer width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3336,7 +3583,8 @@ edje_edit_part_item_index_aspect_h_set(Evas_Object *obj, const char *part, unsig
 EAPI int
 edje_edit_part_item_index_prefer_w_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Get aspect mode for an item of TABLE or BOX.
+/**
+ * @brief Gets aspect mode for an item of TABLE or BOX.
  *
  * This may return next values:
  * - EDJE_ASPECT_CONTROL_NONE
@@ -3355,7 +3603,8 @@ edje_edit_part_item_index_prefer_w_get(Evas_Object *obj, const char *part, unsig
 EAPI Edje_Aspect_Control
 edje_edit_part_item_index_aspect_mode_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set aspect mode for an item of TABLE or BOX.
+/**
+ * @brief Sets aspect mode for an item of TABLE or BOX.
  *
  * Mode may be next:
  * - EDJE_ASPECT_CONTROL_NONE
@@ -3375,7 +3624,8 @@ edje_edit_part_item_index_aspect_mode_get(Evas_Object *obj, const char *part, un
 EAPI Eina_Bool
 edje_edit_part_item_index_aspect_mode_set(Evas_Object *obj, const char *part, unsigned int index, Edje_Aspect_Control mode);
 
-/** Set the prefer width value of a part's item.
+/**
+ * @brief Sets the prefer width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3388,7 +3638,8 @@ edje_edit_part_item_index_aspect_mode_set(Evas_Object *obj, const char *part, un
 EAPI Eina_Bool
 edje_edit_part_item_index_prefer_w_set(Evas_Object *obj, const char *part, unsigned int index, int prefer_w);
 
-/** Get the prefer height value of a part's item.
+/**
+ * @brief Gets the prefer height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3400,7 +3651,8 @@ edje_edit_part_item_index_prefer_w_set(Evas_Object *obj, const char *part, unsig
 EAPI int
 edje_edit_part_item_index_prefer_h_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the prefer height value of a part's item.
+/**
+ * @brief Sets the prefer height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3413,7 +3665,8 @@ edje_edit_part_item_index_prefer_h_get(Evas_Object *obj, const char *part, unsig
 EAPI Eina_Bool
 edje_edit_part_item_index_prefer_h_set(Evas_Object *obj, const char *part, unsigned int index, int prefer_h);
 
-/** Get the spread width value of a part's item.
+/**
+ * @brief Gets the spread width value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3425,7 +3678,8 @@ edje_edit_part_item_index_prefer_h_set(Evas_Object *obj, const char *part, unsig
 EAPI int
 edje_edit_part_item_index_spread_w_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the spread width value of a part's item.
+/**
+ * @brief Sets the spread width value of a part's item.
  *
  * @attention be careful, if you set up huge number (like 10 or 100). width and height of
  * spread is being multiplied and you will get huge number of objects that may "eat"
@@ -3443,7 +3697,8 @@ edje_edit_part_item_index_spread_w_get(Evas_Object *obj, const char *part, unsig
 EAPI Eina_Bool
 edje_edit_part_item_index_spread_w_set(Evas_Object *obj, const char *part, unsigned int index, int spread_w);
 
-/** Get the spread height value of a part's item.
+/**
+ * @brief Gets the spread height value of a part's item.
  *
  * @attention be careful, if you set up huge number (like 10 or 100). width and height of
  * spread is being multiplied and you will get huge number of objects that may "eat"
@@ -3460,7 +3715,8 @@ edje_edit_part_item_index_spread_w_set(Evas_Object *obj, const char *part, unsig
 EAPI int
 edje_edit_part_item_index_spread_h_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the spread height value of a part's item.
+/**
+ * @brief Sets the spread height value of a part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -3473,7 +3729,8 @@ edje_edit_part_item_index_spread_h_get(Evas_Object *obj, const char *part, unsig
 EAPI Eina_Bool
 edje_edit_part_item_index_spread_h_set(Evas_Object *obj, const char *part, unsigned int index, int spread_h);
 
-/** Get paddings of the part's item.
+/**
+ * @brief Gets paddings of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3489,7 +3746,8 @@ edje_edit_part_item_index_spread_h_set(Evas_Object *obj, const char *part, unsig
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_padding_get(Evas_Object *obj, const char *part, const char *item_name, int *l, int *r, int *t, int *b);
 
-/** Set paddings of the part's item.
+/**
+ * @brief Sets paddings of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3505,7 +3763,8 @@ EAPI Eina_Bool edje_edit_part_item_padding_get(Evas_Object *obj, const char *par
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_padding_set(Evas_Object *obj, const char *part, const char *item_name, int l, int r, int t, int b);
 
-/** Get paddings of the part's item.
+/**
+ * @brief Gets paddings of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3521,7 +3780,8 @@ EAPI Eina_Bool edje_edit_part_item_padding_set(Evas_Object *obj, const char *par
 EAPI Eina_Bool
 edje_edit_part_item_index_padding_get(Evas_Object *obj, const char *part, unsigned int index, int *l, int *r, int *t, int *b);
 
-/** Set paddings of the part's item.
+/**
+ * @brief Sets paddings of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3537,7 +3797,8 @@ edje_edit_part_item_index_padding_get(Evas_Object *obj, const char *part, unsign
 EAPI Eina_Bool
 edje_edit_part_item_index_padding_set(Evas_Object *obj, const char *part, unsigned int index, int l, int r, int t, int b);
 
-/** Get the horizontal align value of a part state.
+/**
+ * @brief Gets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3549,7 +3810,8 @@ edje_edit_part_item_index_padding_set(Evas_Object *obj, const char *part, unsign
 EINA_DEPRECATED
 EAPI double edje_edit_part_item_align_x_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Get the horizontal align value of a part state.
+/**
+ * @brief Gets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3561,7 +3823,8 @@ EAPI double edje_edit_part_item_align_x_get(Evas_Object *obj, const char *part,
 EAPI double
 edje_edit_part_item_index_align_x_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the horizontal align value of a part state.
+/**
+ * @brief Sets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain itemf
@@ -3574,7 +3837,8 @@ edje_edit_part_item_index_align_x_get(Evas_Object *obj, const char *part, unsign
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_align_x_set(Evas_Object *obj, const char *part, const char *item, double align_x);
 
-/** Set the horizontal align value of a part state.
+/**
+ * @brief Sets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain itemf
@@ -3587,7 +3851,8 @@ EAPI Eina_Bool edje_edit_part_item_align_x_set(Evas_Object *obj, const char *par
 EAPI Eina_Bool
 edje_edit_part_item_index_align_x_set(Evas_Object *obj, const char *part, unsigned int index, double align_x);
 
-/** Get the vertical align value of a part state.
+/**
+ * @brief Gets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3599,7 +3864,8 @@ edje_edit_part_item_index_align_x_set(Evas_Object *obj, const char *part, unsign
 EINA_DEPRECATED
 EAPI double edje_edit_part_item_align_y_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Get the vertical align value of a part state.
+/**
+ * @brief Gets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3611,7 +3877,8 @@ EAPI double edje_edit_part_item_align_y_get(Evas_Object *obj, const char *part,
 EAPI double
 edje_edit_part_item_index_align_y_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the vertical align value of a part state.
+/**
+ * @brief Sets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3624,7 +3891,8 @@ edje_edit_part_item_index_align_y_get(Evas_Object *obj, const char *part, unsign
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_align_y_set(Evas_Object *obj, const char *part, const char *item, double align_y);
 
-/** Set the vertical align value of a part state.
+/**
+ * @brief Sets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3637,7 +3905,8 @@ EAPI Eina_Bool edje_edit_part_item_align_y_set(Evas_Object *obj, const char *par
 EAPI Eina_Bool
 edje_edit_part_item_index_align_y_set(Evas_Object *obj, const char *part, unsigned int index, double align_y);
 
-/** Get the horizontal weight value of a part item.
+/**
+ * @brief Gets the horizontal weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3649,7 +3918,8 @@ edje_edit_part_item_index_align_y_set(Evas_Object *obj, const char *part, unsign
 EINA_DEPRECATED
 EAPI double edje_edit_part_item_weight_x_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Get the horizontal weight value of a part item.
+/**
+ * @brief Gets the horizontal weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3661,7 +3931,8 @@ EAPI double edje_edit_part_item_weight_x_get(Evas_Object *obj, const char *part,
 EAPI double
 edje_edit_part_item_index_weight_x_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the horizontal we value of a part item.
+/**
+ * @brief Sets the horizontal we value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain itemf
@@ -3674,7 +3945,8 @@ edje_edit_part_item_index_weight_x_get(Evas_Object *obj, const char *part, unsig
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_weight_x_set(Evas_Object *obj, const char *part, const char *item, double weight_x);
 
-/** Set the horizontal we value of a part item.
+/**
+ * @brief Sets the horizontal we value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain itemf
@@ -3687,7 +3959,8 @@ EAPI Eina_Bool edje_edit_part_item_weight_x_set(Evas_Object *obj, const char *pa
 EAPI Eina_Bool
 edje_edit_part_item_index_weight_x_set(Evas_Object *obj, const char *part, unsigned int index, double weight_x);
 
-/** Get the vertical weight value of a part item.
+/**
+ * @brief Gets the vertical weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3699,7 +3972,8 @@ edje_edit_part_item_index_weight_x_set(Evas_Object *obj, const char *part, unsig
 EINA_DEPRECATED
 EAPI double edje_edit_part_item_weight_y_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Get the vertical weight value of a part item.
+/**
+ * @brief Gets the vertical weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3711,7 +3985,8 @@ EAPI double edje_edit_part_item_weight_y_get(Evas_Object *obj, const char *part,
 EAPI double
 edje_edit_part_item_index_weight_y_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the vertical weight value of a part item.
+/**
+ * @brief Sets the vertical weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3724,7 +3999,8 @@ edje_edit_part_item_index_weight_y_get(Evas_Object *obj, const char *part, unsig
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_weight_y_set(Evas_Object *obj, const char *part, const char *item, double weight_y);
 
-/** Set the vertical weight value of a part item.
+/**
+ * @brief Sets the vertical weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3737,7 +4013,11 @@ EAPI Eina_Bool edje_edit_part_item_weight_y_set(Evas_Object *obj, const char *pa
 EAPI Eina_Bool
 edje_edit_part_item_index_weight_y_set(Evas_Object *obj, const char *part, unsigned int index, double weight_y);
 
-/** Get column/row position of the part's item.
+/**
+ * @deprecated Use edje_edit_part_item_position_col_get() and
+ * edje_edit_part_item_position_row_get() instead.
+ *
+ * @brief Gets column/row position of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3745,16 +4025,14 @@ edje_edit_part_item_index_weight_y_set(Evas_Object *obj, const char *part, unsig
  * @param col Column item position.
  * @param row Row item position.
  *
- * @deprecated Use edje_edit_part_item_position_col_get() and
- * edje_edit_part_item_position_row_get() instead.
- *
  * @return @c EINA_TRUE If successful, @c EINA_FALSE otherwise.
  * @since 1.11
  */
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_position_get(Evas_Object *obj, const char *part, const char *item_name, unsigned short *col, unsigned short *row);
 
-/** Get the horizontal align value of a part state.
+/**
+ * @brief Gets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3766,10 +4044,11 @@ EAPI Eina_Bool edje_edit_part_item_position_get(Evas_Object *obj, const char *pa
 EAPI double
 edje_edit_part_item_item_align_x_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the horizontal align value of a part state.
+/**
+ * @brief Sets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
- * @param part Part that contain itemf
+ * @param part Part that contain item
  * @param index Index of the item to set horizontal align value.
  * @param align_x New value of the horizontal align.
  *
@@ -3779,7 +4058,8 @@ edje_edit_part_item_item_align_x_get(Evas_Object *obj, const char *part, unsigne
 EAPI Eina_Bool
 edje_edit_part_item_item_align_x_set(Evas_Object *obj, const char *part, unsigned int index, double align_x);
 
-/** Get the vertical align value of a part state.
+/**
+ * @brief Gets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3791,7 +4071,8 @@ edje_edit_part_item_item_align_x_set(Evas_Object *obj, const char *part, unsigne
 EAPI double
 edje_edit_part_item_item_align_y_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the vertical align value of a part state.
+/**
+ * @brief Sets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3804,7 +4085,8 @@ edje_edit_part_item_item_align_y_get(Evas_Object *obj, const char *part, unsigne
 EAPI Eina_Bool
 edje_edit_part_item_item_align_y_set(Evas_Object *obj, const char *part, unsigned int index, double align_y);
 
-/** Get the horizontal weight value of a part item.
+/**
+ * @brief Gets the horizontal weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3816,7 +4098,8 @@ edje_edit_part_item_item_align_y_set(Evas_Object *obj, const char *part, unsigne
 EAPI double
 edje_edit_part_item_item_weight_x_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the horizontal we value of a part item.
+/**
+ * @brief Sets the horizontal we value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain itemf
@@ -3829,7 +4112,8 @@ edje_edit_part_item_item_weight_x_get(Evas_Object *obj, const char *part, unsign
 EAPI Eina_Bool
 edje_edit_part_item_item_weight_x_set(Evas_Object *obj, const char *part, unsigned int index, double weight_x);
 
-/** Get the vertical weight value of a part item.
+/**
+ * @brief Gets the vertical weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3841,7 +4125,8 @@ edje_edit_part_item_item_weight_x_set(Evas_Object *obj, const char *part, unsign
 EAPI double
 edje_edit_part_item_item_weight_y_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set the vertical weight value of a part item.
+/**
+ * @brief Sets the vertical weight value of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3854,7 +4139,8 @@ edje_edit_part_item_item_weight_y_get(Evas_Object *obj, const char *part, unsign
 EAPI Eina_Bool
 edje_edit_part_item_item_weight_y_set(Evas_Object *obj, const char *part, unsigned int index, double weight_y);
 
-/** Get column position of the part's item.
+/**
+ * @brief Gets column position of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3867,7 +4153,8 @@ EINA_DEPRECATED
 EAPI unsigned short
 edje_edit_part_item_position_col_get(Evas_Object *obj, const char *part, const char *item_name);
 
-/** Get row position of the part's item.
+/**
+ * @brief Gets row position of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3880,7 +4167,8 @@ EINA_DEPRECATED
 EAPI unsigned short
 edje_edit_part_item_position_row_get(Evas_Object *obj, const char *part, const char *item_name);
 
-/** Get column position of the part's item.
+/**
+ * @brief Gets column position of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3892,7 +4180,8 @@ edje_edit_part_item_position_row_get(Evas_Object *obj, const char *part, const c
 EAPI unsigned short
 edje_edit_part_item_index_position_col_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Get row position of the part's item.
+/**
+ * @brief Gets row position of the part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3904,7 +4193,11 @@ edje_edit_part_item_index_position_col_get(Evas_Object *obj, const char *part, u
 EAPI unsigned short
 edje_edit_part_item_index_position_row_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Set column/row position of a new part's item.
+/**
+ * @deprecated Use edje_edit_part_item_position_col_set() and
+ * edje_edit_part_item_position_row_set() instead.
+ *
+ * @brief Sets column/row position of a new part's item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3912,16 +4205,14 @@ edje_edit_part_item_index_position_row_get(Evas_Object *obj, const char *part, u
  * @param col Column item position.
  * @param row Row item position.
  *
- * @deprecation Use edje_edit_part_item_position_col_set() and
- * edje_edit_part_item_position_row_set() instead.
- *
  * @return @c EINA_TRUE If successful, @c EINA_FALSE otherwise.
  * @since 1.11
  */
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_position_set(Evas_Object *obj, const char *part, const char *item_name, unsigned short col, unsigned short row);
 
-/** Set column position of a part item.
+/**
+ * @brief Sets column position of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3935,7 +4226,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_position_col_set(Evas_Object *obj, const char *part, const char *item_name, unsigned short col);
 
-/** Set row position of a part item.
+/**
+ * @brief Sets row position of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3949,7 +4241,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_position_row_set(Evas_Object *obj, const char *part, const char *item_name, unsigned short row);
 
-/** Set column position of a part item.
+/**
+ * @brief Sets column position of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3962,7 +4255,8 @@ edje_edit_part_item_position_row_set(Evas_Object *obj, const char *part, const c
 EAPI Eina_Bool
 edje_edit_part_item_index_position_col_set(Evas_Object *obj, const char *part, unsigned int index, unsigned short col);
 
-/** Set row position of a part item.
+/**
+ * @brief Sets row position of a part item.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -3976,7 +4270,8 @@ EAPI Eina_Bool
 edje_edit_part_item_index_position_row_set(Evas_Object *obj, const char *part, unsigned int index, unsigned short row);
 
 
-/** Retrieves the how many columns and rows will span for use by item.
+/**
+ * @brief Retrieves the how many columns and rows will span for use by item.
  *
  * @param obj object being edited.
  * @param part part that contain item.
@@ -3992,7 +4287,8 @@ edje_edit_part_item_index_position_row_set(Evas_Object *obj, const char *part, u
 EINA_DEPRECATED
 EAPI void edje_edit_part_item_span_get(Evas_Object *obj, const char *part, const char *item, unsigned char *col, unsigned char *row);
 
-/** Get the number of span columns.
+/**
+ * @brief Gets the number of span columns.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4005,7 +4301,8 @@ EINA_DEPRECATED
 EAPI unsigned short
 edje_edit_part_item_span_col_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Get the number of span rows.
+/**
+ * @brief Gets the number of span rows.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4018,7 +4315,8 @@ EINA_DEPRECATED
 EAPI unsigned short
 edje_edit_part_item_span_row_get(Evas_Object *obj, const char *part, const char *item);
 
-/** Set the count of columns and rows, which this item will spans for use.
+/**
+ * @brief Sets the count of columns and rows, which this item will spans for use.
  *
  * @param obj object being edited.
  * @param part part that contain item.
@@ -4032,7 +4330,8 @@ edje_edit_part_item_span_row_get(Evas_Object *obj, const char *part, const char
 EINA_DEPRECATED
 EAPI Eina_Bool edje_edit_part_item_span_set(Evas_Object *obj, const char *part, const char *item, unsigned char col, unsigned char row);
 
-/** Set the count of columns which this item will spans for use.
+/**
+ * @brief Sets the count of columns which this item will spans for use.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4046,7 +4345,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_span_col_set(Evas_Object *obj, const char *part, const char *item, unsigned short col);
 
-/** Set the count of rows which this item will spans for use.
+/**
+ * @brief Sets the count of rows which this item will spans for use.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4060,7 +4360,8 @@ EINA_DEPRECATED
 EAPI Eina_Bool
 edje_edit_part_item_span_row_set(Evas_Object *obj, const char *part, const char *item, unsigned short row);
 
-/** Set the count of columns which this item will spans for use.
+/**
+ * @brief Sets the count of columns which this item will spans for use.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4073,7 +4374,8 @@ edje_edit_part_item_span_row_set(Evas_Object *obj, const char *part, const char
 EAPI Eina_Bool
 edje_edit_part_item_index_span_col_set(Evas_Object *obj, const char *part, unsigned int index, unsigned short col);
 
-/** Set the count of rows which this item will spans for use.
+/**
+ * @brief Sets the count of rows which this item will spans for use.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4086,7 +4388,8 @@ edje_edit_part_item_index_span_col_set(Evas_Object *obj, const char *part, unsig
 EAPI Eina_Bool
 edje_edit_part_item_index_span_row_set(Evas_Object *obj, const char *part, unsigned int index, unsigned short row);
 
-/** Get the number of span columns.
+/**
+ * @brief Gets the number of span columns.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4098,7 +4401,8 @@ edje_edit_part_item_index_span_row_set(Evas_Object *obj, const char *part, unsig
 EAPI unsigned short
 edje_edit_part_item_index_span_col_get(Evas_Object *obj, const char *part, unsigned int index);
 
-/** Get the number of span rows.
+/**
+ * @brief Gets the number of span rows.
  *
  * @param obj Object being edited.
  * @param part Part that contain item.
@@ -4114,11 +4418,13 @@ edje_edit_part_item_index_span_row_get(Evas_Object *obj, const char *part, unsig
 /******************************************************************************/
 /**************************   STATES API   ************************************/
 /******************************************************************************/
-/** @name States API
- *  Functions to deal with part states (see @ref edcref).
+/**
+ * @name States API
+ * Functions to deal with part states (see @ref edcref).
  */ //@{
 
-/** Get the list of all the states in the given part.
+/**
+ * @brief Gets the list of all the states in the given part.
  *
  * @param obj Object being edited.
  * @param part Part to get the states names list.
@@ -4130,7 +4436,8 @@ edje_edit_part_item_index_span_row_get(Evas_Object *obj, const char *part, unsig
  */
 EAPI Eina_List * edje_edit_part_states_list_get(Evas_Object *obj, const char *part);
 
-/** Set a new name for the given state in the given part.
+/**
+ * @brief Sets a new name for the given state in the given part.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4143,7 +4450,8 @@ EAPI Eina_List * edje_edit_part_states_list_get(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state, double value, const char *new_name, double new_value);
 
-/** Create a new state to the give part.
+/**
+ * @brief Creates a new state to the give part.
  *
  * @param obj Object being edited.
  * @param part Part to set the name of the new state.
@@ -4154,7 +4462,8 @@ EAPI Eina_Bool edje_edit_state_name_set(Evas_Object *obj, const char *part, cons
  */
 EAPI Eina_Bool edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double value);
 
-/** Delete the given part state from the edje.
+/**
+ * @brief Deletes the given part state from the edje.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4165,7 +4474,8 @@ EAPI Eina_Bool edje_edit_state_add(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_state_del(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Check if a part state with the given name exist.
+/**
+ * @brief Checks if a part state with the given name exist.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4176,7 +4486,8 @@ EAPI Eina_Bool edje_edit_state_del(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_state_exist(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Copies the state @p from into @p to. If @p to doesn't exist it will be created.
+/**
+ * @brief Copies the state @p from into @p to. If @p to doesn't exist it will be created.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4189,7 +4500,8 @@ EAPI Eina_Bool edje_edit_state_exist(Evas_Object *obj, const char *part, const c
  */
 EAPI Eina_Bool edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, double val_from, const char *to, double val_to);
 
-/** Get the 'rel1 relative X' value of state.
+/**
+ * @brief Gets the 'rel1 relative X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4200,7 +4512,8 @@ EAPI Eina_Bool edje_edit_state_copy(Evas_Object *obj, const char *part, const ch
  */
 EAPI double edje_edit_state_rel1_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the 'rel1 relative Y' value of state.
+/**
+ * @brief Gets the 'rel1 relative Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4211,7 +4524,8 @@ EAPI double edje_edit_state_rel1_relative_x_get(Evas_Object *obj, const char *pa
  */
 EAPI double edje_edit_state_rel1_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the 'rel2 relative X' value of state.
+/**
+ * @brief Gets the 'rel2 relative X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4222,7 +4536,8 @@ EAPI double edje_edit_state_rel1_relative_y_get(Evas_Object *obj, const char *pa
  */
 EAPI double edje_edit_state_rel2_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the 'rel2 relative Y' value of state.
+/**
+ * @brief Gets the 'rel2 relative Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4233,7 +4548,8 @@ EAPI double edje_edit_state_rel2_relative_x_get(Evas_Object *obj, const char *pa
  */
 EAPI double edje_edit_state_rel2_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the 'rel1 relative X' value of state.
+/**
+ * @brief Sets the 'rel1 relative X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4245,7 +4561,8 @@ EAPI double edje_edit_state_rel2_relative_y_get(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_state_rel1_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the 'rel1 relative Y' value of state.
+/**
+ * @brief Sets the 'rel1 relative Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4257,7 +4574,8 @@ EAPI Eina_Bool edje_edit_state_rel1_relative_x_set(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_state_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
-/** Set the 'rel2 relative X' value of state.
+/**
+ * @brief Sets the 'rel2 relative X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4269,7 +4587,8 @@ EAPI Eina_Bool edje_edit_state_rel1_relative_y_set(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_state_rel2_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the 'rel2 relative Y' value of state.
+/**
+ * @brief Sets the 'rel2 relative Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4281,7 +4600,8 @@ EAPI Eina_Bool edje_edit_state_rel2_relative_x_set(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_state_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
-/** Get the 'rel1 offset X' value of state.
+/**
+ * @brief Gets the 'rel1 offset X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4292,7 +4612,8 @@ EAPI Eina_Bool edje_edit_state_rel2_relative_y_set(Evas_Object *obj, const char
  */
 EAPI int edje_edit_state_rel1_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the 'rel1 offset Y' value of state.
+/**
+ * @brief Gets the 'rel1 offset Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4303,7 +4624,8 @@ EAPI int edje_edit_state_rel1_offset_x_get(Evas_Object *obj, const char *part, c
  */
 EAPI int edje_edit_state_rel1_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the 'rel2 offset X' value of state.
+/**
+ * @brief Gets the 'rel2 offset X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4314,7 +4636,8 @@ EAPI int edje_edit_state_rel1_offset_y_get(Evas_Object *obj, const char *part, c
  */
 EAPI int edje_edit_state_rel2_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the 'rel2 offset Y' value of state.
+/**
+ * @brief Gets the 'rel2 offset Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4325,7 +4648,8 @@ EAPI int edje_edit_state_rel2_offset_x_get(Evas_Object *obj, const char *part, c
  */
 EAPI int edje_edit_state_rel2_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the 'rel1 offset X' value of state.
+/**
+ * @brief Sets the 'rel1 offset X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4337,7 +4661,8 @@ EAPI int edje_edit_state_rel2_offset_y_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_rel1_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, int x);
 
-/** Set the 'rel1 offset Y' value of state.
+/**
+ * @brief Sets the 'rel1 offset Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4349,7 +4674,8 @@ EAPI Eina_Bool edje_edit_state_rel1_offset_x_set(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, int y);
 
-/** Set the 'rel2 offset X' value of state.
+/**
+ * @brief Sets the 'rel2 offset X' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4361,7 +4687,8 @@ EAPI Eina_Bool edje_edit_state_rel1_offset_y_set(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_rel2_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, int x);
 
-/** Set the 'rel2 offset Y' value of state.
+/**
+ * @brief Sets the 'rel2 offset Y' value of state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4373,51 +4700,56 @@ EAPI Eina_Bool edje_edit_state_rel2_offset_x_set(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, int y);
 
-/** Get the part name rel1x is relative to.
+/**
+ * @brief Gets the part name rel1x is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The state that contain which the part name rel1x is relative to (not including the state value).
  * @param value The state value.
  *
- * @return The part name rel1x is relative to or NULL if the part is relative to the whole interface.
+ * @return The part name rel1x is relative to, or NULL if the part is relative to the whole interface.
  */
 EAPI const char * edje_edit_state_rel1_to_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the part name rel1y is relative to.
+/**
+ * @brief Gets the part name rel1y is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The state that contain which the part name rel1y is relative to (not including the state value).
  * @param value The state value.
  *
- * @return The part name rel1y is relative to or NULL if the part is relative to the whole interface.
+ * @return The part name rel1y is relative to, or NULL if the part is relative to the whole interface.
  */
 EAPI const char * edje_edit_state_rel1_to_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the part name rel2x is relative to.
+/**
+ * @brief Gets the part name rel2x is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The state that contain which the part name rel2x is relative to (not including the state value).
  * @param value The state value.
  *
- * @return The part name rel2x is relative to or NULL if the part is relative to the whole interface.
+ * @return The part name rel2x is relative to, or NULL if the part is relative to the whole interface.
  */
 EAPI const char * edje_edit_state_rel2_to_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the part name rel2y is relative to.
+/**
+ * @brief Gets the part name rel2y is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The state that contain which the part name rel2y is relative to (not including the state value).
  * @param value The state value.
  *
- * @return The part name rel2y is relative to or NULL if the part is relative to the whole interface.
+ * @return The part name rel2y is relative to, or NULL if the part is relative to the whole interface.
  */
 EAPI const char * edje_edit_state_rel2_to_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the part rel1x is relative to.
+/**
+ * @brief Sets the part rel1x is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4429,7 +4761,8 @@ EAPI const char * edje_edit_state_rel2_to_y_get(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_state_rel1_to_x_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to);
 
-/** Set the part rel1y is relative to.
+/**
+ * @brief Sets the part rel1y is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4441,7 +4774,8 @@ EAPI Eina_Bool edje_edit_state_rel1_to_x_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_rel1_to_y_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to);
 
-/** Set the part rel2x is relative to.
+/**
+ * @brief Sets the part rel2x is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4453,7 +4787,8 @@ EAPI Eina_Bool edje_edit_state_rel1_to_y_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_rel2_to_x_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to);
 
-/** Set the part rel2y is relative to.
+/**
+ * @brief Sets the part rel2y is relative to.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4465,7 +4800,8 @@ EAPI Eina_Bool edje_edit_state_rel2_to_x_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_rel2_to_y_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to);
 
-/** Get the color of a part state.
+/**
+ * @brief Gets the color of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4478,7 +4814,8 @@ EAPI Eina_Bool edje_edit_state_rel2_to_y_set(Evas_Object *obj, const char *part,
  */
 EAPI void edje_edit_state_color_get(Evas_Object *obj, const char *part, const char *state, double value, int *r, int *g, int *b, int *a);
 
-/** Get the color2 of a part state.
+/**
+ * @brief Gets the color2 of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4491,7 +4828,8 @@ EAPI void edje_edit_state_color_get(Evas_Object *obj, const char *part, const ch
  */
 EAPI void edje_edit_state_color2_get(Evas_Object *obj, const char *part, const char *state, double value, int *r, int *g, int *b, int *a);
 
-/** Get the color3 of a part state.
+/**
+ * @brief Gets the color3 of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4504,7 +4842,8 @@ EAPI void edje_edit_state_color2_get(Evas_Object *obj, const char *part, const c
  */
 EAPI void edje_edit_state_color3_get(Evas_Object *obj, const char *part, const char *state, double value, int *r, int *g, int *b, int *a);
 
-/** Set the color of a part state.
+/**
+ * @brief Sets the color of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4519,7 +4858,8 @@ EAPI void edje_edit_state_color3_get(Evas_Object *obj, const char *part, const c
  */
 EAPI Eina_Bool edje_edit_state_color_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
 
-/** Set the color2 of a part state.
+/**
+ * @brief Sets the color2 of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4534,7 +4874,8 @@ EAPI Eina_Bool edje_edit_state_color_set(Evas_Object *obj, const char *part, con
  */
 EAPI Eina_Bool edje_edit_state_color2_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
 
-/** Set the color3 of a part state.
+/**
+ * @brief Sets the color3 of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4549,7 +4890,8 @@ EAPI Eina_Bool edje_edit_state_color2_set(Evas_Object *obj, const char *part, co
  */
 EAPI Eina_Bool edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a);
 
-/** Get the horizontal align value of a part state.
+/**
+ * @brief Gets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4560,7 +4902,8 @@ EAPI Eina_Bool edje_edit_state_color3_set(Evas_Object *obj, const char *part, co
  */
 EAPI double edje_edit_state_align_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the vertical align value of a part state.
+/**
+ * @brief Gets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4571,7 +4914,8 @@ EAPI double edje_edit_state_align_x_get(Evas_Object *obj, const char *part, cons
  */
 EAPI double edje_edit_state_align_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the horizontal align value of a part state.
+/**
+ * @brief Sets the horizontal align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4583,7 +4927,8 @@ EAPI double edje_edit_state_align_y_get(Evas_Object *obj, const char *part, cons
  */
 EAPI Eina_Bool edje_edit_state_align_x_set(Evas_Object *obj, const char *part, const char *state, double value,  double align);
 
-/** Set the vertical align value of a part state.
+/**
+ * @brief Sets the vertical align value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4595,7 +4940,8 @@ EAPI Eina_Bool edje_edit_state_align_x_set(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_align_y_set(Evas_Object *obj, const char *part, const char *state, double value,  double align);
 
-/** Set the size class of the given part state.
+/**
+ * @brief Sets the size class of the given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4610,7 +4956,8 @@ EAPI Eina_Bool edje_edit_state_align_y_set(Evas_Object *obj, const char *part, c
 EAPI Eina_Bool
 edje_edit_state_text_class_set(Evas_Object *obj, const char *part, const char *state, double value, const char *size_class);
 
-/** Get the minimum width value of a part state.
+/**
+ * @brief Gets the minimum width value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4621,7 +4968,8 @@ edje_edit_state_text_class_set(Evas_Object *obj, const char *part, const char *s
  */
 EAPI int edje_edit_state_min_w_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the minimum width value of a part state.
+/**
+ * @brief Sets the minimum width value of a part state.
  * The minimum width should be greater than 0.
  *
  * @param obj Object being edited.
@@ -4634,7 +4982,8 @@ EAPI int edje_edit_state_min_w_get(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_state_min_w_set(Evas_Object *obj, const char *part, const char *state, double value, int min_w);
 
-/** Get the minimum height value of a part state.
+/**
+ * @brief Gets the minimum height value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4645,7 +4994,8 @@ EAPI Eina_Bool edje_edit_state_min_w_set(Evas_Object *obj, const char *part, con
  */
 EAPI int edje_edit_state_min_h_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the minimum height value of a part state.
+/**
+ * @brief Sets the minimum height value of a part state.
  * The minimum height should be greater than 0.
  *
  * @param obj Object being edited.
@@ -4658,7 +5008,8 @@ EAPI int edje_edit_state_min_h_get(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_state_min_h_set(Evas_Object *obj, const char *part, const char *state, double value, int min_h);
 
-/** Get the maximum width value of a part state.
+/**
+ * @brief Gets the maximum width value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4669,7 +5020,8 @@ EAPI Eina_Bool edje_edit_state_min_h_set(Evas_Object *obj, const char *part, con
  */
 EAPI int edje_edit_state_max_w_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the maximum width value of a part state.
+/**
+ * @brief Sets the maximum width value of a part state.
  * The maximum width should be greater than -1.
  * The value -1 means that state doesn't have any boundaries on width direction.
  * (it can be any size that is bigger than it's min)
@@ -4684,7 +5036,8 @@ EAPI int edje_edit_state_max_w_get(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_state_max_w_set(Evas_Object *obj, const char *part, const char *state, double value, int max_w);
 
-/** Get the maximum height value of a part state.
+/**
+ * @brief Gets the maximum height value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4695,7 +5048,8 @@ EAPI Eina_Bool edje_edit_state_max_w_set(Evas_Object *obj, const char *part, con
  */
 EAPI int edje_edit_state_max_h_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the maximum height value of a part state.
+/**
+ * @brief Sets the maximum height value of a part state.
  * The maximum height should be greater than -1.
  * The value -1 means that state doesn't have any boundaries on height direction.
  * (it can be any size that is bigger than it's min)
@@ -4710,7 +5064,8 @@ EAPI int edje_edit_state_max_h_get(Evas_Object *obj, const char *part, const cha
  */
 EAPI Eina_Bool edje_edit_state_max_h_set(Evas_Object *obj, const char *part, const char *state, double value, int max_h);
 
-/** Get the multiplier (minmul) width value of a part state.
+/**
+ * @brief Gets the multiplier (minmul) width value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4722,7 +5077,8 @@ EAPI Eina_Bool edje_edit_state_max_h_set(Evas_Object *obj, const char *part, con
  */
 EAPI double edje_edit_state_minmul_w_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the multiplier (minmul) width value of a part state.
+/**
+ * @brief Sets the multiplier (minmul) width value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4735,7 +5091,8 @@ EAPI double edje_edit_state_minmul_w_get(Evas_Object *obj, const char *part, con
  */
 EAPI Eina_Bool edje_edit_state_minmul_w_set(Evas_Object *obj, const char *part, const char *state, double value, double minmul_w);
 
-/** Get the multiplier (minmul) height value of a part state.
+/**
+ * @brief Gets the multiplier (minmul) height value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4747,7 +5104,8 @@ EAPI Eina_Bool edje_edit_state_minmul_w_set(Evas_Object *obj, const char *part,
  */
 EAPI double edje_edit_state_minmul_h_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the multiplier (minmul) height value of a part state.
+/**
+ * @brief Sets the multiplier (minmul) height value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4760,7 +5118,8 @@ EAPI double edje_edit_state_minmul_h_get(Evas_Object *obj, const char *part, con
  */
 EAPI Eina_Bool edje_edit_state_minmul_h_set(Evas_Object *obj, const char *part, const char *state, double value, double minmul_h);
 
-/** Get the fixed width value of a part state.
+/**
+ * @brief Gets the fixed width value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4771,7 +5130,8 @@ EAPI Eina_Bool edje_edit_state_minmul_h_set(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_fixed_w_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the fixed width value of a part state.
+/**
+ * @brief Sets the fixed width value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4783,7 +5143,8 @@ EAPI Eina_Bool edje_edit_state_fixed_w_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_fixed_w_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool fixed);
 
-/** Get the fixed height value of a part state.
+/**
+ * @brief Gets the fixed height value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4794,7 +5155,8 @@ EAPI Eina_Bool edje_edit_state_fixed_w_set(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_fixed_h_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the fixed height value of a part state.
+/**
+ * @brief Sets the fixed height value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4806,7 +5168,8 @@ EAPI Eina_Bool edje_edit_state_fixed_h_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_fixed_h_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool fixed);
 
-/** Get the minimum aspect value of a part state.
+/**
+ * @brief Gets the minimum aspect value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4817,7 +5180,8 @@ EAPI Eina_Bool edje_edit_state_fixed_h_set(Evas_Object *obj, const char *part, c
  */
 EAPI double edje_edit_state_aspect_min_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the maximum aspect value of a part state.
+/**
+ * @brief Gets the maximum aspect value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4828,7 +5192,8 @@ EAPI double edje_edit_state_aspect_min_get(Evas_Object *obj, const char *part, c
  */
 EAPI double edje_edit_state_aspect_max_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the minimum aspect value of a part state.
+/**
+ * @brief Sets the minimum aspect value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4840,7 +5205,8 @@ EAPI double edje_edit_state_aspect_max_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part, const char *state, double value, double aspect);
 
-/** Set the maximum aspect value of a part state.
+/**
+ * @brief Sets the maximum aspect value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4852,7 +5218,8 @@ EAPI Eina_Bool edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_aspect_max_set(Evas_Object *obj, const char *part, const char *state, double value, double aspect);
 
-/** Get the aspect preference of a part state.
+/**
+ * @brief Gets the aspect preference of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4863,7 +5230,8 @@ EAPI Eina_Bool edje_edit_state_aspect_max_set(Evas_Object *obj, const char *part
  */
 EAPI unsigned char edje_edit_state_aspect_pref_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the aspect preference of a part state.
+/**
+ * @brief Sets the aspect preference of a part state.
  *
  * The available values of aspect preference are:
  * <ul style="list-style-type:none">
@@ -4885,7 +5253,8 @@ EAPI unsigned char edje_edit_state_aspect_pref_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_state_aspect_pref_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char pref);
 
-/** Get the smooth property for given part state.
+/**
+ * @brief Gets the smooth property for given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4896,7 +5265,8 @@ EAPI Eina_Bool edje_edit_state_aspect_pref_set(Evas_Object *obj, const char *par
  */
 EAPI Eina_Bool edje_edit_state_fill_smooth_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the smooth property for given part state.
+/**
+ * @brief Sets the smooth property for given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4908,7 +5278,8 @@ EAPI Eina_Bool edje_edit_state_fill_smooth_get(Evas_Object *obj, const char *par
  */
 EAPI Eina_Bool edje_edit_state_fill_smooth_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool smooth);
 
-/** Get the fill type property for given part state.
+/**
+ * @brief Gets the fill type property for given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4921,7 +5292,8 @@ EAPI Eina_Bool edje_edit_state_fill_smooth_set(Evas_Object *obj, const char *par
  */
 EAPI unsigned char edje_edit_state_fill_type_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the fill type property for given part state.
+/**
+ * @brief Sets the fill type property for given part state.
  *
  * Sets the image fill type. The available types are:
  * <dl>
@@ -4946,7 +5318,8 @@ EAPI unsigned char edje_edit_state_fill_type_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_fill_type_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char fill_type);
 
-/** Get the fill horizontal origin relative value of a part state.
+/**
+ * @brief Gets the fill horizontal origin relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4957,7 +5330,8 @@ EAPI Eina_Bool edje_edit_state_fill_type_set(Evas_Object *obj, const char *part,
  */
 EAPI double edje_edit_state_fill_origin_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the fill vertical origin relative value of a part state.
+/**
+ * @brief Gets the fill vertical origin relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4968,7 +5342,8 @@ EAPI double edje_edit_state_fill_origin_relative_x_get(Evas_Object *obj, const c
  */
 EAPI double edje_edit_state_fill_origin_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the fill horizontal origin offset value of a part state.
+/**
+ * @brief Gets the fill horizontal origin offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4979,7 +5354,8 @@ EAPI double edje_edit_state_fill_origin_relative_y_get(Evas_Object *obj, const c
  */
 EAPI int edje_edit_state_fill_origin_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the fill vertical origin offset value of a part state.
+/**
+ * @brief Gets the fill vertical origin offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -4990,7 +5366,8 @@ EAPI int edje_edit_state_fill_origin_offset_x_get(Evas_Object *obj, const char *
  */
 EAPI int edje_edit_state_fill_origin_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the fill horizontal origin relative value of a part state.
+/**
+ * @brief Sets the fill horizontal origin relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5002,7 +5379,8 @@ EAPI int edje_edit_state_fill_origin_offset_y_get(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_state_fill_origin_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the fill horizontal origin relative value of a part state.
+/**
+ * @brief Sets the fill horizontal origin relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5014,7 +5392,8 @@ EAPI Eina_Bool edje_edit_state_fill_origin_relative_x_set(Evas_Object *obj, cons
  */
 EAPI Eina_Bool edje_edit_state_fill_origin_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
-/** Set the fill horizontal origin offset value of a part state.
+/**
+ * @brief Sets the fill horizontal origin offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5026,7 +5405,8 @@ EAPI Eina_Bool edje_edit_state_fill_origin_relative_y_set(Evas_Object *obj, cons
  */
 EAPI Eina_Bool edje_edit_state_fill_origin_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the fill vertical origin offset value of a part state.
+/**
+ * @brief Sets the fill vertical origin offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5038,7 +5418,8 @@ EAPI Eina_Bool edje_edit_state_fill_origin_offset_x_set(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_fill_origin_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
-/** Get the fill horizontal size relative value of a part state.
+/**
+ * @brief Gets the fill horizontal size relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5049,7 +5430,8 @@ EAPI Eina_Bool edje_edit_state_fill_origin_offset_y_set(Evas_Object *obj, const
  */
 EAPI double edje_edit_state_fill_size_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the fill vertical size relative value of a part state.
+/**
+ * @brief Gets the fill vertical size relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5060,7 +5442,8 @@ EAPI double edje_edit_state_fill_size_relative_x_get(Evas_Object *obj, const cha
  */
 EAPI double edje_edit_state_fill_size_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the fill horizontal size offset value of a part state.
+/**
+ * @brief Gets the fill horizontal size offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5072,7 +5455,8 @@ EAPI double edje_edit_state_fill_size_relative_y_get(Evas_Object *obj, const cha
  */
 EAPI int edje_edit_state_fill_size_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the fill vertical size offset value of a part state.
+/**
+ * @brief Gets the fill vertical size offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5084,7 +5468,8 @@ EAPI int edje_edit_state_fill_size_offset_x_get(Evas_Object *obj, const char *pa
  */
 EAPI int edje_edit_state_fill_size_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the fill horizontal size relative value of a part state.
+/**
+ * @brief Sets the fill horizontal size relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5097,7 +5482,8 @@ EAPI int edje_edit_state_fill_size_offset_y_get(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_state_fill_size_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the fill vertical size relative value of a part state.
+/**
+ * @brief Sets the fill vertical size relative value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5110,7 +5496,8 @@ EAPI Eina_Bool edje_edit_state_fill_size_relative_x_set(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the fill horizontal size offset value of a part state.
+/**
+ * @brief Sets the fill horizontal size offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5123,7 +5510,8 @@ EAPI Eina_Bool edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_fill_size_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x);
 
-/** Set the fill vertical size offset value of a part state.
+/**
+ * @brief Sets the fill vertical size offset value of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5136,7 +5524,8 @@ EAPI Eina_Bool edje_edit_state_fill_size_offset_x_set(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_state_fill_size_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y);
 
-/** Get the visibility of a part state.
+/**
+ * @brief Gets the visibility of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5147,7 +5536,8 @@ EAPI Eina_Bool edje_edit_state_fill_size_offset_y_set(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_state_visible_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the visibility of a part state.
+/**
+ * @brief Sets the visibility of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5159,7 +5549,8 @@ EAPI Eina_Bool edje_edit_state_visible_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_visible_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool visible);
 
-/** Get the color class of the given part state.
+/**
+ * @brief Gets the color class of the given part state.
  *
  * Remember to free the string with edje_edit_string_free()
  *
@@ -5172,7 +5563,8 @@ EAPI Eina_Bool edje_edit_state_visible_set(Evas_Object *obj, const char *part, c
  */
 EAPI const char *edje_edit_state_color_class_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the color class of the given part state.
+/**
+ * @brief Sets the color class of the given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5184,7 +5576,8 @@ EAPI const char *edje_edit_state_color_class_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_color_class_set(Evas_Object *obj, const char *part, const char *state, double value, const char *color_class);
 
-/** Get the list of parameters for an external part.
+/**
+ * @brief Gets the list of parameters for an external part.
  *
  * DO NOT FREE THE LIST!
  *
@@ -5197,7 +5590,8 @@ EAPI Eina_Bool edje_edit_state_color_class_set(Evas_Object *obj, const char *par
  */
 EAPI const Eina_List * edje_edit_state_external_params_list_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the external parameter type and value.
+/**
+ * @brief Gets the external parameter type and value.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5211,7 +5605,8 @@ EAPI const Eina_List * edje_edit_state_external_params_list_get(Evas_Object *obj
  */
 EAPI Eina_Bool edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Edje_External_Param_Type *type, void **val);
 
-/** Get external parameter of type INT.
+/**
+ * @brief Gets external parameter of type INT.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5224,7 +5619,8 @@ EAPI Eina_Bool edje_edit_state_external_param_get(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_state_external_param_int_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, int *val);
 
-/** Get external parameter of type BOOL.
+/**
+ * @brief Gets external parameter of type BOOL.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5237,7 +5633,8 @@ EAPI Eina_Bool edje_edit_state_external_param_int_get(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_state_external_param_bool_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Eina_Bool *val);
 
-/** Get external parameter of type DOUBLE.
+/**
+ * @brief Gets external parameter of type DOUBLE.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5250,7 +5647,8 @@ EAPI Eina_Bool edje_edit_state_external_param_bool_get(Evas_Object *obj, const c
  */
 EAPI Eina_Bool edje_edit_state_external_param_double_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, double *val);
 
-/** Get external parameter of type STRING.
+/**
+ * @brief Gets external parameter of type STRING.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5265,7 +5663,8 @@ EAPI Eina_Bool edje_edit_state_external_param_double_get(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_external_param_string_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char **val);
 
-/** Get external parameter of type CHOICE.
+/**
+ * @brief Gets external parameter of type CHOICE.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5280,11 +5679,11 @@ EAPI Eina_Bool edje_edit_state_external_param_string_get(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_external_param_choice_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char **val);
 
-/** Set the external parameter type and value, adding it if it didn't
+/**
+ * @brief Sets the external parameter type and value, adding it if it didn't
  * exist before.
  *
  * @param obj Object being edited.
-
  * @param part Part that contain state.
  * @param state The name of the state to get external parameter (not
  *              including the state value).
@@ -5308,7 +5707,8 @@ EAPI Eina_Bool edje_edit_state_external_param_choice_get(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Edje_External_Param_Type type, ...);
 
-/** Set external parameter of type INT.
+/**
+ * @brief Sets external parameter of type INT.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5322,7 +5722,8 @@ EAPI Eina_Bool edje_edit_state_external_param_set(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_state_external_param_int_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, int val);
 
-/** Set external parameter of type BOOL.
+/**
+ * @brief Sets external parameter of type BOOL.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5335,7 +5736,8 @@ EAPI Eina_Bool edje_edit_state_external_param_int_set(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_state_external_param_bool_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Eina_Bool val);
 
-/** Set external parameter of type DOUBLE.
+/**
+ * @brief Sets external parameter of type DOUBLE.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5348,7 +5750,8 @@ EAPI Eina_Bool edje_edit_state_external_param_bool_set(Evas_Object *obj, const c
  */
 EAPI Eina_Bool edje_edit_state_external_param_double_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, double val);
 
-/** Set external parameter of type STRING.
+/**
+ * @brief Sets external parameter of type STRING.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5361,7 +5764,8 @@ EAPI Eina_Bool edje_edit_state_external_param_double_set(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_external_param_string_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char *val);
 
-/** Set external parameter of type CHOICE.
+/**
+ * @brief Sets external parameter of type CHOICE.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5374,7 +5778,8 @@ EAPI Eina_Bool edje_edit_state_external_param_string_set(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_external_param_choice_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char *val);
 
-/** Set the states step parameter values.
+/**
+ * @brief Sets the states step parameter values.
  *
  * Step parameter restricts resizing of each dimension to values divisibles by
  * its value. This causes the part to jump from value to value while resizing.
@@ -5394,7 +5799,8 @@ EAPI Eina_Bool edje_edit_state_external_param_choice_set(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_step_set(Evas_Object *obj, const char *part, const char *state, double value, int step_x, int step_y);
 
-/** Get the states step values.
+/**
+ * @brief Gets the states step values.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5410,7 +5816,8 @@ EAPI Eina_Bool edje_edit_state_step_set(Evas_Object *obj, const char *part, cons
  */
 EAPI Eina_Bool edje_edit_state_step_get(Evas_Object *obj, const char *part, const char *state, double value, int *step_x, int *step_y);
 
-/** Set the states limit parameter value.
+/**
+ * @brief Sets the states limit parameter value.
  *
  * Set limit causes the emission of signals when the the size of part changes
  * from zero or to a zero size in corresponding to the limit value.
@@ -5436,7 +5843,8 @@ EAPI Eina_Bool edje_edit_state_step_get(Evas_Object *obj, const char *part, cons
  */
 EAPI Eina_Bool edje_edit_state_limit_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char limit);
 
-/** Get the states limit value.
+/**
+ * @brief Gets the states limit value.
  *
  * Returns value that represents the states limit value:
  * <ul>
@@ -5461,11 +5869,13 @@ EAPI unsigned char edje_edit_state_limit_get(Evas_Object *obj, const char *part,
 /******************************************************************************/
 /**************************   MAP API   ************************************/
 /******************************************************************************/
-/** @name Map API
- *  Functions to deal with objects with rotation properties (see @ref edcref).
+/**
+ * @name Map API
+ * Functions to deal with objects with rotation properties (see @ref edcref).
  */ //@{
 
-/** Get the flag which enables mapping for the part.
+/**
+ * @brief Gets the flag which enables mapping for the part.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5477,7 +5887,8 @@ EAPI unsigned char edje_edit_state_limit_get(Evas_Object *obj, const char *part,
  **/
 EAPI Eina_Bool edje_edit_state_map_on_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** This enables mapping for the part. Default is 0.
+/**
+ * @brief Enables mapping for the part. Default is 0.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5490,7 +5901,8 @@ EAPI Eina_Bool edje_edit_state_map_on_get(Evas_Object *obj, const char *part, co
  **/
 EAPI Eina_Bool edje_edit_state_map_on_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool on);
 
-/** Get the part's name that is used as the 'perspective point'.
+/**
+ * @brief Gets the part's name that is used as the 'perspective point'.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5502,7 +5914,8 @@ EAPI Eina_Bool edje_edit_state_map_on_set(Evas_Object *obj, const char *part, co
  */
 EAPI const char * edje_edit_state_map_perspective_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the part's name that is used as the 'perspective point'.
+/**
+ * @brief Sets the part's name that is used as the 'perspective point'.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5515,7 +5928,8 @@ EAPI const char * edje_edit_state_map_perspective_get(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_state_map_perspective_set(Evas_Object *obj, const char *part, const char *state, double value, const char *source_part);
 
-/** Get the part's name that is used as the 'light' for calculating the brightness.
+/**
+ * @brief Gets the part's name that is used as the 'light' for calculating the brightness.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5527,7 +5941,8 @@ EAPI Eina_Bool edje_edit_state_map_perspective_set(Evas_Object *obj, const char
  **/
 EAPI const char * edje_edit_state_map_light_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the part that is used as the 'light'.
+/**
+ * @brief Sets the part that is used as the 'light'.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5540,7 +5955,8 @@ EAPI const char * edje_edit_state_map_light_get(Evas_Object *obj, const char *pa
  **/
 EAPI Eina_Bool edje_edit_state_map_light_set(Evas_Object *obj, const char *part, const char *state, double value, const char *source_part);
 
-/** Get backface_cull value of given part state.
+/**
+ * @brief Gets backface_cull value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5552,7 +5968,8 @@ EAPI Eina_Bool edje_edit_state_map_light_set(Evas_Object *obj, const char *part,
  **/
 EAPI Eina_Bool edje_edit_state_map_backface_cull_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set backface_cull value of given part state.
+/**
+ * @brief Sets backface_cull value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5565,7 +5982,8 @@ EAPI Eina_Bool edje_edit_state_map_backface_cull_get(Evas_Object *obj, const cha
  **/
 EAPI Eina_Bool edje_edit_state_map_backface_cull_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool backface_cull);
 
-/** Get perspective_on value of given part state.
+/**
+ * @brief Gets perspective_on value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5577,7 +5995,8 @@ EAPI Eina_Bool edje_edit_state_map_backface_cull_set(Evas_Object *obj, const cha
  **/
 EAPI Eina_Bool edje_edit_state_map_perspective_on_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set perspective_on value of given part state.
+/**
+ * @brief Sets perspective_on value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5590,7 +6009,8 @@ EAPI Eina_Bool edje_edit_state_map_perspective_on_get(Evas_Object *obj, const ch
  **/
 EAPI Eina_Bool edje_edit_state_map_perspective_on_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool perspective_on);
 
-/** Get map.alpha value of given part state.
+/**
+ * @brief Gets map.alpha value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5602,7 +6022,8 @@ EAPI Eina_Bool edje_edit_state_map_perspective_on_set(Evas_Object *obj, const ch
  **/
 EAPI Eina_Bool edje_edit_state_map_alpha_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set map.alpha value of given part state.
+/**
+ * @brief Sets map.alpha value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5615,7 +6036,8 @@ EAPI Eina_Bool edje_edit_state_map_alpha_get(Evas_Object *obj, const char *part,
  **/
 EAPI Eina_Bool edje_edit_state_map_alpha_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool alpha);
 
-/** Get map.smooth value of given part state.
+/**
+ * @brief Gets map.smooth value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5627,7 +6049,8 @@ EAPI Eina_Bool edje_edit_state_map_alpha_set(Evas_Object *obj, const char *part,
  **/
 EAPI Eina_Bool edje_edit_state_map_smooth_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set map.smooth value of given part state.
+/**
+ * @brief Sets map.smooth value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5640,7 +6063,8 @@ EAPI Eina_Bool edje_edit_state_map_smooth_get(Evas_Object *obj, const char *part
  **/
 EAPI Eina_Bool edje_edit_state_map_smooth_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool smooth);
 
-/** Get map.rotation of given part state.
+/**
+ * @brief Gets map.rotation of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5655,7 +6079,8 @@ EAPI Eina_Bool edje_edit_state_map_smooth_set(Evas_Object *obj, const char *part
  **/
 EAPI Eina_Bool edje_edit_state_map_rotation_get(Evas_Object *obj, const char *part, const char *state, double value, double *x, double *y, double *z);
 
-/** Set map.rotation of given part state.
+/**
+ * @brief Sets map.rotation of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5670,7 +6095,8 @@ EAPI Eina_Bool edje_edit_state_map_rotation_get(Evas_Object *obj, const char *pa
  **/
 EAPI Eina_Bool edje_edit_state_map_rotation_set(Evas_Object *obj, const char *part, const char *state, double value, double x, double y, double z);
 
-/** Get map.perspective.focal value of given part state.
+/**
+ * @brief Gets map.perspective.focal value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5682,7 +6108,8 @@ EAPI Eina_Bool edje_edit_state_map_rotation_set(Evas_Object *obj, const char *pa
  **/
 EAPI int edje_edit_state_map_perspective_focal_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set map.perspective.focal value of given part state.
+/**
+ * @brief Sets map.perspective.focal value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5695,7 +6122,8 @@ EAPI int edje_edit_state_map_perspective_focal_get(Evas_Object *obj, const char
  **/
 EAPI Eina_Bool edje_edit_state_map_perspective_focal_set(Evas_Object *obj, const char *part, const char *state, double value, int focal);
 
-/** Get map.perspective.zplane value of given part state.
+/**
+ * @brief Gets map.perspective.zplane value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5707,7 +6135,8 @@ EAPI Eina_Bool edje_edit_state_map_perspective_focal_set(Evas_Object *obj, const
  **/
 EAPI int edje_edit_state_map_perspective_zplane_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set map.perspective.zplane value of given part state.
+/**
+ * @brief Sets map.perspective.zplane value of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5720,7 +6149,8 @@ EAPI int edje_edit_state_map_perspective_zplane_get(Evas_Object *obj, const char
  **/
 EAPI Eina_Bool edje_edit_state_map_perspective_zplane_set(Evas_Object *obj, const char *part, const char *state, double value, int zplane);
 
-/** Get the part's name that is used as the center rotation.
+/**
+ * @brief Gets the part's name that is used as the center rotation.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5732,7 +6162,8 @@ EAPI Eina_Bool edje_edit_state_map_perspective_zplane_set(Evas_Object *obj, cons
  **/
 EAPI const char * edje_edit_state_map_rotation_center_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set map.zoom (x and y) values of given part state.
+/**
+ * @brief Sets map.zoom (x and y) values of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5747,7 +6178,8 @@ EAPI const char * edje_edit_state_map_rotation_center_get(Evas_Object *obj, cons
 EAPI Eina_Bool
 edje_edit_state_map_zoom_set(Evas_Object *obj, const char *part, const char *state, double value, double x, double y);
 
-/** Get map.zoom (x and y) values of given part state.
+/**
+ * @brief Gets map.zoom (x and y) values of given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5762,7 +6194,8 @@ edje_edit_state_map_zoom_set(Evas_Object *obj, const char *part, const char *sta
 EAPI Eina_Bool
 edje_edit_state_map_zoom_get(Evas_Object *obj, const char *part, const char *state, double value, double *x, double *y);
 
-/** This sets the part that is used as the center of rotation when rotating the part with this description. If no center is given, the parts original center itself is used for the rotation center.
+/**
+ * @brief Sets the part that is used as the center of rotation when rotating the part with this description. If no center is given, the parts original center itself is used for the rotation center.
  *
  * @param obj Object being edited.
  * @param part The name of the part.
@@ -5775,7 +6208,8 @@ edje_edit_state_map_zoom_get(Evas_Object *obj, const char *part, const char *sta
  **/
 EAPI Eina_Bool edje_edit_state_map_rotation_center_set(Evas_Object *obj, const char *part, const char *state, double value, const char *source_part);
 
-/** This sets the color for vertex/point of the current part.
+/**
+ * @brief Sets the color for vertex/point of the current part.
  * For more detailed information please @see evas_map_point_color_set().
  *
  * In edje there is (currently) only 4 main point:
@@ -5798,7 +6232,8 @@ EAPI Eina_Bool edje_edit_state_map_rotation_center_set(Evas_Object *obj, const c
  **/
 EAPI Eina_Bool edje_edit_state_map_point_color_set(Evas_Object *obj, const char *part, const char *state, double value, int idx, int r, int g, int b, int a);
 
-/** This gets the color of given vertex/point of the current part.
+/**
+ * @brief Gets the color of given vertex/point of the current part.
  * For more detailed information please @see evas_map_point_color_set().
  *
  * In edje there is (currently) only 4 main point:
@@ -5821,7 +6256,8 @@ EAPI Eina_Bool edje_edit_state_map_point_color_set(Evas_Object *obj, const char
  **/
 EAPI Eina_Bool edje_edit_state_map_point_color_get(Evas_Object *obj, const char *part, const char *state, double value, int idx, int *r, int *g, int *b, int *a);
 
-/** Set the source part for given part state.
+/**
+ * @brief Sets the source part for given part state.
  *
  * Set another part content as the content of this part.
  *
@@ -5837,7 +6273,8 @@ EAPI Eina_Bool edje_edit_state_map_point_color_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_state_proxy_source_set(Evas_Object *obj, const char *part, const char *state, double value, const char *source_name);
 
-/** Get the source name for given state of part.
+/**
+ * @brief Gets the source name for given state of part.
  *
  * @note The returned string should be freed with @c eina_stringshare_del().
  * @param obj Object being edited.
@@ -5851,7 +6288,8 @@ EAPI Eina_Bool edje_edit_state_proxy_source_set(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Stringshare * edje_edit_state_proxy_source_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the source clip for given PROXY part state.
+/**
+ * @brief Sets the source clip for given PROXY part state.
  *
  * The source clipper is ignored or used when rendering the proxy part.
  *
@@ -5867,7 +6305,8 @@ EAPI Eina_Stringshare * edje_edit_state_proxy_source_get(Evas_Object *obj, const
 EAPI Eina_Bool
 edje_edit_state_proxy_source_clip_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool clip);
 
-/** Get the source clip for given PROXY part state.
+/**
+ * @brief Gets the source clip for given PROXY part state.
  *
  * The source clipper is ignored or used when rendering the proxy part.
  *
@@ -5882,7 +6321,8 @@ edje_edit_state_proxy_source_clip_set(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_state_proxy_source_clip_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the source visibility for given PROXY part state.
+/**
+ * @brief Sets the source visibility for given PROXY part state.
  *
  * Defines if both the proxy and its source object will be visible or not.
  * In case of false flag, the source object will not be visible at all while
@@ -5900,7 +6340,8 @@ edje_edit_state_proxy_source_clip_get(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_state_proxy_source_visible_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool visibility);
 
-/** Get the source visibility for given PROXY part state.
+/**
+ * @brief Gets the source visibility for given PROXY part state.
  *
  * Defines if both the proxy and its source object will be visible or not.
  * In case of false flag, the source object will not be visible at all while
@@ -5921,11 +6362,13 @@ edje_edit_state_proxy_source_visible_get(Evas_Object *obj, const char *part, con
 /******************************************************************************/
 /**************************   TEXT API   ************************************/
 /******************************************************************************/
-/** @name Text API
- *  Functions to deal with text objects (see @ref edcref).
+/**
+ * @name Text API
+ * Functions to deal with text objects (see @ref edcref).
  */ //@{
 
-/** Get the text of a part state.
+/**
+ * @brief Gets the text of a part state.
  *
  * Remember to free the returned string with edje_edit_string_free().
  *
@@ -5938,7 +6381,8 @@ edje_edit_state_proxy_source_visible_get(Evas_Object *obj, const char *part, con
  */
 EAPI const char * edje_edit_state_text_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the text of a part state.
+/**
+ * @brief Sets the text of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -5950,7 +6394,8 @@ EAPI const char * edje_edit_state_text_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_text_set(Evas_Object *obj, const char *part, const char *state, double value,const char *text);
 
-/** Get font name for a given part state.
+/**
+ * @brief Gets font name for a given part state.
  *
  * Remember to free the returned string using edje_edit_string_free().
  *
@@ -5963,7 +6408,8 @@ EAPI Eina_Bool edje_edit_state_text_set(Evas_Object *obj, const char *part, cons
  */
 EAPI const char * edje_edit_state_font_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set font name for a given part state.
+/**
+ * @brief Sets font name for a given part state.
  *
  * Font name can be any alias of an internal font in the Edje file and,
  * if it doesn't match any, Edje will look for a font with the given name
@@ -5979,18 +6425,20 @@ EAPI const char * edje_edit_state_font_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_font_set(Evas_Object *obj, const char *part, const char *state, double value, const char *font);
 
-/** Get the text size of a part state
+/**
+ * @brief Gets the text size of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to get text size (not including the state value).
  * @param value The state value.
  *
- * @return The text size or -1 on errors.
+ * @return The text size or @c -1 on errors.
  */
 EAPI int edje_edit_state_text_size_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the text size of a part state.
+/**
+ * @brief Sets the text size of a part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6002,7 +6450,8 @@ EAPI int edje_edit_state_text_size_get(Evas_Object *obj, const char *part, const
  */
 EAPI Eina_Bool edje_edit_state_text_size_set(Evas_Object *obj, const char *part, const char *state, double value, int size);
 
-/** Get the text horizontal align of a part state.
+/**
+ * @brief Gets the text horizontal align of a part state.
  *
  * The value range is from 0.0(right) to 1.0(left)
  * If the value is between -1.0 and 0.0 then it uses align automatically.
@@ -6012,11 +6461,12 @@ EAPI Eina_Bool edje_edit_state_text_size_set(Evas_Object *obj, const char *part,
  * @param state The name of the state to get the text horizontal align (not including the state value).
  * @param value The state value.
  *
- * @return The text horizont align value
+ * @return The text horizontal align value
  */
 EAPI double edje_edit_state_text_align_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get the text vertical align of a part state.
+/**
+ * @brief Gets the text vertical align of a part state.
  *
  * The value range is from 0.0(top) to 1.0(bottom)
  *
@@ -6025,11 +6475,12 @@ EAPI double edje_edit_state_text_align_x_get(Evas_Object *obj, const char *part,
  * @param state The name of the state to get the text vertical align (not including the state value).
  * @param value The state value.
  *
- * @return The text horizont align value
+ * @return The text horizontal align value
  */
 EAPI double edje_edit_state_text_align_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the text horizontal align of a part state.
+/**
+ * @brief Sets the text horizontal align of a part state.
  *
  * The value range is from 0.0(right) to 1.0(left)
  * If the value is between -1.0 and 0.0 then it uses align automatically.
@@ -6044,7 +6495,8 @@ EAPI double edje_edit_state_text_align_y_get(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_text_align_x_set(Evas_Object *obj, const char *part, const char *state, double value, double align);
 
-/** Set the text vertical align of a part state.
+/**
+ * @brief Sets the text vertical align of a part state.
  *
  * The value range is from 0.0(top) to 1.0(bottom)
  *
@@ -6058,27 +6510,29 @@ EAPI Eina_Bool edje_edit_state_text_align_x_set(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_state_text_align_y_set(Evas_Object *obj, const char *part, const char *state, double value, double align);
 
-/** Get the text elipsis of a part state.
+/**
+ * @brief Gets the text elipsis of a part state.
  *
  * The value range is from 0.0(right) to 1.0(left), and -1.0 (if disabled)
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to get the text elipses value (not including the state value).
+ * @param state The name of the state to get the text elipsis value (not including the state value).
  * @param value The state value.
  *
  * @return The text elipsis value
  */
 EAPI double edje_edit_state_text_elipsis_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the text vertical align of a part state.
+/**
+ * @brief Sets the text vertical align of a part state.
  *
  * The value range is from 0.0(right) to 1.0(left)
  * If the value is in range from -1.0 to 0.0 then ellipsis is disabled.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to set the text elipses value (not including the state value).
+ * @param state The name of the state to set the text elipsis value (not including the state value).
  * @param value The state value.
  * @param balance The position where to cut the string
  *
@@ -6086,7 +6540,8 @@ EAPI double edje_edit_state_text_elipsis_get(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_text_elipsis_set(Evas_Object *obj, const char *part, const char *state, double value, double balance);
 
-/** Get if the text part fit it's container horizontally
+/**
+ * @brief Gets if the text part fit it's container horizontally.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6097,19 +6552,21 @@ EAPI Eina_Bool edje_edit_state_text_elipsis_set(Evas_Object *obj, const char *pa
  */
 EAPI Eina_Bool edje_edit_state_text_fit_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set if the text part should fit it's container horizontally
+/**
+ * @brief Sets if the text part should fit it's container horizontally.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the if the text part fit it's container horizontally (not including the state value).
  * @param value The state value.
- * @param fit EINA_TRUE to make the text fit it's container horizontally, @c EINA_FALSE otherwise.
+ * @param fit @c EINA_TRUE to make the text fit it's container horizontally, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool fit);
 
-/** Get if the text part fit it's container vertically
+/**
+ * @brief Gets if the text part fit it's container vertically.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6120,19 +6577,21 @@ EAPI Eina_Bool edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_text_fit_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set if the text part should fit it's container vertically
+/**
+ * @brief Sets if the text part should fit it's container vertically.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the if the text part fit it's container vertically (not including the state value).
  * @param value The state value.
- * @param fit EINA_TRUE to make the text fit it's container vertically, @c EINA_FALSE otherwise.
+ * @param fit @c EINA_TRUE to make the text fit it's container vertically, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool fit);
 
-/** Get if the text part forces the minimum horizontal size of the container to be equal to the minimum horizontal size of the text part
+/**
+ * @brief Gets if the text part forces the minimum horizontal size of the container to be equal to the minimum horizontal size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6143,7 +6602,8 @@ EAPI Eina_Bool edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_text_min_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get if the text part forces the maximum horizontal size of the container to be equal to the maximum horizontal size of the text part
+/**
+ * @brief Gets if the text part forces the maximum horizontal size of the container to be equal to the maximum horizontal size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6154,7 +6614,8 @@ EAPI Eina_Bool edje_edit_state_text_min_x_get(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_text_max_x_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get if the text part forces the minimum vertical size of the container to be equal to the minimum vertical size of the text part
+/**
+ * @brief Gets if the text part forces the minimum vertical size of the container to be equal to the minimum vertical size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6165,7 +6626,8 @@ EAPI Eina_Bool edje_edit_state_text_max_x_get(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_text_min_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Get if the text part forces the maximum vertical size of the container to be equal to the maximum vertical size of the text part
+/**
+ * @brief Gets if the text part forces the maximum vertical size of the container to be equal to the maximum vertical size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6176,66 +6638,72 @@ EAPI Eina_Bool edje_edit_state_text_min_y_get(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_text_max_y_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set if the text part forces the minimum horizontal size of the container to be equal to the minimum horizontal size of the text part
+/**
+ * @brief Sets if the text part forces the minimum horizontal size of the container to be equal to the minimum horizontal size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the the minimum horizontal size of the container to be equal (not including the state value).
  * @param value The state value.
- * @param v EINA_TRUE to make the text force it's forces container's minimum horizontal size, @c EINA_FALSE otherwise.
+ * @param v @c EINA_TRUE to make the text force it's forces container's minimum horizontal size, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_text_min_x_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool v);
 
-/** Set if the text part forces the maximum horizontal size of the container to be equal to the maximum horizontal size of the text part
+/**
+ * @brief Sets if the text part forces the maximum horizontal size of the container to be equal to the maximum horizontal size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the the maximum horizontal size of the container to be equal (not including the state value).
  * @param value The state value.
- * @param v EINA_TRUE to make the text force it's forces container's maximum horizontal size, @c EINA_FALSE otherwise.
+ * @param v @c EINA_TRUE to make the text force it's forces container's maximum horizontal size, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_text_max_x_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool v);
 
-/** Set if the text part forces the minimum vertical size of the container to be equal to the minimum vertical size of the text part
+/**
+ * @brief Sets if the text part forces the minimum vertical size of the container to be equal to the minimum vertical size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the the minimum vertical size of the container to be equal (not including the state value).
  * @param value The state value.
- * @param v EINA_TRUE to make the text force it's forces container's minimum vertical size, @c EINA_FALSE otherwise.
+ * @param v @c EINA_TRUE to make the text force it's forces container's minimum vertical size, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_text_min_y_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool v);
 
-/** Set if the text part forces the maximum vertical size of the container to be equal to the maximum vertical size of the text part
+/**
+ * @brief Sets if the text part forces the maximum vertical size of the container to be equal to the maximum vertical size of the text part
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the the maximum vertical size of the container to be equal (not including the state value).
  * @param value The state value.
- * @param v EINA_TRUE to make the text force it's forces container's maximum vertical size, @c EINA_FALSE otherwise.
+ * @param v @c EINA_TRUE to make the text force it's forces container's maximum vertical size, @c EINA_FALSE otherwise.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_state_text_max_y_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool v);
 
-/** Get style name for a given part state.
+/**
+ * @brief Gets style name for a given part state.
  *
  * @param obj Object being edited.
  * @param part The name of the part to get the style of.
  * @param state The state of the part to get the style of.
  * @param value Value of the state.
  *
- * @return Style used by the part or NULL if error or nothing is set.
+ * @return Style used by the part, or NULL if error or nothing is set.
  */
 EAPI const char * edje_edit_state_text_style_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set style name for a given part state.
+/**
+ * @brief Sets style name for a given part state.
  *
  * Causes the part to use the default style and tags defined in the "style" block with the specified name.
  *
@@ -6250,7 +6718,8 @@ EAPI const char * edje_edit_state_text_style_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_text_style_set(Evas_Object *obj, const char *part, const char *state, double value, const char *style);
 
-/** Get part name, which used as text source.
+/**
+ * @brief Gets part name, which used as text source.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6262,7 +6731,8 @@ EAPI Eina_Bool edje_edit_state_text_style_set(Evas_Object *obj, const char *part
  */
 EAPI const char * edje_edit_state_text_text_source_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the source text part for a given part.
+/**
+ * @brief Sets the source text part for a given part.
  * Causes the part to display the content text of another part and update
  * them as they change.
  *
@@ -6277,19 +6747,21 @@ EAPI const char * edje_edit_state_text_text_source_get(Evas_Object *obj, const c
  */
 EAPI Eina_Bool edje_edit_state_text_text_source_set(Evas_Object *obj, const char *part, const char *state, double value, const char *source);
 
-/** Get part name, which used as style text source.
+/**
+ * @brief Gets part name, which used as style text source.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
  * @param state The name of the state to set the the maximum vertical size of
  * @param value Value of the state.
- * the container to be equal (not including the state value).
+ * The container to be equal (not including the state value).
  *
  * @return The name of part or NULL, if text_source param not a setted.
  */
 EAPI const char * edje_edit_state_text_source_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the source part which would be used as style for text for a given part.
+/**
+ * @brief Sets the source part which would be used as style for text for a given part.
  * Causes the part to use the text properties (like font and size) of another
  * part and update them as they change.
  *
@@ -6304,7 +6776,8 @@ EAPI const char * edje_edit_state_text_source_get(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_state_text_source_set(Evas_Object *obj, const char *part, const char *state, double value, const char *source);
 
-/** Get the text class of the given part state.
+/**
+ * @brief Gets the text class of the given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6315,7 +6788,8 @@ EAPI Eina_Bool edje_edit_state_text_source_set(Evas_Object *obj, const char *par
  */
 EAPI const char * edje_edit_state_text_class_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the text class of the given part state.
+/**
+ * @brief Sets the text class of the given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6327,7 +6801,8 @@ EAPI const char * edje_edit_state_text_class_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_text_class_set(Evas_Object *obj, const char *part, const char *state, double value, const char *text_class);
 
-/** Get the replacement character string of the given part state.
+/**
+ * @brief Gets the replacement character string of the given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6339,7 +6814,8 @@ EAPI Eina_Bool edje_edit_state_text_class_set(Evas_Object *obj, const char *part
  */
 EAPI const char * edje_edit_state_text_repch_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the replacement character string of the given part state.
+/**
+ * @brief Sets the replacement character string of the given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6352,7 +6828,8 @@ EAPI const char * edje_edit_state_text_repch_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_text_repch_set(Evas_Object *obj, const char *part, const char *state, double value, const char *repch);
 
-/** Get the min and max font size allowed for the text part.
+/**
+ * @brief Gets the min and max font size allowed for the text part.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6365,7 +6842,8 @@ EAPI Eina_Bool edje_edit_state_text_repch_set(Evas_Object *obj, const char *part
  */
 EAPI Eina_Bool edje_edit_state_text_size_range_min_max_get(Evas_Object *obj, const char *part, const char *state, double value, int *min, int *max);
 
-/** Set the min and max font size allowed for the text part.
+/**
+ * @brief Sets the min and max font size allowed for the text part.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6378,7 +6856,8 @@ EAPI Eina_Bool edje_edit_state_text_size_range_min_max_get(Evas_Object *obj, con
  */
 EAPI Eina_Bool edje_edit_state_text_size_range_min_max_set(Evas_Object *obj, const char *part, const char *state, double value, int min, int max);
 
-/** Get the list of all the fonts in the given edje.
+/**
+ * @brief Gets the list of all the fonts in the given edje.
  *
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
@@ -6388,7 +6867,8 @@ EAPI Eina_Bool edje_edit_state_text_size_range_min_max_set(Evas_Object *obj, con
  */
 EAPI Eina_List * edje_edit_fonts_list_get(Evas_Object *obj);
 
-/** Add a new font to the edje file.
+/**
+ * @brief Adds a new font to the edje file.
  *
  * The newly created font will be available to all the groups in the edje, not only the current one.
  *
@@ -6400,7 +6880,8 @@ EAPI Eina_List * edje_edit_fonts_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_font_add(Evas_Object *obj, const char *path, const char* alias);
 
-/** Delete font from the edje file.
+/**
+ * @brief Deletes font from the edje file.
  *
  * The font will be removed from all the groups in the edje, not only the current one.
  *
@@ -6412,7 +6893,8 @@ EAPI Eina_Bool edje_edit_font_add(Evas_Object *obj, const char *path, const char
  */
 EAPI Eina_Bool edje_edit_font_del(Evas_Object *obj, const char* alias);
 
-/** Get font path for a given font alias.
+/**
+ * @brief Gets font path for a given font alias.
  *
  * Remember to free the string with edje_edit_string_free()
  *
@@ -6427,11 +6909,13 @@ EAPI const char *edje_edit_font_path_get(Evas_Object *obj, const char *alias);
 /******************************************************************************/
 /************************   IMAGE SET API   ***********************************/
 /******************************************************************************/
-/** @name Image Set API
- *  Functions to deal with image objects (see @ref edcref).
+/**
+ * @name Image Set API
+ * Functions to deal with image objects (see @ref edcref).
  */ //@{
 
-/** Check if given image name is set of images or not.
+/**
+ * @brief Checks if given image name is set of images or not.
  *
  * @param obj Object being edited.
  * @param image a name to check if it is set or not.
@@ -6443,7 +6927,8 @@ EAPI const char *edje_edit_font_path_get(Evas_Object *obj, const char *alias);
 EAPI Eina_Bool
 edje_edit_image_set_exists(Evas_Object *obj, const char *image);
 
-/** Get id of image set.
+/**
+ * @brief Gets id of image set.
  *
  * @param obj Object being edited.
  * @param name image set's name.
@@ -6455,7 +6940,8 @@ edje_edit_image_set_exists(Evas_Object *obj, const char *image);
 EAPI int
 edje_edit_image_set_id_get(Evas_Object *obj, const char *name);
 
-/** Rename image set.
+/**
+ * @brief Renames image set.
  *
  * @param obj Object being edited.
  * @param set image set's name.
@@ -6468,7 +6954,8 @@ edje_edit_image_set_id_get(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_image_set_rename(Evas_Object *obj, const char *set, const char *new_set);
 
-/** Get the list of all the image sets in the given edje.
+/**
+ * @brief Gets the list of all the image sets in the given edje.
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
  * @param obj Object being edited.
@@ -6480,21 +6967,23 @@ edje_edit_image_set_rename(Evas_Object *obj, const char *set, const char *new_se
 EAPI Eina_List *
 edje_edit_image_set_list_get(Evas_Object *obj);
 
-/** Get list of (Edje_Part_Image_Use *) - group-part-state triplets where given
+/**
+ * @brief Gets list of (Edje_Part_Image_Use *) - group-part-state triplets where given
  * set is used
  *
  * Use edje_edit_image_usage_list_free() when you don't need it anymore.
  *
  * @param obj Object being edited.
  * @param name The name of the image.
- * @param first_only If EINA_TRUE, return only one triplete.
+ * @param first_only If @c EINA_TRUE, return only one triplete.
  *
  * @return Eina_List containing Edje_Part_Image_Use if successful, NULL otherwise
  */
 EAPI Eina_List*
 edje_edit_set_usage_list_get(Evas_Object *obj, const char *name, Eina_Bool first_only);
 
-/** Add new image set.
+/**
+ * @brief Adds new image set.
  *
  * @param obj Object being edited.
  * @param name image set's name.
@@ -6506,7 +6995,8 @@ edje_edit_set_usage_list_get(Evas_Object *obj, const char *name, Eina_Bool first
 EAPI Eina_Bool
 edje_edit_image_set_add(Evas_Object *obj, const char *name);
 
-/** Delete image set.
+/**
+ * @brief Deletes image set.
  *
  * Can't delete set if it is used by any part.
  *
@@ -6520,7 +7010,8 @@ edje_edit_image_set_add(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_image_set_del(Evas_Object *obj, const char *name);
 
-/** Get the list of all images inside of given set in the given edje.
+/**
+ * @brief Gets the list of all images inside of given set in the given edje.
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
  * @param obj Object being edited.
@@ -6533,7 +7024,8 @@ edje_edit_image_set_del(Evas_Object *obj, const char *name);
 EAPI Eina_List *
 edje_edit_image_set_images_list_get(Evas_Object *obj, const char *name);
 
-/** Add image to set.
+/**
+ * @brief Adds image to set.
  *
  * Add image to given set. If image is not exist inside of edje
  * collection then function @see edje_edit_image_add should be
@@ -6551,7 +7043,8 @@ edje_edit_image_set_images_list_get(Evas_Object *obj, const char *name);
 EAPI Eina_Bool
 edje_edit_image_set_image_add(Evas_Object *obj, const char *set_name, const char *name);
 
-/** Delete image on current position from set.
+/**
+ * @brief Deletes image on current position from set.
  *
  * Remove image from given set. To be sure what kind of image will be
  * deleted, firstly check it's position via
@@ -6568,7 +7061,8 @@ edje_edit_image_set_image_add(Evas_Object *obj, const char *set_name, const char
 EAPI Eina_Bool
 edje_edit_image_set_image_del(Evas_Object *obj, const char *set_name, unsigned int place);
 
-/** Get min size of set's image.
+/**
+ * @brief Gets min size of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6583,7 +7077,8 @@ edje_edit_image_set_image_del(Evas_Object *obj, const char *set_name, unsigned i
 EAPI Eina_Bool
 edje_edit_image_set_image_min_get(Evas_Object *obj, const char *set_name, unsigned int place, int *w, int *h);
 
-/** Set min size of set's image.
+/**
+ * @brief Sets min size of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6598,7 +7093,8 @@ edje_edit_image_set_image_min_get(Evas_Object *obj, const char *set_name, unsign
 EAPI Eina_Bool
 edje_edit_image_set_image_min_set(Evas_Object *obj, const char *set_name, unsigned int place, int w, int h);
 
-/** Get max size of set's image.
+/**
+ * @brief Gets max size of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6613,7 +7109,8 @@ edje_edit_image_set_image_min_set(Evas_Object *obj, const char *set_name, unsign
 EAPI Eina_Bool
 edje_edit_image_set_image_max_get(Evas_Object *obj, const char *set_name, unsigned int place, int *w, int *h);
 
-/** Set max size of set's image.
+/**
+ * @brief Sets max size of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6628,7 +7125,8 @@ edje_edit_image_set_image_max_get(Evas_Object *obj, const char *set_name, unsign
 EAPI Eina_Bool
 edje_edit_image_set_image_max_set(Evas_Object *obj, const char *set_name, unsigned int place, int w, int h);
 
-/** Get border of set's image.
+/**
+ * @brief Gets border of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6645,7 +7143,8 @@ edje_edit_image_set_image_max_set(Evas_Object *obj, const char *set_name, unsign
 EAPI Eina_Bool
 edje_edit_image_set_image_border_get(Evas_Object *obj, const char *set_name, unsigned int place, int *l, int *r, int *b, int *t);
 
-/** Set border of set's image.
+/**
+ * @brief Sets border of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6662,7 +7161,8 @@ edje_edit_image_set_image_border_get(Evas_Object *obj, const char *set_name, uns
 EAPI Eina_Bool
 edje_edit_image_set_image_border_set(Evas_Object *obj, const char *set_name, unsigned int place, int l, int r, int b, int t);
 
-/** Get border scale of set's image.
+/**
+ * @brief Gets border scale of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6675,7 +7175,8 @@ edje_edit_image_set_image_border_set(Evas_Object *obj, const char *set_name, uns
 EAPI double
 edje_edit_image_set_image_border_scale_get(Evas_Object *obj, const char *set_name, unsigned int place);
 
-/** Set border scale of set's image.
+/**
+ * @brief Sets border scale of set's image.
  *
  * @param obj Object being edited.
  * @param set_name name of image set.
@@ -6693,11 +7194,13 @@ edje_edit_image_set_image_border_scale_set(Evas_Object *obj, const char *set_nam
 /******************************************************************************/
 /**************************   IMAGES API   ************************************/
 /******************************************************************************/
-/** @name Images API
- *  Functions to deal with image objects (see @ref edcref).
+/**
+ * @name Images API
+ * Functions to deal with image objects (see @ref edcref).
  */ //@{
 
-/** Get the list of all the images in the given edje.
+/**
+ * @brief Gets the list of all the images in the given edje.
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
  * @param obj Object being edited.
@@ -6706,7 +7209,8 @@ edje_edit_image_set_image_border_scale_set(Evas_Object *obj, const char *set_nam
  */
 EAPI Eina_List * edje_edit_images_list_get(Evas_Object *obj);
 
-/** Add an new image to the image collection
+/**
+ * @brief Adds an new image to the image collection
  *
  * This function add the given image inside the edje. Don't add a new image part
  * but only put the image inside the edje file. It actually write directly to
@@ -6724,7 +7228,8 @@ EAPI Eina_List * edje_edit_images_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_image_add(Evas_Object *obj, const char *path);
 
-/** Delete an image from the image collection
+/**
+ * @brief Deletes an image from the image collection
  *
  * It actually write directly to the file so you don't have to save.
  * Can't delete image if it is used by any part.
@@ -6737,7 +7242,8 @@ EAPI Eina_Bool edje_edit_image_add(Evas_Object *obj, const char *path);
  */
 EAPI Eina_Bool edje_edit_image_del(Evas_Object *obj, const char *name);
 
-/** Replace one image in all descriptions
+/**
+ * @brief Replaces one image in all descriptions.
  *
  * @param obj Object being edited.
  * @param name The name of the image to replace.
@@ -6748,7 +7254,8 @@ EAPI Eina_Bool edje_edit_image_del(Evas_Object *obj, const char *name);
  */
 EAPI Eina_Bool edje_edit_image_replace(Evas_Object *obj, const char *name, const char *new_name);
 
-/** Rename image
+/**
+ * @brief Renames image.
  *
  * @param obj Object being edited.
  * @param name The name of the image to be renamed.
@@ -6761,7 +7268,8 @@ EAPI Eina_Bool edje_edit_image_replace(Evas_Object *obj, const char *name, const
  */
 EAPI Eina_Bool edje_edit_image_rename(Evas_Object *obj, const char *name, const char *new_name);
 
-/** Get list of (Edje_Part_Image_Use *) - group-part-state triplets where given
+/**
+ * @brief Gets list of (Edje_Part_Image_Use *) - group-part-state triplets where given
  * image is used.
  *
  * Important! Image can also be used inside of set and plenty of times, so for each use
@@ -6772,20 +7280,22 @@ EAPI Eina_Bool edje_edit_image_rename(Evas_Object *obj, const char *name, const
  *
  * @param obj Object being edited.
  * @param name The name of the image.
- * @param first_only If EINA_TRUE, return only one triplete.
+ * @param first_only If @c EINA_TRUE, return only one triplet.
  *
  * @return Eina_List containing Edje_Part_Image_Use if successful, NULL otherwise
  */
 EAPI Eina_List* edje_edit_image_usage_list_get(Evas_Object *obj, const char *name, Eina_Bool first_only);
 
-/** Free an Eina_List of (Edje_Part_Image_Use *) allocated by an edje_edit_image_usage_list_get() or
+/**
+ * @brief Frees an Eina_List of (Edje_Part_Image_Use *) allocated by an edje_edit_image_usage_list_get() or
  * an edje_edit_vector_usage_list_get() function.
  *
  * @param lst List of strings to free.
  */
 EAPI void edje_edit_image_usage_list_free(Eina_List *lst);
 
-/** Add an image entry to the image collection
+/**
+ * @brief Adds an image entry to the image collection.
  *
  * This function adds the given image entry to the edje image collection. The
  * image needs to be inside the eet already, with key name "images/id". After
@@ -6801,7 +7311,8 @@ EAPI void edje_edit_image_usage_list_free(Eina_List *lst);
  */
 EAPI Eina_Bool edje_edit_image_data_add(Evas_Object *obj, const char *name, int id);
 
-/** Get normal image name for a given part state.
+/**
+ * @brief Gets normal image name for a given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6812,7 +7323,8 @@ EAPI Eina_Bool edje_edit_image_data_add(Evas_Object *obj, const char *name, int
  */
 EAPI const char * edje_edit_state_image_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set normal image for a given part state.
+/**
+ * @brief Sets normal image for a given part state.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
@@ -6824,7 +7336,8 @@ EAPI const char * edje_edit_state_image_get(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state, double value, const char *image);
 
-/** Get normal vector name for a given part state.
+/**
+ * @brief Gets normal vector name for a given part state.
  * Part should be of type VECTOR
  *
  * @param obj Object being edited.
@@ -6837,7 +7350,8 @@ EAPI Eina_Bool edje_edit_state_image_set(Evas_Object *obj, const char *part, con
  */
 EAPI const char * edje_edit_state_vector_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set normal vector name for a given part state.
+/**
+ * @brief Sets normal vector name for a given part state.
  * Part should be of type VECTOR
  *
  * @param obj Object being edited.
@@ -6851,7 +7365,8 @@ EAPI const char * edje_edit_state_vector_get(Evas_Object *obj, const char *part,
  */
 EAPI Eina_Bool edje_edit_state_vector_set(Evas_Object *obj, const char *part, const char *state, double value, const char *image);
 
-/** Get image id for a given image name.
+/**
+ * @brief Gets image id for a given image name.
  *
  * @param obj Object being edited.
  * @param image_name The image name.
@@ -6860,7 +7375,8 @@ EAPI Eina_Bool edje_edit_state_vector_set(Evas_Object *obj, const char *part, co
  */
 EAPI int edje_edit_image_id_get(Evas_Object *obj, const char *image_name);
 
-/** Get compression type for the given image.
+/**
+ * @brief Gets compression type for the given image.
  *
  * @param obj Object being edited.
  * @param image The name of the image.
@@ -6870,7 +7386,8 @@ EAPI int edje_edit_image_id_get(Evas_Object *obj, const char *image_name);
  */
 EAPI Edje_Edit_Image_Comp edje_edit_image_compression_type_get(Evas_Object *obj, const char *image);
 
-/** Set compression type for the given image.
+/**
+ * @brief Sets compression type for the given image.
  *
  * @param obj Object being edited.
  * @param image The name of the image.
@@ -6881,7 +7398,8 @@ EAPI Edje_Edit_Image_Comp edje_edit_image_compression_type_get(Evas_Object *obj,
  */
 EAPI Eina_Bool edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_Edit_Image_Comp ic);
 
-/** Get compression rate for the given image.
+/**
+ * @brief Gets compression rate for the given image.
  *
  * @param obj Object being edited.
  * @param image The name of the image.
@@ -6891,7 +7409,8 @@ EAPI Eina_Bool edje_edit_image_compression_type_set(Evas_Object *obj, const char
  */
 EAPI int edje_edit_image_compression_rate_get(Evas_Object *obj, const char *image);
 
-/** Get the image border of a part state.
+/**
+ * @brief Gets the image border of a part state.
  *
  * Pass NULL to any of [r,g,b,a] to get only the others.
  *
@@ -6907,7 +7426,8 @@ EAPI int edje_edit_image_compression_rate_get(Evas_Object *obj, const char *imag
  */
 EAPI void edje_edit_state_image_border_get(Evas_Object *obj, const char *part, const char *state, double value, int *l, int *r, int *t, int *b);
 
-/** Set the image border of a part state.
+/**
+ * @brief Sets the image border of a part state.
  *
  * Pass -1 to any of [l,r,t,b] to leave the value untouched.
  *
@@ -6925,7 +7445,8 @@ EAPI void edje_edit_state_image_border_get(Evas_Object *obj, const char *part, c
  */
 EAPI Eina_Bool edje_edit_state_image_border_set(Evas_Object *obj, const char *part, const char *state, double value, int l, int r, int t, int b);
 
-/** Get the border scale value of a part state.
+/**
+ * @brief Gets the border scale value of a part state.
  *
  * This value tells Edje if the border should be scaled by
  * the object/global edje scale factors
@@ -6943,7 +7464,8 @@ EAPI Eina_Bool edje_edit_state_image_border_set(Evas_Object *obj, const char *pa
 EAPI Eina_Bool
 edje_edit_state_image_border_scale_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the border scale value of a part state.
+/**
+ * @brief Sets the border scale value of a part state.
  *
  * This value tells Edje if the border should be scaled by
  * the object/global edje scale factors
@@ -6962,7 +7484,8 @@ edje_edit_state_image_border_scale_get(Evas_Object *obj, const char *part, const
 EAPI Eina_Bool
 edje_edit_state_image_border_scale_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool scale);
 
-/** Get the border scale by value of a part state.
+/**
+ * @brief Gets the border scale by value of a part state.
  *
  * Valid values are: 0.0 or bigger (0.0 or 1.0 to turn it off)
  *
@@ -6979,7 +7502,8 @@ edje_edit_state_image_border_scale_set(Evas_Object *obj, const char *part, const
 EAPI double
 edje_edit_state_image_border_scale_by_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set the border scale by value of a part state.
+/**
+ * @brief Sets the border scale by value of a part state.
  *
  * Valid values are: 0.0 or bigger (0.0 or 1.0 to turn it off)
  *
@@ -6997,7 +7521,8 @@ edje_edit_state_image_border_scale_by_get(Evas_Object *obj, const char *part, co
 EAPI Eina_Bool
 edje_edit_state_image_border_scale_by_set(Evas_Object *obj, const char *part, const char *state, double value, double scale);
 
-/** Get if the image center should be draw.
+/**
+ * @brief Gets if the image center should be draw.
  *
  * 1 or 2 means to draw the center, 0 to don't draw it.
  * If 1 - then the center will apply alpha channel.
@@ -7008,11 +7533,12 @@ edje_edit_state_image_border_scale_by_set(Evas_Object *obj, const char *part, co
  * @param state The name of the state to get the image border fill (not including the state value).
  * @param value The state value.
  *
- * @return 2 if the center of the bordered image is draw without alpha, 1 dawing with alpha and 0 not drawing the center.
+ * @return @c 2 if the center of the bordered image is draw without alpha, @c 1 drawing with alpha and @c 0 not drawing the center.
  */
 EAPI unsigned char edje_edit_state_image_border_fill_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Set if the image center should be draw.
+/**
+ * @brief Sets if the image center should be draw.
  *
  * 1 or 2 means to draw the center, 0 to don't draw it.
  * If 1 - then the center will apply alpha channel.
@@ -7028,7 +7554,8 @@ EAPI unsigned char edje_edit_state_image_border_fill_get(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_state_image_border_fill_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char fill);
 
-/** Get the list of all the tweens images in the given part state.
+/**
+ * @brief Gets the list of all the tweens images in the given part state.
  *
  * Use edje_edit_string_list_free() when you don't need it anymore.
  *
@@ -7041,7 +7568,8 @@ EAPI Eina_Bool edje_edit_state_image_border_fill_set(Evas_Object *obj, const cha
  */
 EAPI Eina_List * edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char *state, double value);
 
-/** Add a new tween frame to the given part state.
+/**
+ * @brief Adds a new tween frame to the given part state.
  *
  * The tween param must be the name of an existing image.
  *
@@ -7055,7 +7583,8 @@ EAPI Eina_List * edje_edit_state_tweens_list_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, double value, const char *tween);
 
-/** Insert a new tween frame to the given part state into a specific place.
+/**
+ * @brief Inserts a new tween frame to the given part state into a specific place.
  *
  * The tween param must be the name of an existing image.
  *
@@ -7071,15 +7600,16 @@ EAPI Eina_Bool edje_edit_state_tween_add(Evas_Object *obj, const char *part, con
 EAPI Eina_Bool
 edje_edit_state_tween_insert_at(Evas_Object *obj, const char *part, const char *state, double value, const char *tween, int place);
 
-/** Remove the first tween with the given name.
+/**
+ * @brief Removes the first tween with the given name.
  *
  * The image is not removed from the edje.
  *
  * @param obj Object being edited.
  * @param part Part that contain state.
- * @param state The name of the state to del the tween (not including the state value).
+ * @param state The name of the state to delete the tween (not including the state value).
  * @param value The state value.
- * @param tween The name of the image to del.
+ * @param tween The name of the image to delete.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
@@ -7090,7 +7620,8 @@ EAPI Eina_Bool edje_edit_state_tween_del(Evas_Object *obj, const char *part, con
 /**************************   VECTORS API   ************************************/
 /******************************************************************************/
 
-/** Get vector id for a given vector name.
+/**
+ * @brief Gets vector id for a given vector name.
  *
  * @param obj Object being edited.
  * @param vector_name The vector name.
@@ -7100,11 +7631,13 @@ EAPI Eina_Bool edje_edit_state_tween_del(Evas_Object *obj, const char *part, con
  */
 EAPI int edje_edit_vector_id_get(Evas_Object *obj, const char *vector_name);
 
-/** @name Vectors API
- *  Functions to deal with vector objects of images (see @ref edcref).
+/**
+ * @name Vectors API
+ * Functions to deal with vector objects of images (see @ref edcref).
  */ //@{
 
-/** Get the list of all the vectors in the given edje.
+/**
+ * @brief Gets the list of all the vectors in the given edje.
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
  * @param obj Object being edited.
@@ -7114,7 +7647,8 @@ EAPI int edje_edit_vector_id_get(Evas_Object *obj, const char *vector_name);
  */
 EAPI Eina_List * edje_edit_vectors_list_get(Evas_Object *obj);
 
-/** Delete vector from the vector collection
+/**
+ * @brief Deletes vector from the vector collection
  *
  * It actually write directly to the file so you don't have to save.
  * Can't delete vector if it is used by any part.
@@ -7128,7 +7662,8 @@ EAPI Eina_List * edje_edit_vectors_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_vector_del(Evas_Object *obj, const char *name);
 
-/** Get list of (Edje_Part_Image_Use *) - group-part-state triplets where given
+/**
+ * @brief Gets list of (Edje_Part_Image_Use *) - group-part-state triplets where given
  * vector is used.
  *
  * Use edje_edit_image_usage_list_free() when you don't need it anymore.
@@ -7146,11 +7681,13 @@ EAPI Eina_List* edje_edit_vector_usage_list_get(Evas_Object *obj, const char *na
 /******************************************************************************/
 /**************************   SOUNDS API   ************************************/
 /******************************************************************************/
-/** @name Sounds API
- *  Functions to deal with sound objects (see @ref edcref).
+/**
+ * @name Sounds API
+ * Functions to deal with sound objects (see @ref edcref).
  */ //@{
 
-/** Get the list of all the sounds samples in the given edje.
+/**
+ * @brief Gets the list of all the sounds samples in the given edje.
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
  * @param obj Object being edited.
@@ -7160,7 +7697,8 @@ EAPI Eina_List* edje_edit_vector_usage_list_get(Evas_Object *obj, const char *na
  */
 EAPI Eina_List * edje_edit_sound_samples_list_get(Evas_Object *obj);
 
-/** Get the list of all the sounds tones in the given edje.
+/**
+ * @brief Gets the list of all the sounds tones in the given edje.
  * Use edje_edit_string_list_free() when you don't need the list anymore.
  *
  * @param obj Object being edited.
@@ -7170,7 +7708,8 @@ EAPI Eina_List * edje_edit_sound_samples_list_get(Evas_Object *obj);
  */
 EAPI Eina_List * edje_edit_sound_tones_list_get(Evas_Object *obj);
 
-/** Add new sound sample to samples collection
+/**
+ * @brief Adds new sound sample to samples collection.
  *
  * This function adds the given sound file to the edje collection.
  * The added sound sample could be used by PLAY_SAMPLE action in any program
@@ -7190,7 +7729,8 @@ EAPI Eina_List * edje_edit_sound_tones_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_sound_sample_add(Evas_Object *obj, const char* name, const char* snd_src);
 
-/** Delete sound sample from the collection
+/**
+ * @brief Deletes sound sample from the collection.
  *
  * Deletes sound sample from collection by its name. After successful deletion
  * all PLAY_SAMPLE actions in all programs of all groups of current collection
@@ -7205,7 +7745,8 @@ EAPI Eina_Bool edje_edit_sound_sample_add(Evas_Object *obj, const char* name, co
  */
 EAPI Eina_Bool edje_edit_sound_sample_del(Evas_Object *obj, const char *name);
 
-/** Add new tone to the collection
+/**
+ * @brief Adds new tone to the collection.
  *
  * This function adds new tone with given frequency to the edje collection.
  * The added sound sample could be used by PLAY_TONE action in any program
@@ -7221,7 +7762,8 @@ EAPI Eina_Bool edje_edit_sound_sample_del(Evas_Object *obj, const char *name);
  */
 EAPI Eina_Bool edje_edit_sound_tone_add(Evas_Object *obj, const char* name, int frequency);
 
-/** Delete tone from the collection
+/**
+ * @brief Deletes tone from the collection.
  *
  * Deletes tone from collection by its name. After successful deletion
  * all PLAY_TONE actions in all programs of all groups of current collection
@@ -7236,7 +7778,8 @@ EAPI Eina_Bool edje_edit_sound_tone_add(Evas_Object *obj, const char* name, int
  */
 EAPI Eina_Bool edje_edit_sound_tone_del(Evas_Object *obj, const char* name);
 
-/** Get the sound quality compression.
+/**
+ * @brief Gets the sound quality compression.
  *
  * @param obj Object being edited.
  * @param sound The name of the sample.
@@ -7246,7 +7789,8 @@ EAPI Eina_Bool edje_edit_sound_tone_del(Evas_Object *obj, const char* name);
  */
 EAPI double edje_edit_sound_compression_rate_get(Evas_Object *obj, const char* sound);
 
-/** Set the sound quality compression.
+/**
+ * @brief Sets the sound quality compression.
  *
  * @param obj Object being edited.
  * @param sound The name of the sample.
@@ -7257,7 +7801,8 @@ EAPI double edje_edit_sound_compression_rate_get(Evas_Object *obj, const char* s
  */
 EAPI Eina_Bool edje_edit_sound_compression_rate_set(Evas_Object *obj, const char* sound, double rate);
 
-/** Set the frequency of tone.
+/**
+ * @brief Sets the frequency of tone.
  *
  * @param obj Object being edited.
  * @param name The name of the tone.
@@ -7269,7 +7814,8 @@ EAPI Eina_Bool edje_edit_sound_compression_rate_set(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_sound_tone_frequency_set(Evas_Object *obj, const char *name, int frequency);
 
-/** Get the frequency of tone.
+/**
+ * @brief Gets the frequency of tone.
  *
  * @param obj Object being edited.
  * @param name The name of the tone.
@@ -7280,7 +7826,8 @@ EAPI Eina_Bool edje_edit_sound_tone_frequency_set(Evas_Object *obj, const char *
  */
 EAPI int edje_edit_sound_tone_frequency_get(Evas_Object *obj, const char *name);
 
-/** Get the sound type compression.
+/**
+ * @brief Gets the sound type compression.
  *
  * @param obj Object being edited.
  * @param name The name of the sample.
@@ -7290,7 +7837,8 @@ EAPI int edje_edit_sound_tone_frequency_get(Evas_Object *obj, const char *name);
  */
 EAPI Edje_Edit_Sound_Comp edje_edit_sound_compression_type_get(Evas_Object *obj, const char* name);
 
-/** Set the sound type compression.
+/**
+ * @brief Sets the sound type compression.
  *
  * @param obj Object being edited.
  * @param name The name of the sample.
@@ -7302,7 +7850,8 @@ EAPI Edje_Edit_Sound_Comp edje_edit_sound_compression_type_get(Evas_Object *obj,
  */
 EAPI Eina_Bool edje_edit_sound_compression_type_set(Evas_Object *obj, const char* name, Edje_Edit_Sound_Comp sc);
 
-/** Get the certain sound data from the edje object.
+/**
+ * @brief Gets the certain sound data from the edje object.
  *
  * @param obj Object being edited.
  * @param sample_name The name of the sound.
@@ -7312,7 +7861,8 @@ EAPI Eina_Bool edje_edit_sound_compression_type_set(Evas_Object *obj, const char
  */
 EAPI Eina_Binbuf *edje_edit_sound_samplebuffer_get(Evas_Object *obj, const char *sample_name);
 
-/** Get the name of sample source.
+/**
+ * @brief Gets the name of sample source.
  *
  * @param obj Object being edited.
  * @param sample_name The name of the sample.
@@ -7326,11 +7876,13 @@ EAPI const char *edje_edit_sound_samplesource_get(Evas_Object *obj, const char *
 /******************************************************************************/
 /*************************   SPECTRUM API   ***********************************/
 /******************************************************************************/
-/** @name Spectrum API
- *  Functions to manage spectrum (see @ref edcref).
+/**
+ * @name Spectrum API
+ * Functions to manage spectrum (see @ref edcref).
  */ //@{
 
-/** Get the list of all the spectrum in the given edje object.
+/**
+ * @brief Gets the list of all the spectrum in the given edje object.
  *
  * Use edje_edit_string_list_free() when you don't need it anymore.
  *
@@ -7340,7 +7892,8 @@ EAPI const char *edje_edit_sound_samplesource_get(Evas_Object *obj, const char *
  */
 EAPI Eina_List * edje_edit_spectrum_list_get(Evas_Object *obj);
 
-/** Add a new spectra in the given edje object.
+/**
+ * @brief Adds a new spectra in the given edje object.
  *
  * @param obj Object being edited.
  * @param name The name of the spectra to include in the edje.
@@ -7349,7 +7902,8 @@ EAPI Eina_List * edje_edit_spectrum_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_spectra_add(Evas_Object *obj, const char *name);
 
-/** Delete the given spectra from the edje object.
+/**
+ * @brief Deletes the given spectra from the edje object.
  *
  * @param obj Object being edited.
  * @param spectra The name of the spectra to delete.
@@ -7358,7 +7912,8 @@ EAPI Eina_Bool edje_edit_spectra_add(Evas_Object *obj, const char *name);
  */
 EAPI Eina_Bool edje_edit_spectra_del(Evas_Object *obj, const char *spectra);
 
-/** Change the name of the given spectra.
+/**
+ * @brief Changes the name of the given spectra.
  *
  * @param obj Object being edited.
  * @param spectra The name of the current spectra.
@@ -7368,7 +7923,8 @@ EAPI Eina_Bool edje_edit_spectra_del(Evas_Object *obj, const char *spectra);
  */
 EAPI Eina_Bool edje_edit_spectra_name_set(Evas_Object *obj, const char *spectra, const char *name);
 
-/** Get the number of stops in the given spectra.
+/**
+ * @brief Gets the number of stops in the given spectra.
  *
  * @param obj Object being edited.
  * @param spectra The name of the spectra.
@@ -7377,7 +7933,8 @@ EAPI Eina_Bool edje_edit_spectra_name_set(Evas_Object *obj, const char *spectra,
  */
 EAPI int edje_edit_spectra_stop_num_get(Evas_Object *obj, const char *spectra);
 
-/** Set the number of stops in the given spectra.
+/**
+ * @brief Sets the number of stops in the given spectra.
  *
  * @param obj Object being edited.
  * @param spectra The name of the spectra.
@@ -7387,7 +7944,8 @@ EAPI int edje_edit_spectra_stop_num_get(Evas_Object *obj, const char *spectra);
  */
 EAPI Eina_Bool edje_edit_spectra_stop_num_set(Evas_Object *obj, const char *spectra, int num);
 
-/** Get the colors of the given stop.
+/**
+ * @brief Gets the colors of the given stop.
  *
  * @param obj Object being edited.
  * @param spectra The name of the spectra.
@@ -7402,7 +7960,8 @@ EAPI Eina_Bool edje_edit_spectra_stop_num_set(Evas_Object *obj, const char *spec
  */
 EAPI Eina_Bool edje_edit_spectra_stop_color_get(Evas_Object *obj, const char *spectra, int stop_number, int *r, int *g, int *b, int *a, int *d);
 
-/** Set the colors of the given stop.
+/**
+ * @brief Sets the colors of the given stop.
  *
  * @param obj Object being edited.
  * @param spectra The name of the spectra.
@@ -7421,11 +7980,13 @@ EAPI Eina_Bool edje_edit_spectra_stop_color_set(Evas_Object *obj, const char *sp
 /******************************************************************************/
 /*************************   PROGRAMS API   ***********************************/
 /******************************************************************************/
-/** @name Programs API
- *  Functions to deal with programs (see @ref edcref).
+/**
+ * @name Programs API
+ * Functions to deal with programs (see @ref edcref).
  */ //@{
 
-/** Get the list of all the programs in the given edje object.
+/**
+ * @brief Gets the list of all the programs in the given edje object.
  *
  * Use edje_edit_string_list_free() when you don't need it anymore.
  *
@@ -7435,7 +7996,8 @@ EAPI Eina_Bool edje_edit_spectra_stop_color_set(Evas_Object *obj, const char *sp
  */
 EAPI Eina_List * edje_edit_programs_list_get(Evas_Object *obj);
 
-/** Add a new program to the edje file
+/**
+ * @brief Adds a new program to the edje file
  *
  * If a program with the same name just exist the function will fail.
  *
@@ -7446,7 +8008,8 @@ EAPI Eina_List * edje_edit_programs_list_get(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_program_add(Evas_Object *obj, const char *name);
 
-/** Remove the given program from the edje file.
+/**
+ * @brief Removes the given program from the edje file.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to remove.
@@ -7455,7 +8018,8 @@ EAPI Eina_Bool edje_edit_program_add(Evas_Object *obj, const char *name);
  */
 EAPI Eina_Bool edje_edit_program_del(Evas_Object *obj, const char *prog);
 
-/** Check if a program with the given name exist in the edje object.
+/**
+ * @brief Checks if a program with the given name exist in the edje object.
  *
  * @param obj Object being edited.
  * @param prog The prog of the program that will be searched.
@@ -7464,7 +8028,8 @@ EAPI Eina_Bool edje_edit_program_del(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_exist(Evas_Object *obj, const char *prog);
 
-/** Run the given program.
+/**
+ * @brief Runs the given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to execute.
@@ -7473,7 +8038,8 @@ EAPI Eina_Bool edje_edit_program_exist(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_run(Evas_Object *obj, const char *prog);
 
-/** Stop all running programs.
+/**
+ * @brief Stops all running programs.
  *
  * @param obj Object being edited.
  *
@@ -7481,7 +8047,8 @@ EAPI Eina_Bool edje_edit_program_run(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_stop_all(Evas_Object *obj);
 
-/** Set parts into intermediate state of programs transition.
+/**
+ * @brief Sets parts into intermediate state of programs transition.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to use. Program should have action STATE_SET.
@@ -7493,7 +8060,8 @@ EAPI Eina_Bool edje_edit_program_stop_all(Evas_Object *obj);
  */
 EAPI Eina_Bool edje_edit_program_transition_state_set(Evas_Object *obj, const char *prog, double pos);
 
-/** Set a new name for the given program
+/**
+ * @brief Sets a new name for the given program.
  *
  * @param obj Object being edited.
  * @param prog The current program name.
@@ -7503,18 +8071,20 @@ EAPI Eina_Bool edje_edit_program_transition_state_set(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_program_name_set(Evas_Object *obj, const char *prog, const char *new_name);
 
-/** Get source of a given program.
+/**
+ * @brief Gets source of a given program.
  *
  * Remember to free the returned string using edje_edit_string_free().
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get source.
  *
- * @return The source value por program.
+ * @return The source value per program.
  */
 EAPI const char * edje_edit_program_source_get(Evas_Object *obj, const char *prog);
 
-/** Set source of the given program.
+/**
+ * @brief Sets source of the given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to set source.
@@ -7524,7 +8094,8 @@ EAPI const char * edje_edit_program_source_get(Evas_Object *obj, const char *pro
  */
 EAPI Eina_Bool edje_edit_program_source_set(Evas_Object *obj, const char *prog, const char *source);
 
-/** Get signal of a given program.
+/**
+ * @brief Gets signal of a given program.
  *
  * Remember to free the returned string using edje_edit_string_free().
  *
@@ -7535,7 +8106,8 @@ EAPI Eina_Bool edje_edit_program_source_set(Evas_Object *obj, const char *prog,
  */
 EAPI const char * edje_edit_program_signal_get(Evas_Object *obj, const char *prog);
 
-/** Set signal of the given program.
+/**
+ * @brief Sets signal of the given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to set the signal.
@@ -7545,7 +8117,8 @@ EAPI const char * edje_edit_program_signal_get(Evas_Object *obj, const char *pro
  */
 EAPI Eina_Bool edje_edit_program_signal_set(Evas_Object *obj, const char *prog, const char *signal);
 
-/** Get in.from of a given program.
+/**
+ * @brief Gets in.from of a given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the delay.
@@ -7554,7 +8127,8 @@ EAPI Eina_Bool edje_edit_program_signal_set(Evas_Object *obj, const char *prog,
  */
 EAPI double edje_edit_program_in_from_get(Evas_Object *obj, const char *prog);
 
-/** Set in.from of a given program.
+/**
+ * @brief Sets in.from of a given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to set the delay.
@@ -7564,7 +8138,8 @@ EAPI double edje_edit_program_in_from_get(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_in_from_set(Evas_Object *obj, const char *prog, double seconds);
 
-/** Get in.range of a given program.
+/**
+ * @brief Gets in.range of a given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get random delay.
@@ -7573,7 +8148,8 @@ EAPI Eina_Bool edje_edit_program_in_from_set(Evas_Object *obj, const char *prog,
  */
 EAPI double edje_edit_program_in_range_get(Evas_Object *obj, const char *prog);
 
-/** Set in.range of a given program.
+/**
+ * @brief Sets in.range of a given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to set random delay.
@@ -7583,17 +8159,19 @@ EAPI double edje_edit_program_in_range_get(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_in_range_set(Evas_Object *obj, const char *prog, double seconds);
 
-/** Get the action of a given program.
+/**
+ * @brief Gets the action of a given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the action.
  *
- * @return The action type, or -1 on errors.
+ * @return The action type, or @c -1 on errors.
  * Action can be one of EDJE_ACTION_TYPE_NONE, _STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, _DRAG_VAL_STEP, _DRAG_VAL_PAGE, _SCRIPT
  */
 EAPI Edje_Action_Type edje_edit_program_action_get(Evas_Object *obj, const char *prog);
 
-/** Set the action of a given program.
+/**
+ * @brief Sets the action of a given program.
  *
  * Action can be one of EDJE_ACTION_TYPE_NONE, _STATE_SET, ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, _DRAG_VAL_STEP, _DRAG_VAL_PAGE, _SCRIPT
  *
@@ -7605,18 +8183,20 @@ EAPI Edje_Action_Type edje_edit_program_action_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_action_set(Evas_Object *obj, const char *prog, Edje_Action_Type action);
 
-/** Get the list of the targets for the given program.
+/**
+ * @brief Gets the list of the targets for the given program.
  *
  * Use edje_edit_string_list_free() when you don't need it anymore.
  *
  * @param obj Object being edited.
- * @param prog The name of the progrem to get the list of the targets.
+ * @param prog The name of the program to get the list of the targets.
  *
  * @return A list with all the targets names, or NULL on error.
  */
 EAPI Eina_List * edje_edit_program_targets_get(Evas_Object *obj, const char *prog);
 
-/** Add a new target program to the list of 'targets' in the given program.
+/**
+ * @brief Adds a new target program to the list of 'targets' in the given program.
  *
  * If program action is @c EDJE_ACTION_TYPE_ACTION_STOP, then 'target'
  * must be an existing program name. If it's @c
@@ -7631,7 +8211,8 @@ EAPI Eina_List * edje_edit_program_targets_get(Evas_Object *obj, const char *pro
  */
 EAPI Eina_Bool edje_edit_program_target_add(Evas_Object *obj, const char *prog, const char *target);
 
-/** Add a new target program to certain place in list of 'targets' in the given program.
+/**
+ * @brief Adds a new target program to certain place in list of 'targets' in the given program.
  *
  * If program action is @c EDJE_ACTION_TYPE_ACTION_STOP, then 'target'
  * must be an existing program name. If it's @c
@@ -7650,7 +8231,8 @@ EAPI Eina_Bool edje_edit_program_target_add(Evas_Object *obj, const char *prog,
 EAPI Eina_Bool
 edje_edit_program_target_insert_at(Evas_Object *obj, const char *prog, const char *target, int place);
 
-/** Deletes a target from the list of 'targets' in the given program.
+/**
+ * @brief Deletes a target from the list of 'targets' in the given program.
  *
  * If program action is EDJE_ACTION_TYPE_ACTION_STOP then 'target' must be an existing program name.
  * If action is EDJE_ACTION_TYPE_STATE_SET then 'target' must be an existing part name.
@@ -7663,27 +8245,30 @@ edje_edit_program_target_insert_at(Evas_Object *obj, const char *prog, const cha
  */
 EAPI Eina_Bool edje_edit_program_target_del(Evas_Object *obj, const char *prog, const char *target);
 
-/** Clear the 'targets' list of the given program
+/**
+ * @brief Clears the 'targets' list of the given program
  *
  * @param obj Object being edited.
- * @param prog The name of the program to cleaar the 'targets' list.
+ * @param prog The name of the program to clear the 'targets' list.
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_targets_clear(Evas_Object *obj, const char *prog);
 
-/** Get the list of action that will be run after the give program
+/**
+ * @brief Gets the list of action that will be run after the give program.
  *
  * Use edje_edit_string_list_free() when you don't need it anymore.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the list of actions
  *
- * @return A list with all program names. or NULL on error.
+ * @return A list with all program names, or NULL on error.
  */
 EAPI Eina_List * edje_edit_program_afters_get(Evas_Object *obj, const char *prog);
 
-/** Add a new program name to the list of 'afters' in the given program.
+/**
+ * @brief Adds a new program name to the list of 'afters' in the given program.
  *
  * All the programs listed in 'afters' will be executed after program execution.
  *
@@ -7695,7 +8280,8 @@ EAPI Eina_List * edje_edit_program_afters_get(Evas_Object *obj, const char *prog
  */
 EAPI Eina_Bool edje_edit_program_after_add(Evas_Object *obj, const char *prog, const char *after);
 
-/** Add a new program name into specific place in list of 'afters' in the given program.
+/**
+ * @brief Adds a new program name into specific place in list of 'afters' in the given program.
  *
  * All the programs listed in 'afters' will be executed after program execution.
  *
@@ -7711,7 +8297,8 @@ EAPI Eina_Bool edje_edit_program_after_add(Evas_Object *obj, const char *prog, c
 EAPI Eina_Bool
 edje_edit_program_after_insert_at(Evas_Object *obj, const char *prog, const char *after, int place);
 
-/** Delete the given program from the list of 'afters' of the program.
+/**
+ * @brief Deletes the given program from the list of 'afters' of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program from where to remove the after.
@@ -7721,7 +8308,8 @@ edje_edit_program_after_insert_at(Evas_Object *obj, const char *prog, const char
  */
 EAPI Eina_Bool edje_edit_program_after_del(Evas_Object *obj, const char *prog, const char *after);
 
-/** Clear the 'afters' list of the given program.
+/**
+ * @brief Clears the 'afters' list of the given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to clear the 'afters' list.
@@ -7730,7 +8318,8 @@ EAPI Eina_Bool edje_edit_program_after_del(Evas_Object *obj, const char *prog, c
  */
 EAPI Eina_Bool edje_edit_program_afters_clear(Evas_Object *obj, const char *prog);
 
-/** Get the state for the given program
+/**
+ * @brief Get the state for the given program.
  *
  * In a STATE_SET action this is the name of state to set.
  * In a SIGNAL_EMIT action is the name of the signal to emit.
@@ -7742,25 +8331,28 @@ EAPI Eina_Bool edje_edit_program_afters_clear(Evas_Object *obj, const char *prog
  */
 EAPI const char * edje_edit_program_state_get(Evas_Object *obj, const char *prog);
 
-/** Get api's name of a program.
+/**
+ * @brief Gets api's name of a program.
  *
  * @param obj Object being edited.
  * @param prog Name of program.
  *
- * @return name of the api if successful, NULL otherwise.
+ * @return Name of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_program_api_name_get(Evas_Object *obj, const char *prog);
 
-/** Get api's description of a program.
+/**
+ * @brief Gets api's description of a program.
  *
  * @param obj Object being edited.
  * @param prog Name of program.
  *
- * @return description of the api if successful, NULL otherwise.
+ * @return Description of the api if successful, NULL otherwise.
  */
 EAPI const char * edje_edit_program_api_description_get(Evas_Object *obj, const char *prog);
 
-/** Set api's name of a program.
+/**
+ * @brief Sets api's name of a program.
  *
  * @param obj Object being edited.
  * @param prog Name of the part.
@@ -7770,7 +8362,8 @@ EAPI const char * edje_edit_program_api_description_get(Evas_Object *obj, const
  */
 EAPI Eina_Bool edje_edit_program_api_name_set(Evas_Object *obj, const char *prog, const char *name);
 
-/** Set api's description of a program.
+/**
+ * @brief Sets api's description of a program.
  *
  * @param obj Object being edited.
  * @param prog Name of the program.
@@ -7780,20 +8373,22 @@ EAPI Eina_Bool edje_edit_program_api_name_set(Evas_Object *obj, const char *prog
  */
 EAPI Eina_Bool edje_edit_program_api_description_set(Evas_Object *obj, const char *prog, const char *description);
 
-/** Set the state for the given program
+/**
+ * @brief Sets the state for the given program.
  *
  * In a STATE_SET action this is the name of state to set.
  * In a SIGNAL_EMIT action is the name of the signal to emit.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to set a state.
- * @param state The nameo of the state to set (not including the state value)
+ * @param state The name of the state to set (not including the state value)
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
  */
 EAPI Eina_Bool edje_edit_program_state_set(Evas_Object *obj, const char *prog, const char *state);
 
-/** Get the value of state for the given program.
+/**
+ * @brief Gets the value of state for the given program.
  *
  * In a STATE_SET action this is the value of state to set.
  * Not used on SIGNAL_EMIT action.
@@ -7805,7 +8400,8 @@ EAPI Eina_Bool edje_edit_program_state_set(Evas_Object *obj, const char *prog, c
  */
 EAPI double edje_edit_program_value_get(Evas_Object *obj, const char *prog);
 
-/** Set the value of state for the given program.
+/**
+ * @brief Sets the value of state for the given program.
  *
  * In a STATE_SET action this is the value of state to set.
  * Not used on SIGNAL_EMIT action.
@@ -7818,7 +8414,8 @@ EAPI double edje_edit_program_value_get(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_value_set(Evas_Object *obj, const char *prog, double value);
 
-/** Get the state2 for the given program
+/**
+ * @brief Gets the state2 for the given program
  *
  * In a STATE_SET action is not used
  * In a SIGNAL_EMIT action is the source of the emitted signal.
@@ -7830,7 +8427,8 @@ EAPI Eina_Bool edje_edit_program_value_set(Evas_Object *obj, const char *prog, d
  */
 EAPI const char * edje_edit_program_state2_get(Evas_Object *obj, const char *prog);
 
-/** Set the state2 for the given program
+/**
+ * @brief Sets the state2 for the given program
  *
  * In a STATE_SET action is not used
  * In a SIGNAL_EMIT action is the source of the emitted signal.
@@ -7843,7 +8441,8 @@ EAPI const char * edje_edit_program_state2_get(Evas_Object *obj, const char *pro
  */
 EAPI Eina_Bool edje_edit_program_state2_set(Evas_Object *obj, const char *prog, const char *state2);
 
-/** Get the value of state2 for the given program.
+/**
+ * @brief Gets the value of state2 for the given program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the state2 value.
@@ -7852,7 +8451,8 @@ EAPI Eina_Bool edje_edit_program_state2_set(Evas_Object *obj, const char *prog,
  */
 EAPI double edje_edit_program_value2_get(Evas_Object *obj, const char *prog);
 
-/** Set the value2 of state for the given program.
+/**
+ * @brief Sets the value2 of state for the given program.
  *
  * This is used in DRAG_ACTION
  *
@@ -7864,7 +8464,8 @@ EAPI double edje_edit_program_value2_get(Evas_Object *obj, const char *prog);
  */
 EAPI Eina_Bool edje_edit_program_value2_set(Evas_Object *obj, const char *prog, double value);
 
-/** Get the type of transition to use when apply animations.
+/**
+ * @brief Gets the type of transition to use when apply animations.
  *
  * Can be one of: EDJE_TWEEN_MODE_NONE, EDJE_TWEEN_MODE_LINEAR, EDJE_TWEEN_MODE_SINUSOIDAL, EDJE_TWEEN_MODE_ACCELERATE or EDJE_TWEEN_MODE_DECELERATE.
  *
@@ -7875,7 +8476,8 @@ EAPI Eina_Bool edje_edit_program_value2_set(Evas_Object *obj, const char *prog,
  */
 EAPI Edje_Tween_Mode edje_edit_program_transition_get(Evas_Object *obj, const char *prog);
 
-/** Set the type of transition to use when apply animations.
+/**
+ * @brief Sets the type of transition to use when apply animations.
  *
  * Can be one of: EDJE_TWEEN_MODE_NONE, EDJE_TWEEN_MODE_LINEAR, EDJE_TWEEN_MODE_SINUSOIDAL, EDJE_TWEEN_MODE_ACCELERATE or EDJE_TWEEN_MODE_DECELERATE.
  *
@@ -7887,17 +8489,19 @@ EAPI Edje_Tween_Mode edje_edit_program_transition_get(Evas_Object *obj, const ch
  */
 EAPI Eina_Bool edje_edit_program_transition_set(Evas_Object *obj, const char *prog, Edje_Tween_Mode transition);
 
-/** Get the interpolation value 1 of the transition.
+/**
+ * @brief Gets the interpolation value 1 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_ACCELERATE_FACTOR, EDJE_TWEEN_MODE_DECELERATE_FACTOR, EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR, EDJE_TWEEN_MODE_DIVISOR_INTERP, EDJE_TWEEN_MODE_BOUNCE or EDJE_TWEEN_MODE_SPRING.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the interpolation value 1.
  *
- * @return interpolation value 1.
+ * @return Interpolation value 1.
  */
 EAPI double edje_edit_program_transition_value1_get(Evas_Object *obj, const char *prog);
 
-/** Set the interpolation value 1 of the transition.
+/**
+ * @brief Sets the interpolation value 1 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_ACCELERATE_FACTOR, EDJE_TWEEN_MODE_DECELERATE_FACTOR, EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR, EDJE_TWEEN_MODE_DIVISOR_INTERP, EDJE_TWEEN_MODE_BOUNCE or EDJE_TWEEN_MODE_SPRING.
  *
  * @param obj Object being edited.
@@ -7908,16 +8512,18 @@ EAPI double edje_edit_program_transition_value1_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_transition_value1_set(Evas_Object *obj, const char *prog, double value);
 
-/** Get the interpolation value 2 of the transition.
+/**
+ * @brief Gets the interpolation value 2 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_DIVISOR_INTERP, EDJE_TWEEN_MODE_BOUNCE or EDJE_TWEEN_MODE_SPRING.
  * @param obj Object being edited.
  * @param prog The name of the program to get the interpolation value 2.
  *
- * @return interpolation value 2.
+ * @return Interpolation value 2.
  */
 EAPI double edje_edit_program_transition_value2_get(Evas_Object *obj, const char *prog);
 
-/** Set the interpolation value 2 of the transition.
+/**
+ * @brief Sets the interpolation value 2 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_DIVISOR_INTERP, EDJE_TWEEN_MODE_BOUNCE or EDJE_TWEEN_MODE_SPRING.
  *
  * @param obj Object being edited.
@@ -7928,17 +8534,19 @@ EAPI double edje_edit_program_transition_value2_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_transition_value2_set(Evas_Object *obj, const char *prog, double value);
 
-/** Get the interpolation value 3 of the transition.
+/**
+ * @brief Gets the interpolation value 3 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_CUBIC_BEZIER.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the interpolation value 3.
  *
- * @return interpolation value 3.
+ * @return Interpolation value 3.
  */
 EAPI double edje_edit_program_transition_value3_get(Evas_Object *obj, const char *prog);
 
-/** Set the interpolation value 3 of the transition.
+/**
+ * @brief Sets the interpolation value 3 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_CUBIC_BEZIER.
  *
  * @param obj Object being edited.
@@ -7949,17 +8557,19 @@ EAPI double edje_edit_program_transition_value3_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_transition_value3_set(Evas_Object *obj, const char *prog, double value);
 
-/** Get the interpolation value 4 of the transition.
+/**
+ * @brief Gets the interpolation value 4 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_CUBIC_BEZIER.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the interpolation value 4.
  *
- * @return interpolation value 4.
+ * @return Interpolation value 4.
  */
 EAPI double edje_edit_program_transition_value4_get(Evas_Object *obj, const char *prog);
 
-/** Set the interpolation value 4 of the transition.
+/**
+ * @brief Sets the interpolation value 4 of the transition.
  *  Can be used with one of transition type: EDJE_TWEEN_MODE_CUBIC_BEZIER.
  *
  * @param obj Object being edited.
@@ -7970,7 +8580,8 @@ EAPI double edje_edit_program_transition_value4_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_transition_value4_set(Evas_Object *obj, const char *prog, double value);
 
-/** Get the duration of the transition in seconds.
+/**
+ * @brief Gets the duration of the transition in seconds.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to get the transition time.
@@ -7979,7 +8590,8 @@ EAPI Eina_Bool edje_edit_program_transition_value4_set(Evas_Object *obj, const c
  */
 EAPI double edje_edit_program_transition_time_get(Evas_Object *obj, const char *prog);
 
-/** Set the duration of the transition in seconds.
+/**
+ * @brief Sets the duration of the transition in seconds.
  *
  * @param obj Object being edited.
  * @param prog The name of the program to set the transition time.
@@ -7989,7 +8601,8 @@ EAPI double edje_edit_program_transition_time_get(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_program_transition_time_set(Evas_Object *obj, const char *prog, double seconds);
 
-/** Get sample name of the program.
+/**
+ * @brief Gets sample name of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -7998,7 +8611,8 @@ EAPI Eina_Bool edje_edit_program_transition_time_set(Evas_Object *obj, const cha
  */
 EAPI const char * edje_edit_program_sample_name_get(Evas_Object *obj, const char *prog);
 
-/** Set sample name of the program.
+/**
+ * @brief Sets sample name of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8008,7 +8622,8 @@ EAPI const char * edje_edit_program_sample_name_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_sample_name_set(Evas_Object *obj, const char *prog, const char *name);
 
-/** Get tone name of the program.
+/**
+ * @brief Gets tone name of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8017,7 +8632,8 @@ EAPI Eina_Bool edje_edit_program_sample_name_set(Evas_Object *obj, const char *p
  */
 EAPI const char * edje_edit_program_tone_name_get(Evas_Object *obj, const char *prog);
 
-/** Set tone name of the program.
+/**
+ * @brief Sets tone name of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8027,16 +8643,18 @@ EAPI const char * edje_edit_program_tone_name_get(Evas_Object *obj, const char *
  */
 EAPI Eina_Bool edje_edit_program_tone_name_set(Evas_Object *obj, const char *prog, const char *name);
 
-/** Get sample speed of the program.
+/**
+ * @brief Gets sample speed of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
  *
- * @return double speed on success, -1 otherwise.
+ * @return Double speed on success, @c -1 otherwise.
  */
 EAPI double edje_edit_program_sample_speed_get(Evas_Object *obj, const char *prog);
 
-/** Set sample speed of the program.
+/**
+ * @brief Sets sample speed of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8046,16 +8664,18 @@ EAPI double edje_edit_program_sample_speed_get(Evas_Object *obj, const char *pro
  */
 EAPI Eina_Bool edje_edit_program_sample_speed_set(Evas_Object *obj, const char *prog, double speed);
 
-/** Get tone duration of the program.
+/**
+ * @brief Gets tone duration of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
  *
- * @return double duration on success, -1 otherwise.
+ * @return Double duration on success, @c -1 otherwise.
  */
 EAPI double edje_edit_program_tone_duration_get(Evas_Object *obj, const char *prog);
 
-/** Set tone duration of the program.
+/**
+ * @brief Sets tone duration of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8065,16 +8685,18 @@ EAPI double edje_edit_program_tone_duration_get(Evas_Object *obj, const char *pr
  */
 EAPI Eina_Bool edje_edit_program_tone_duration_set(Evas_Object *obj, const char *prog, double duration);
 
-/** Get sample channel of the program.
+/**
+ * @brief Gets sample channel of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
  *
- * @return channel on success, 0 otherwise.
+ * @return Channel on success, @c 0 otherwise.
  */
 EAPI unsigned char edje_edit_program_channel_get(Evas_Object *obj, const char *prog);
 
-/** Set sample channel of the program.
+/**
+ * @brief Sets sample channel of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8084,7 +8706,8 @@ EAPI unsigned char edje_edit_program_channel_get(Evas_Object *obj, const char *p
  */
 EAPI Eina_Bool edje_edit_program_channel_set(Evas_Object *obj, const char *prog, Edje_Channel channel);
 
-/** Get filter part name of the program.
+/**
+ * @brief Gets filter part name of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8093,7 +8716,8 @@ EAPI Eina_Bool edje_edit_program_channel_set(Evas_Object *obj, const char *prog,
  */
 EAPI const char * edje_edit_program_filter_part_get(Evas_Object *obj, const char *prog);
 
-/** Set filter part name of the program.
+/**
+ * @brief Sets filter part name of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8103,7 +8727,8 @@ EAPI const char * edje_edit_program_filter_part_get(Evas_Object *obj, const char
  */
 EAPI Eina_Bool edje_edit_program_filter_part_set(Evas_Object *obj, const char *prog, const char *filter_part);
 
-/** Get filter state of the program.
+/**
+ * @brief Gets filter state of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8112,7 +8737,8 @@ EAPI Eina_Bool edje_edit_program_filter_part_set(Evas_Object *obj, const char *p
  */
 EAPI const char * edje_edit_program_filter_state_get(Evas_Object *obj, const char *prog);
 
-/** Set filter state of the program.
+/**
+ * @brief Sets filter state of the program.
  *
  * @param obj Object being edited.
  * @param prog The name of the program.
@@ -8126,12 +8752,13 @@ EAPI Eina_Bool edje_edit_program_filter_state_set(Evas_Object *obj, const char *
 /******************************************************************************/
 /**************************   SCRIPTS API   ***********************************/
 /******************************************************************************/
-/** @name Scripts API
- *  Functions to deal with embryo scripts (see @ref edcref).
+/**
+ * @name Scripts API
+ * Functions to deal with embryo scripts (see @ref edcref).
  */ //@{
 
 /**
- * Get the Embryo script for the group of the given object.
+ * @brief Gets the Embryo script for the group of the given object.
  *
  * Get the shared script for the group under edition. Shared script means
  * the script {} block for the group, not counting what's in each program.
@@ -8146,7 +8773,7 @@ EAPI Eina_Bool edje_edit_program_filter_state_set(Evas_Object *obj, const char *
 EAPI char *edje_edit_script_get(Evas_Object *obj);
 
 /**
- * Set the code for the group script.
+ * @brief Sets the code for the group script.
  *
  * Set the Embryo source code for the shared script of the edited group.
  * Note that changing the code itself will not update the running VM, you
@@ -8160,7 +8787,7 @@ EAPI char *edje_edit_script_get(Evas_Object *obj);
 EAPI Eina_Bool edje_edit_script_set(Evas_Object *obj, const char *code);
 
 /**
- * Get the Embryo script for the given program.
+ * @brief Gets the Embryo script for the given program.
  *
  * Get the script code for the given program. Like the group script, this
  * function returns a duplicate of the code that the user can modify at will
@@ -8176,7 +8803,7 @@ EAPI Eina_Bool edje_edit_script_set(Evas_Object *obj, const char *code);
 EAPI char *edje_edit_script_program_get(Evas_Object *obj, const char *prog);
 
 /**
- * Set the Embryo script for the given program.
+ * @brief Sets the Embryo script for the given program.
  *
  * Set the Embryo source code for the program @p prog. It must be an
  * existing program of type EDJE_ACTION_TYPE_SCRIPT, or the function
@@ -8185,7 +8812,7 @@ EAPI char *edje_edit_script_program_get(Evas_Object *obj, const char *prog);
  * need to call @see edje_edit_script_compile() for it to get updated.
  *
  * @param obj The object being edited
- * @param prog The program name.
+ * @param prog The program name
  * @param code The Embryo source
  *
  * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise.
@@ -8193,7 +8820,7 @@ EAPI char *edje_edit_script_program_get(Evas_Object *obj, const char *prog);
 EAPI Eina_Bool edje_edit_script_program_set(Evas_Object *obj, const char *prog, const char *code);
 
 /**
- * Compile the Embryo script for the given object
+ * @brief Compiles the Embryo script for the given object.
  *
  * If required, this function will process all script code for the group and
  * build the bytecode, updating the running Embryo VM Program if the build
@@ -8206,7 +8833,7 @@ EAPI Eina_Bool edje_edit_script_program_set(Evas_Object *obj, const char *prog,
 EAPI Eina_Bool edje_edit_script_compile(Evas_Object *obj);
 
 /**
- * Get the list of errors resulting from the last script build
+ * @brief Gets the list of errors resulting from the last script build.
  *
  * Get the list of errors that resulted from the last attempt to rebuild
  * the Embryo script for the edited group. This will be a standard Eina_List
@@ -8225,14 +8852,15 @@ EAPI const Eina_List *edje_edit_script_error_list_get(Evas_Object *obj);
 /******************************************************************************/
 /************************   SOURCE CODE API   *********************************/
 /******************************************************************************/
-/** @name Scripts API
- *  Functions to deal with embryo scripts (see @ref edcref).
+/**
+ * @name Scripts API
+ * Functions to deal with embryo scripts (see @ref edcref).
  */ //@{
 
 /**
- * Return source code of the current edje edit object.
+ * @brief Returns source code of the current edje edit object.
  *
- * Remember to free the string with edje_edit_string_free()
+ * Remember to free the string with edje_edit_string_free().
  *
  * This function will return source code of the whole group, loaded previously.
  * This function also will collect all possible resources that is required and
@@ -8247,9 +8875,9 @@ EAPI const Eina_List *edje_edit_script_error_list_get(Evas_Object *obj);
 EAPI const char *edje_edit_source_generate(Evas_Object *obj);
 
 /**
- * Return source code of the current edje edit object.
+ * @brief Returns source code of the current edje edit object.
  *
- * Remember to free the string with edje_edit_string_free()
+ * Remember to free the string with edje_edit_string_free().
  *
  * This function will return source code of the whole group, loaded previously.
  * This function also will collect all possible resources that is required and
@@ -8265,9 +8893,9 @@ EAPI const char *edje_edit_source_generate(Evas_Object *obj);
 
 EAPI const char * edje_edit_object_source_generate(Evas_Object *obj);
 /**
- * Return source code of all collections.
+ * @brief Returns source code of all collections.
  *
- * Remember to free the string with free()
+ * Remember to free the string with free().
  *
  * This function will generate and return source code of all collections and
  * other top level blocks.
@@ -8280,9 +8908,9 @@ EAPI const char * edje_edit_object_source_generate(Evas_Object *obj);
 EAPI char *edje_edit_full_source_generate(Evas_Object *obj);
 
 /**
- * Return source code of global block data.
+ * @brief Returns source code of global block data.
  *
- * Remember to free the string with edje_edit_string_free()
+ * Remember to free the string with edje_edit_string_free().
  *
  * @param obj The object being edited
  *
@@ -8291,9 +8919,9 @@ EAPI char *edje_edit_full_source_generate(Evas_Object *obj);
 EAPI const char * edje_edit_data_source_generate(Evas_Object *obj);
 
 /**
- * Get a list of color clsses which given object use.
+ * @brief Gets a list of color classes which given object use.
  *
- * @paramaram obj The object being edited
+ * @param obj The object being edited
  *
  * @return The color classes list
  */
@@ -8301,10 +8929,10 @@ EAPI Eina_List *
 edje_edit_object_color_class_list_get(Evas_Object *obj);
 
 /**
- * Get the source code for given color classes
+ * @brief Gets the source code for given color classes.
  *
  * @param obj The object being edited
- * @param color_classes The list of color classes for generete code
+ * @param color_classes The list of color classes for generate code
  *
  * @return The color classes source code
  */
@@ -8315,8 +8943,9 @@ edje_edit_color_classes_source_generate(Evas_Object *obj, Eina_List *color_class
 /******************************************************************************/
 /**************************   ERROR API   ***********************************/
 /******************************************************************************/
-/** @name Error API
- *   to deal with error messages (see @ref edcref).
+/**
+ * @name Error API
+ * Functions to deal with error messages (see @ref edcref).
  */ //@{
 
 EAPI extern Eina_Error EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED;
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index f7e234b949..f2f21dba5b 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -1,9 +1,9 @@
 /**
- * @brief Instantiate a new Edje object
+ * @brief Instantiates a new Edje object.
  *
  * @param evas A valid Evas handle, the canvas to place the new object
  * in
- * @return A handle to the new object created or @c NULL, on errors.
+ * @return A handle to the new object created, or @c NULL on errors.
  *
  * This function creates a new Edje smart object, returning its @c
  * Evas_Object handle. An Edje object is useless without a (source)
@@ -37,7 +37,7 @@
  * in-line just after the recalculation has occurred. It is a good idea not
  * to go and delete or alter the object inside this callbacks, simply make
  * a note that the recalculation has taken place and then do something about
- * it outside the callback. to register a callback use code like:
+ * it outside the callback. To register a callback use code like:
  *
  * @code
  *    evas_object_smart_callback_add(edje_obj, "recalc", my_cb, my_cb_data);
@@ -52,7 +52,7 @@
 EAPI Evas_Object *edje_object_add                 (Evas *evas);
 
 /**
- * @brief Remove a signal-triggered callback from an object.
+ * @brief Removes a signal-triggered callback from an object.
  *
  * @param obj A valid Evas_Object handle.
  * @param emission The emission string.
@@ -73,7 +73,7 @@ EAPI Evas_Object *edje_object_add                 (Evas *evas);
 EAPI void        *edje_object_signal_callback_del (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
 
 /**
- * @brief Unregister/delete a callback set for an arriving Edje
+ * @brief Unregisters/deletes a callback set for an arriving Edje
  * signal, emitted by a given Edje object.
  *
  * @param obj A handle to an Edje object
@@ -82,7 +82,7 @@ EAPI void        *edje_object_signal_callback_del (Evas_Object *obj, const char
  * @param func The callback function passed on the callback's
  * registration
  * @param data The pointer given to be passed as data to @p func
- * @return @p data, on success or @c NULL, on errors (or if @p data
+ * @return @p data on success, or @c NULL on errors (or if @p data
  * had this value)
  *
  * This function removes a callback, previously attached to the
@@ -98,7 +98,8 @@ EAPI void        *edje_object_signal_callback_del (Evas_Object *obj, const char
 EAPI void        *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
 
  /**
- * @brief Set the object minimum size.
+ * @deprecated use evas_object_size_hint_min_set() instead.
+ * @brief Sets the object minimum size.
  *
  * @param obj A valid Evas_Object handle
  * @param minw The minimum width
@@ -106,12 +107,12 @@ EAPI void        *edje_object_signal_callback_del_full(Evas_Object *obj, const c
  *
  * This sets the minimum size restriction for the object.
  *
- * @deprecated use evas_object_size_hint_min_set() instead.
  */
 EINA_DEPRECATED EAPI void         edje_extern_object_min_size_set (Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
 
 /**
- * @brief Set the object maximum size.
+ * @deprecated use evas_object_size_hint_max_set() instead.
+ * @brief Sets the object maximum size.
  *
  * @param obj A valid Evas_Object handle
  * @param maxw The maximum width
@@ -119,12 +120,12 @@ EINA_DEPRECATED EAPI void         edje_extern_object_min_size_set (Evas_Object *
  *
  * This sets the maximum size restriction for the object.
  *
- * @deprecated use evas_object_size_hint_max_set() instead.
  */
 EAPI void         edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh);
 
 /**
- * @brief Set the object aspect size.
+ * @deprecated use evas_object_size_hint_aspect_set() instead.
+ * @brief Sets the object aspect size.
  *
  * @param obj A valid Evas_Object handle
  * @param aspect The aspect control axes
@@ -136,7 +137,6 @@ EAPI void         edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord
  * ASPECT and the object may be scaled to be larger or smaller, but
  * retaining the relative scale of both aspect width and height.
  *
- * @deprecated use evas_object_size_hint_aspect_set() instead.
  */
 EAPI void         edje_extern_object_aspect_set   (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah);
 
@@ -144,7 +144,7 @@ EAPI void         edje_extern_object_aspect_set   (Evas_Object *obj, Edje_Aspect
  * @brief Sets the @b EDJ file (and group within it) to load an Edje
  * object's contents from
  *
- * @return @c EINA_TRUE, on success or @c EINA_FALSE, on errors (check
+ * @return @c EINA_TRUE on success, or @c EINA_FALSE on errors (check
  * edje_object_load_error_get() after this call to get errors causes)
  *
  * Edje expects EDJ files, which are theming objects' descriptions and
@@ -174,7 +174,7 @@ Edje object
 EAPI Eina_Bool edje_object_file_set(Edje_Object *obj, const char *file, const char *group);
 
 /**
- * @brief Get the file and group name that a given Edje object is bound to
+ * @brief Gets the file and group name that a given Edje object is bound to.
  *
  * This gets the EDJ file's path, with the respective group set for
  * the given Edje object. If @a obj is either not an Edje file, or has
@@ -196,9 +196,9 @@ EAPI void edje_object_file_get(const Edje_Object *obj, const char **file, const
 
 /**
  * @brief Sets the @b EDJ file (and group within it) to load an Edje
- * object's contents from
+ * object's contents from.
  *
- * @return @c EINA_TRUE, on success or @c EINA_FALSE, on errors (check
+ * @return @c EINA_TRUE on success, or @c EINA_FALSE on errors (check
  * edje_object_load_error_get() after this call to get errors causes)
  *
  * Edje expects EDJ files, which are theming objects' descriptions and
@@ -264,7 +264,7 @@ EAPI Eina_Bool edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, con
 EAPI Eina_Bool edje_object_part_swallow(Edje_Object *obj, const char *part, Evas_Object *obj_swallow);
 
 /**
- * @brief Get the object currently swallowed by a part.
+ * @brief Gets the object currently swallowed by a part.
  *
  * @param[in] part The part name
  *
@@ -275,7 +275,7 @@ EAPI Eina_Bool edje_object_part_swallow(Edje_Object *obj, const char *part, Evas
 EAPI Evas_Object *edje_object_part_swallow_get(const Edje_Object *obj, const char *part);
 
 /**
- * @brief Unswallow an object.
+ * @brief Unswallows an object.
  *
  * Causes the edje to regurgitate a previously swallowed object. :)
  *
@@ -290,7 +290,7 @@ EAPI Evas_Object *edje_object_part_swallow_get(const Edje_Object *obj, const cha
 EAPI void edje_object_part_unswallow(Edje_Object *obj, Evas_Object *obj_swallow);
 
 /**
- * @brief Retrieve a list all accessibility part names
+ * @brief Retrieves a list all accessibility part names
  *
  * @return A list all accessibility part names on obj
  *
@@ -488,7 +488,7 @@ EAPI Eina_Bool edje_object_part_table_unpack(Edje_Object *obj, const char *part,
 EAPI Eina_Bool edje_object_part_table_col_row_size_get(const Edje_Object *obj, const char *part, int *cols, int *rows);
 
 /**
- * @brief Retrieve a child from a table
+ * @brief Retrieves a child from a table
  *
  * @param[in] col The column of the child to get
  * @param[in] row The row of the child to get
diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h
index f2ef50c42a..688e82906b 100644
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@@ -1,7 +1,7 @@
 /**
-   @brief Eet Data Handling Library Public API Calls
+   @brief Eet Data Handling Library Public API Calls.
 
-   These routines are used for Eet Library interaction
+   These routines are used for Eet Library interaction.
 
    @page eet_main Eet
 
@@ -140,12 +140,12 @@ extern "C" {
 
 /**
  * @def EET_VERSION_MAJOR
- * The major number of eet version
+ * The major number of eet version.
  */
 #define EET_VERSION_MAJOR EFL_VERSION_MAJOR
 /**
  * @def EET_VERSION_MINOR
- * The minor number of eet version
+ * The minor number of eet version.
  */
 #define EET_VERSION_MINOR EFL_VERSION_MINOR
 /**
@@ -255,23 +255,24 @@ typedef enum _Eet_Compression
  */
 
 /**
- * Initialize the EET library.
+ * @ingroup Eet_Group
+ * @brief Initializes the EET library.
  *
  * The first time this function is called, it will perform all the internal
  * initialization required for the library to function properly and increment
  * the initialization counter. Any subsequent call only increment this counter
  * and return its new value, so it's safe to call this function more than once.
  *
- * @return The new init count. Will be 0 if initialization failed.
+ * @return The new init count. Will be @c 0 if initialization failed.
  *
  * @since 1.0.0
- * @ingroup Eet_Group
  */
 EAPI int
 eet_init(void);
 
 /**
- * Shut down the EET library.
+ * @ingroup Eet_Group
+ * @brief Shuts down the EET library.
  *
  * If eet_init() was called more than once for the running application,
  * eet_shutdown() will decrement the initialization counter and return its
@@ -281,13 +282,13 @@ eet_init(void);
  * @return The new init count.
  *
  * @since 1.0.0
- * @ingroup Eet_Group
  */
 EAPI int
 eet_shutdown(void);
 
 /**
- * Clear eet cache
+ * @ingroup Eet_Group
+ * @Clears eet cache.
  *
  * For a faster access to previously accessed data, Eet keeps an internal
  * cache of files. These files will be freed automatically only when
@@ -300,7 +301,6 @@ eet_shutdown(void);
  * will be written down to disk before flushing them from memory.
  *
  * @since 1.0.0
- * @ingroup Eet_Group
  */
 EAPI void
 eet_clearcache(void);
@@ -312,7 +312,7 @@ eet_clearcache(void);
  * Functions to create, destroy and do basic manipulation of
  * #Eet_File handles.
  *
- * This sections explains how to use the most basic Eet functions, which
+ * This section explains how to use the most basic Eet functions, which
  * are used to work with eet files, read data from them, store it back in or
  * take a look at what entries it contains, without making use of the
  * serialization capabilities explained in @ref Eet_Data_Group.
@@ -549,12 +549,12 @@ struct _Eet_Entry
  */
 
 /**
- * Open an eet file on disk, and returns a handle to it.
+ * @ingroup Eet_File_Group
+ * @brief Opens an eet file on disk, and returns a handle to it.
  * @param file The file path to the eet file. eg: @c "/tmp/file.eet".
  * @param mode The mode for opening. Either #EET_FILE_MODE_READ,
  *        #EET_FILE_MODE_WRITE or #EET_FILE_MODE_READ_WRITE.
  * @return An opened eet file handle.
- * @ingroup Eet_File_Group
  *
  * This function will open an exiting eet file for reading, and build
  * the directory table in memory and return a handle to the file, if it
@@ -592,10 +592,10 @@ eet_open(const char *file,
          Eet_File_Mode mode);
 
 /**
- * Open an eet file on disk from an Eina_File handle, and returns a handle to it.
+ * @ingroup Eet_File_Group
+ * @brief Opens an eet file on disk from an Eina_File handle, and returns a handle to it.
  * @param file The Eina_File handle to map to an eet file.
  * @return An opened eet file handle.
- * @ingroup Eet_File_Group
  *
  * This function will open an exiting eet file for reading, and build
  * the directory table in memory and return a handle to the file, if it
@@ -617,7 +617,8 @@ EAPI Eet_File *
 eet_mmap(const Eina_File *file);
 
 /**
- * Open an eet file directly from a memory location. The data is not copied,
+ * @ingroup Eet_File_Group
+ * Opens an eet file directly from a memory location. The data is not copied,
  * so you must keep it around as long as the eet file is open. There is
  * currently no cache for this kind of Eet_File, so it's reopened every time
  * you use eet_memopen_read.
@@ -628,25 +629,25 @@ eet_mmap(const Eina_File *file);
  * Files opened this way will always be in read-only mode.
  *
  * @since 1.1.0
- * @ingroup Eet_File_Group
  */
 EAPI Eet_File *
 eet_memopen_read(const void *data,
                  size_t size);
 
 /**
- * Get the mode an Eet_File was opened with.
+ * @ingroup Eet_File_Group
+ * @brief Gets the mode an Eet_File was opened with.
  * @param ef A valid eet file handle.
  * @return The mode ef was opened with.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI Eet_File_Mode
 eet_mode_get(Eet_File *ef);
 
 /**
- * Close an eet file handle and flush pending writes.
+ * @ingroup Eet_File_Group
+ * @brief Closes an eet file handle and flush pending writes.
  * @param ef A valid eet file handle.
  * @return An eet error identifier.
  *
@@ -659,7 +660,6 @@ eet_mode_get(Eet_File *ef);
  * If the eet file handle is not valid nothing will be done.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  * 
  * @see eet_clearcache()
  */
@@ -667,7 +667,8 @@ EAPI Eet_Error
 eet_close(Eet_File *ef);
 
 /**
- * Sync content of an eet file handle, flushing pending writes.
+ * @ingroup Eet_File_Group
+ * @brief Syncs content of an eet file handle, flushing pending writes.
  * @param ef A valid eet file handle.
  * @return An eet error identifier.
  *
@@ -677,13 +678,13 @@ eet_close(Eet_File *ef);
  * If the eet file handle is not valid nothing will be done.
  *
  * @since 1.2.4
- * @ingroup Eet_File_Group
  */
 EAPI Eet_Error
 eet_sync(Eet_File *ef);
 
 /**
- * Return a handle to the shared string dictionary of the Eet file
+ * @ingroup Eet_File_Group
+ * @brief Returns a handle to the shared string dictionary of the Eet file
  * @param ef A valid eet file handle.
  * @return A handle to the dictionary of the file
  *
@@ -696,42 +697,42 @@ eet_sync(Eet_File *ef);
  *      the #Eet_Data_Descriptor_Class instructions.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI Eet_Dictionary *
 eet_dictionary_get(Eet_File *ef);
 
 /**
- * Check if a given string comes from a given dictionary
+ * @ingroup Eet_File_Group
+ * @brief Checks if a given string comes from a given dictionary
  * @param ed A valid dictionary handle
  * @param string A valid 0 byte terminated C string
- * @return 1 if it is in the dictionary, 0 otherwise
+ * @return @c 1 if it is in the dictionary, @c 0 otherwise
  *
  * This checks the given dictionary to see if the given string is actually
- * inside that dictionary (i.e. comes from it) and returns 1 if it does.
+ * inside that dictionary (i.e. comes from it) and returns @c 1 if it does.
  * If the dictionary handle is invalid, the string is NULL or the string is
- * not in the dictionary, 0 is returned.
+ * not in the dictionary, @c 0 is returned.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI int
 eet_dictionary_string_check(Eet_Dictionary *ed,
                             const char *string);
 
 /**
- * Return the number of strings inside a dictionary
+ * @ingroup Eet_File_Group
+ * @brief Returns the number of strings inside a dictionary.
  * @param ed A valid dictionary handle
  * @return the number of strings inside a dictionary
  *
  * @since 1.6.0
- * @ingroup Eet_File_Group
  */
 EAPI int
 eet_dictionary_count(const Eet_Dictionary *ed);
 
 /**
- * Read a specified entry from an eet file and return data
+ * @ingroup Eet_File_Group
+ * @brief Reads a specified entry from an eet file and return data.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param size_ret Number of bytes read from entry and returned.
@@ -745,12 +746,11 @@ eet_dictionary_count(const Eet_Dictionary *ed);
  * placed in size_ret.
  *
  * If the eet file handle is not valid NULL is returned and size_ret is
- * filled with 0.
+ * filled with @c 0.
  *
  * @see eet_read_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI void *
 eet_read(Eet_File *ef,
@@ -758,7 +758,8 @@ eet_read(Eet_File *ef,
          int *size_ret);
 
 /**
- * Read a specified entry from an eet file and return data
+ * @ingroup Eet_File_Group
+ * @brief Reads a specified entry from an eet file and return data.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param size_ret Number of bytes read from entry and returned.
@@ -772,10 +773,9 @@ eet_read(Eet_File *ef,
  * data chunk are placed in size_ret.
  *
  * If the eet file handle is not valid NULL is returned and size_ret is
- * filled with 0.
+ * filled with @c 0.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI const void *
 eet_read_direct(Eet_File *ef,
@@ -783,7 +783,8 @@ eet_read_direct(Eet_File *ef,
                 int *size_ret);
 
 /**
- * Write a specified entry to an eet file handle
+ * @ingroup Eet_File_Group
+ * @brief Write a specified entry to an eet file handle.
  * @param ef A valid eet file handle opened for writing.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param data Pointer to the data to be stored.
@@ -808,7 +809,6 @@ eet_read_direct(Eet_File *ef,
  * @see eet_write_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI int
 eet_write(Eet_File *ef,
@@ -818,7 +818,8 @@ eet_write(Eet_File *ef,
           int compress);
 
 /**
- * Delete a specified entry from an Eet file being written or re-written
+ * @ingroup Eet_File_Group
+ * @brief Deletes a specified entry from an Eet file being written or re-written.
  * @param ef A valid eet file handle opened for writing.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @return Success or failure of the delete.
@@ -833,14 +834,14 @@ eet_write(Eet_File *ef,
  * Name, must not be NULL, otherwise 0 will be returned.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI int
 eet_delete(Eet_File *ef,
            const char *name);
 
 /**
- * Alias a specific section to another one. Destination may exist or not,
+ * @ingroup Eet_File_Group
+ * @brief Alias a specific section to another one. Destination may exist or not,
  * no checks are done.
  * @param ef A valid eet file handle opened for writing.
  * @param name Name of the new entry. eg: "/base/file_i_want".
@@ -852,7 +853,6 @@ eet_delete(Eet_File *ef,
  * The equivalent of this would be calling 'ln -s destination name'
  *
  * @since 1.3.3
- * @ingroup Eet_File_Group
  */
 EAPI Eina_Bool
 eet_alias(Eet_File *ef,
@@ -861,20 +861,21 @@ eet_alias(Eet_File *ef,
           int compress);
 
 /**
- * Retrieve the filename of an Eet_File
+ * @ingroup Eet_File_Group
+ * @brief Retrieves the filename of an Eet_File.
  * @param ef A valid eet file handle opened for writing.
  * @return The stringshared file string opened with eet_open(), or NULL on error
  *
  * @note This function will return NULL for files opened with eet_memopen_read()
  *
  * @since 1.6
- * @ingroup Eet_File_Group
  */
 EAPI const char *
 eet_file_get(Eet_File *ef);
 
 /**
- * Retrieve the destination name of an alias
+ * @ingroup Eet_File_Group
+ * @brief Retrieves the destination name of an alias.
  * @param ef A valid eet file handle opened for writing
  * @param name Name of the entry. eg: "/base/file_i_want"
  * @return Destination of the alias. eg: "/base/the_real_stuff_i_want", NULL on failure
@@ -882,14 +883,14 @@ eet_file_get(Eet_File *ef);
  * Name must not be NULL, otherwise NULL will be returned.
  *
  * @since 1.5
- * @ingroup Eet_File_Group
  */
 EAPI const char *
 eet_alias_get(Eet_File *ef,
               const char *name);
 
 /**
- * List all entries in eet file matching shell glob.
+ * @ingroup Eet_File_Group
+ * @brief Lists all entries in eet file matching shell glob.
  * @param ef A valid eet file handle.
  * @param glob A shell glob to match against.
  * @param count_ret Number of entries found to match.
@@ -900,7 +901,7 @@ eet_alias_get(Eet_File *ef,
  * there are any, and if no memory errors occur.
  *
  * The eet file handle must be valid and glob must not be NULL, or NULL
- * will be returned and count_ret will be filled with 0.
+ * will be returned and count_ret will be filled with @c 0.
  *
  * The calling program must call free() on the array returned, but NOT
  * on the string pointers in the array. They are taken as read-only
@@ -908,7 +909,7 @@ eet_alias_get(Eet_File *ef,
  * the file handle is not closed. When it is closed those pointers in the
  * array are now not valid and should not be used.
  *
- * On success the array returned will have a list of string pointers
+ * On success, the array returned will have a list of string pointers
  * that are the names of the entries that matched, and count_ret will have
  * the number of entries in this array placed in it.
  *
@@ -916,7 +917,6 @@ eet_alias_get(Eet_File *ef,
  * value of "*".
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI char **
 eet_list(Eet_File *ef,
@@ -924,41 +924,42 @@ eet_list(Eet_File *ef,
          int *count_ret);
 
 /**
- * Return an iterator that will describe each entry of an Eet_File.
+ * @ingroup Eet_File_Group
+ * @brief Returns an iterator that will describe each entry of an Eet_File.
  * @param ef A valid eet file handle.
  * @return An interator of Eet_Entry.
  *
  * @since 1.8.0
- * @ingroup Eet_File_Group
  */
 
 EAPI Eina_Iterator *eet_list_entries(Eet_File *ef);
 
 /**
- * Return the number of entries in the specified eet file.
+ * @ingroup Eet_File_Group
+ * @brief Returns the number of entries in the specified eet file.
  * @param ef A valid eet file handle.
- * @return Number of entries in ef or -1 if the number of entries
+ * @return Number of entries in ef or @c -1 if the number of entries
  *         cannot be read due to open mode restrictions.
  *
  * @since 1.0.0
- * @ingroup Eet_File_Group
  */
 EAPI int
 eet_num_entries(Eet_File *ef);
 
 /**
  * @defgroup Eet_File_Cipher_Group Eet File Ciphered Main Functions
+ * @ingroup Eet_File_Group
  *
  * Most of the @ref Eet_File_Group have alternative versions that
  * accounts for ciphers to protect their content.
  *
  * @see @ref Eet_Cipher_Group
  *
- * @ingroup Eet_File_Group
  */
 
 /**
- * Read a specified entry from an eet file and return data using a cipher.
+ * @ingroup Eet_File_Cipher_Group
+ * @brif Reads a specified entry from an eet file and return data using a cipher.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param size_ret Number of bytes read from entry and returned.
@@ -973,12 +974,11 @@ eet_num_entries(Eet_File *ef);
  * placed in size_ret.
  *
  * If the eet file handle is not valid NULL is returned and size_ret is
- * filled with 0.
+ * filled with @c 0.
  *
  * @see eet_read()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Cipher_Group
  */
 EAPI void *
 eet_read_cipher(Eet_File *ef,
@@ -987,20 +987,21 @@ eet_read_cipher(Eet_File *ef,
                 const char *cipher_key);
 
 /**
- * Write a specified entry to an eet file handle using a cipher.
+ * @ingroup Eet_File_Cipher_Group
+ * @brief Writes a specified entry to an eet file handle using a cipher.
  * @param ef A valid eet file handle opened for writing.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param data Pointer to the data to be stored.
  * @param size Length in bytes in the data to be stored.
  * @param compress Compression flags (1 == compress, 0 = don't compress).
  * @param cipher_key The key to use as cipher.
- * @return bytes written on successful write, 0 on failure.
+ * @return Bytes written on successful write, @c 0 on failure.
  *
  * This function will write the specified chunk of data to the eet file
- * and return greater than 0 on success. 0 will be returned on failure.
+ * and return greater than @c 0 on success. 0 will be returned on failure.
  *
  * The eet file handle must be a valid file handle for an eet file opened
- * for writing. If it is not, 0 will be returned and no action will be
+ * for writing. If it is not, @c 0 will be returned and no action will be
  * performed.
  *
  * Name, and data must not be NULL, and size must be > 0. If these
@@ -1013,7 +1014,6 @@ eet_read_cipher(Eet_File *ef,
  * @see eet_write()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Cipher_Group
  */
 EAPI int
 eet_write_cipher(Eet_File *ef,
@@ -1049,7 +1049,8 @@ eet_write_cipher(Eet_File *ef,
  */
 
 /**
- * Read just the header data for an image and dont decode the pixels.
+ * @ingroup Eet_File_Image_Group
+ * @brief Reads just the header data for an image and dont decode the pixels.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param w A pointer to the unsigned int to hold the width in pixels.
@@ -1058,7 +1059,7 @@ eet_write_cipher(Eet_File *ef,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on successful decode, 0 otherwise
+ * @return @c 1 on successful decode, @c 0 otherwise
  *
  * Reads and decodes the image header data stored under the given key and
  * Eet file.
@@ -1077,7 +1078,6 @@ eet_write_cipher(Eet_File *ef,
  * @see eet_data_image_header_read_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI int
 eet_data_image_header_read(Eet_File *ef,
@@ -1090,7 +1090,8 @@ eet_data_image_header_read(Eet_File *ef,
                            Eet_Image_Encoding *lossy);
 
 /**
- * Read image data from the named key in the eet file.
+ * @ingroup Eet_File_Image_Group
+ * @brief Reads image data from the named key in the eet file.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param w A pointer to the unsigned int to hold the width in pixels.
@@ -1122,7 +1123,6 @@ eet_data_image_header_read(Eet_File *ef,
  * @see eet_data_image_read_to_surface()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI void *
 eet_data_image_read(Eet_File *ef,
@@ -1135,7 +1135,8 @@ eet_data_image_read(Eet_File *ef,
                     Eet_Image_Encoding *lossy);
 
 /**
- * Read image data from the named key in the eet file and store it in the given buffer.
+ * @ingroup Eet_File_Image_Group
+ * @brief Reads image data from the named key in the eet file and store it in the given buffer.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param src_x The starting x coordinate from where to dump the stream.
@@ -1148,7 +1149,7 @@ eet_data_image_read(Eet_File *ef,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 otherwise.
+ * @return @c 1 on success, @c 0 otherwise.
  *
  * Reads and decodes the image stored in the given Eet file, placing the
  * resulting pixel data in the buffer pointed by the user.
@@ -1180,7 +1181,6 @@ eet_data_image_read(Eet_File *ef,
  * @see eet_data_image_decode_to_cspace_surface_cipher()
  *
  * @since 1.0.2
- * @ingroup Eet_File_Image_Group
  */
 EAPI int
 eet_data_image_read_to_surface(Eet_File *ef,
@@ -1197,7 +1197,8 @@ eet_data_image_read_to_surface(Eet_File *ef,
                                Eet_Image_Encoding *lossy);
 
 /**
- * Write image data to the named key in an eet file.
+ * @ingroup Eet_File_Image_Group
+ * @brief Writes image data to the named key in an eet file.
  * @param ef A valid eet file handle opened for writing.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param data A pointer to the image pixel data.
@@ -1231,7 +1232,6 @@ eet_data_image_read_to_surface(Eet_File *ef,
  * @see eet_data_image_write_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI int
 eet_data_image_write(Eet_File *ef,
@@ -1245,7 +1245,8 @@ eet_data_image_write(Eet_File *ef,
                      Eet_Image_Encoding lossy);
 
 /**
- * Decode Image data header only to get information.
+ * @ingroup Eet_File_Image_Group
+ * @brief Decodes Image data header only to get information.
  * @param data The encoded pixel data.
  * @param size The size, in bytes, of the encoded pixel data.
  * @param w A pointer to the unsigned int to hold the width in pixels.
@@ -1254,20 +1255,19 @@ eet_data_image_write(Eet_File *ef,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 on failure.
+ * @return @c 1 on success, @c 0 on failure.
  *
  * This function works exactly like eet_data_image_header_read(), but instead
  * of reading from an Eet file, it takes the buffer of size @p size pointed
  * by @p data, which must be a valid Eet encoded image.
  *
- * On success the function returns 1 indicating the header was read and
- * decoded properly, or 0 on failure.
+ * On success the function returns @c 1 indicating the header was read and
+ * decoded properly, or @c 0 on failure.
  *
  * @see eet_data_image_header_read()
  * @see eet_data_image_header_decode_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI int
 eet_data_image_header_decode(const void *data,
@@ -1280,7 +1280,8 @@ eet_data_image_header_decode(const void *data,
                              Eet_Image_Encoding *lossy);
 
 /**
- * Decode Image data into pixel data.
+ * @ingroup Eet_File_Image_Group
+ * @brief Decodes Image data into pixel data.
  * @param data The encoded pixel data.
  * @param size The size, in bytes, of the encoded pixel data.
  * @param w A pointer to the unsigned int to hold the width in pixels.
@@ -1307,7 +1308,6 @@ eet_data_image_header_decode(const void *data,
  * @see eet_data_image_decode_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI void *
 eet_data_image_decode(const void *data,
@@ -1320,7 +1320,8 @@ eet_data_image_decode(const void *data,
                       Eet_Image_Encoding *lossy);
 
 /**
- * Decode Image data into pixel data and stores in the given buffer.
+ * @ingroup Eet_File_Image_Group
+ * @brief Decodes Image data into pixel data and stores in the given buffer.
  * @param data The encoded pixel data.
  * @param size The size, in bytes, of the encoded pixel data.
  * @param src_x The starting x coordinate from where to dump the stream.
@@ -1333,7 +1334,7 @@ eet_data_image_decode(const void *data,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 otherwise.
+ * @return @c 1 on success, @c 0 otherwise.
  *
  * Like eet_data_image_read_to_surface(), but reading the given @p data buffer
  * instead of a file.
@@ -1345,7 +1346,6 @@ eet_data_image_decode(const void *data,
  * @see eet_data_image_decode_to_surface_cipher()
  *
  * @since 1.0.2
- * @ingroup Eet_File_Image_Group
  */
 EAPI int
 eet_data_image_decode_to_surface(const void *data,
@@ -1362,7 +1362,8 @@ eet_data_image_decode_to_surface(const void *data,
                                  Eet_Image_Encoding *lossy);
 
 /**
- * Encode image data for storage or transmission.
+ * @ingroup Eet_File_Image_Group
+ * @brief Encodes image data for storage or transmission.
  * @param data A pointer to the image pixel data.
  * @param size_ret A pointer to an int to hold the size of the returned data.
  * @param w The width of the image in pixels.
@@ -1389,7 +1390,6 @@ eet_data_image_decode_to_surface(const void *data,
  * @see eet_data_image_encode_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI void *
 eet_data_image_encode(const void *data,
@@ -1403,17 +1403,18 @@ eet_data_image_encode(const void *data,
 
 /**
  * @defgroup Eet_File_Image_Cipher_Group Image Store and Load using a Cipher
+ * @ingroup Eet_File_Image_Group
  *
  * Most of the @ref Eet_File_Image_Group have alternative versions
  * that accounts for ciphers to protect their content.
  *
  * @see @ref Eet_Cipher_Group
  *
- * @ingroup Eet_File_Image_Group
  */
 
 /**
- * Read just the header data for an image and dont decode the pixels using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Reads just the header data for an image and dont decode the pixels using a cipher.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param cipher_key The key to use as cipher.
@@ -1423,7 +1424,7 @@ eet_data_image_encode(const void *data,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on successful decode, 0 otherwise
+ * @return @c 1 on successful decode, @c 0 otherwise
  *
  * This function reads an image from an eet file stored under the named
  * key in the eet file and return a pointer to the decompressed pixel data.
@@ -1441,13 +1442,12 @@ eet_data_image_encode(const void *data,
  * the image file (0 - 100). The lossy flags is either 0 or 1 as to if
  * the image was encoded lossily or not.
  *
- * On success the function returns 1 indicating the header was read and
- * decoded properly, or 0 on failure.
+ * On success the function returns @c 1 indicating the header was read and
+ * decoded properly, or @c 0 on failure.
  *
  * @see eet_data_image_header_read()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI int
 eet_data_image_header_read_cipher(Eet_File *ef,
@@ -1461,7 +1461,8 @@ eet_data_image_header_read_cipher(Eet_File *ef,
                                   Eet_Image_Encoding *lossy);
 
 /**
- * Get the colorspace Eet can decode into of a given eet image ressource
+ * @ingroup Eet_File_Image_Group
+ * @brief Gets the colorspace Eet can decode into of a given eet image ressource.
  *
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
@@ -1470,7 +1471,6 @@ eet_data_image_header_read_cipher(Eet_File *ef,
  * @return 1 on successful get, 0 otherwise.
  *
  * @since 1.10.0
- * @ingroup Eet_File_Image_Group
  */
 EAPI int
 eet_data_image_colorspace_get(Eet_File *ef,
@@ -1479,7 +1479,8 @@ eet_data_image_colorspace_get(Eet_File *ef,
                               const Eet_Colorspace **cspaces);
 
 /**
- * Read image data from the named key in the eet file using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Reads image data from the named key in the eet file using a cipher.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param cipher_key The key to use as cipher.
@@ -1515,7 +1516,6 @@ eet_data_image_colorspace_get(Eet_File *ef,
  * @see eet_data_image_read()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI void *
 eet_data_image_read_cipher(Eet_File *ef,
@@ -1529,7 +1529,8 @@ eet_data_image_read_cipher(Eet_File *ef,
                            Eet_Image_Encoding *lossy);
 
 /**
- * Read image data from the named key in the eet file using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Reads image data from the named key in the eet file using a cipher.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param cipher_key The key to use as cipher.
@@ -1543,7 +1544,7 @@ eet_data_image_read_cipher(Eet_File *ef,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 otherwise.
+ * @return @c 1 on success, @c 0 otherwise.
  *
  * This function reads an image from an eet file stored under the named
  * key in the eet file and store the decompressed pixel data in the provided
@@ -1569,7 +1570,6 @@ eet_data_image_read_cipher(Eet_File *ef,
  * @see eet_data_image_decode_to_cspace_surface_cipher()
  *
  * @since 1.0.2
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI int
 eet_data_image_read_to_surface_cipher(Eet_File *ef,
@@ -1588,7 +1588,8 @@ eet_data_image_read_to_surface_cipher(Eet_File *ef,
 
 
 /**
- * Read image data from the named key in the eet file using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Reads image data from the named key in the eet file using a cipher.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param cipher_key The key to use as cipher.
@@ -1603,7 +1604,7 @@ eet_data_image_read_to_surface_cipher(Eet_File *ef,
  * @param comp A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 otherwise.
+ * @return @c 1 on success, @c 0 otherwise.
  *
  * This function reads an image from an eet file stored under the named
  * key in the eet file and store the decompressed pixel data in the provided
@@ -1630,7 +1631,6 @@ eet_data_image_read_to_surface_cipher(Eet_File *ef,
  * @see eet_data_image_read_to_surface_cipher()
  *
  * @since 1.10.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI int
 eet_data_image_read_to_cspace_surface_cipher(Eet_File     *ef,
@@ -1650,7 +1650,8 @@ eet_data_image_read_to_cspace_surface_cipher(Eet_File     *ef,
 
 
 /**
- * Read image data from the named key in the eet file using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Reads image data from the named key in the eet file using a cipher.
  * @param ef A valid eet file handle opened for reading.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param cipher_key The key to use as cipher.
@@ -1665,7 +1666,7 @@ eet_data_image_read_to_cspace_surface_cipher(Eet_File     *ef,
  * @param comp A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 otherwise.
+ * @return @c 1 on success, @c 0 otherwise.
  *
  * This function reads an image from an eet file stored under the named
  * key in the eet file and store the decompressed pixels in the specified
@@ -1691,7 +1692,6 @@ eet_data_image_read_to_cspace_surface_cipher(Eet_File     *ef,
  * @see eet_data_image_read_to_surface_cipher()
  *
  * @since 1.10.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 
 EAPI int
@@ -1711,7 +1711,8 @@ eet_data_image_decode_to_cspace_surface_cipher(const void   *data,
                                                Eet_Image_Encoding *lossy);
 
 /**
- * Write image data to the named key in an eet file using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Writes image data to the named key in an eet file using a cipher.
  * @param ef A valid eet file handle opened for writing.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param cipher_key The key to use as cipher.
@@ -1744,7 +1745,6 @@ eet_data_image_decode_to_cspace_surface_cipher(const void   *data,
  * @see eet_data_image_write()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI int
 eet_data_image_write_cipher(Eet_File *ef,
@@ -1759,7 +1759,8 @@ eet_data_image_write_cipher(Eet_File *ef,
                             Eet_Image_Encoding lossy);
 
 /**
- * Decode Image data header only to get information using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Decodes Image data header only to get information using a cipher.
  * @param data The encoded pixel data.
  * @param cipher_key The key to use as cipher.
  * @param size The size, in bytes, of the encoded pixel data.
@@ -1769,7 +1770,7 @@ eet_data_image_write_cipher(Eet_File *ef,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 on failure.
+ * @return @c 1 on success, @c 0 on failure.
  *
  * This function takes encoded pixel data and decodes it into raw RGBA
  * pixels on success.
@@ -1793,7 +1794,6 @@ eet_data_image_write_cipher(Eet_File *ef,
  * @see eet_data_image_header_decode()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI int
 eet_data_image_header_decode_cipher(const void *data,
@@ -1807,7 +1807,8 @@ eet_data_image_header_decode_cipher(const void *data,
                                     Eet_Image_Encoding *lossy);
 
 /**
- * Decode Image data into pixel data using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Decodes Image data into pixel data using a cipher.
  * @param data The encoded pixel data.
  * @param cipher_key The key to use as cipher.
  * @param size The size, in bytes, of the encoded pixel data.
@@ -1843,7 +1844,6 @@ eet_data_image_header_decode_cipher(const void *data,
  * @see eet_data_image_decode()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI void *
 eet_data_image_decode_cipher(const void *data,
@@ -1857,7 +1857,8 @@ eet_data_image_decode_cipher(const void *data,
                              Eet_Image_Encoding *lossy);
 
 /**
- * Decode Image data into pixel data using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Decodes Image data into pixel data using a cipher.
  * @param data The encoded pixel data.
  * @param cipher_key The key to use as cipher.
  * @param size The size, in bytes, of the encoded pixel data.
@@ -1871,7 +1872,7 @@ eet_data_image_decode_cipher(const void *data,
  * @param compress A pointer to the int to hold the compression amount.
  * @param quality A pointer to the int to hold the quality amount.
  * @param lossy A pointer to the int to hold the lossiness flag.
- * @return 1 on success, 0 otherwise.
+ * @return @c 1 on success, @c 0 otherwise.
  *
  * This function takes encoded pixel data and decodes it into raw RGBA
  * pixels on success.
@@ -1895,7 +1896,6 @@ eet_data_image_decode_cipher(const void *data,
  * @see eet_data_image_decode_to_surface()
  *
  * @since 1.0.2
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI int
 eet_data_image_decode_to_surface_cipher(const void *data,
@@ -1913,7 +1913,8 @@ eet_data_image_decode_to_surface_cipher(const void *data,
                                         Eet_Image_Encoding *lossy);
 
 /**
- * Encode image data for storage or transmission using a cipher.
+ * @ingroup Eet_File_Image_Cipher_Group
+ * @brief Encodes image data for storage or transmission using a cipher.
  * @param data A pointer to the image pixel data.
  * @param cipher_key The key to use as cipher.
  * @param size_ret A pointer to an int to hold the size of the returned data.
@@ -1945,7 +1946,6 @@ eet_data_image_decode_to_surface_cipher(const void *data,
  * @see eet_data_image_encode()
  *
  * @since 1.0.0
- * @ingroup Eet_File_Image_Cipher_Group
  */
 EAPI void *
 eet_data_image_encode_cipher(const void *data,
@@ -1984,21 +1984,22 @@ typedef struct _Eet_Key Eet_Key;
  */
 
 /**
- * Callback used to request if needed the password of a private key.
+ * @ingroup Eet_Cipher_Group
+ * @brief Callback used to request if needed the password of a private key.
  *
  * @param buffer the buffer where to store the password.
  * @param size the maximum password size (size of buffer, including '@\0').
  * @param rwflag if the buffer is also readable or just writable.
  * @param data currently unused, may contain some context in future.
- * @return 1 on success and password was set to @p buffer, 0 on failure.
+ * @return @c 1 on success and password was set to @p buffer, @c 0 on failure.
  *
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 typedef int (*Eet_Key_Password_Callback)(char *buffer, int size, int rwflag, void *data);
 
 /**
- * Create an Eet_Key needed for signing an eet file.
+ * @ingroup Eet_Cipher_Group
+ * @brief Creates an Eet_Key needed for signing an eet file.
  *
  * The certificate should provide the public that match the private key.
  * No verification is done to ensure that.
@@ -2013,7 +2014,6 @@ typedef int (*Eet_Key_Password_Callback)(char *buffer, int size, int rwflag, voi
  *
  * @warning You need to compile signature support in EET.
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI Eet_Key *
 eet_identity_open(const char *certificate_file,
@@ -2021,20 +2021,21 @@ eet_identity_open(const char *certificate_file,
                   Eet_Key_Password_Callback cb);
 
 /**
- * Close and release all resource used by an Eet_Key.  An
- * reference counter prevent it from being freed until all file
+ * @ingroup Eet_Cipher_Group
+ * @brief Close and release all resource used by an Eet_Key. 
+ * A reference counter prevent it from being freed until all file
  * using it are also closed.
  *
  * @param key the key handle to close and free resources.
  *
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI void
 eet_identity_close(Eet_Key *key);
 
 /**
- * Set a key to sign a file
+ * @ingroup Eet_Cipher_Group
+ * @breif Sets a key to sign a file.
  *
  * @param ef the file to set the identity.
  * @param key the key handle to set as identity.
@@ -2042,32 +2043,32 @@ eet_identity_close(Eet_Key *key);
  *         #EET_ERROR_NONE on success.
  *
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI Eet_Error
 eet_identity_set(Eet_File *ef,
                  Eet_Key *key);
 
 /**
- * Display both private and public key of an Eet_Key.
+ * @ingroup Eet_Cipher_Group
+ * @brief Displays both private and public key of an Eet_Key.
  *
  * @param key the handle to print.
  * @param out where to print.
  *
  * @warning You need to compile signature support in EET.
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI void
 eet_identity_print(Eet_Key *key,
                    FILE *out);
 
 /**
- * Compare the identify certificate of an eet file against a stored one
+ * @ingroup Eet_Cipher_Group
+ * @brief Compares the identify certificate of an eet file against a stored one
  *
  * @param ef The file handle to check the identify of
  * @param certificate_file The path to the certificate file
- * @return EINA_TRUE if the certificates match, otherwise EINA_FALSE;
+ * @return @c EINA_TRUE if the certificates match, otherwise @c EINA_FALSE
  *
  * The @p ef file handle mus be valid, and a signed file, otherwise
  * checking will fail. The path to the certificate file must be a valid
@@ -2079,14 +2080,14 @@ eet_identity_print(Eet_Key *key,
  * security. This is just a convenience test function.
  * @warning You need to compile signature support in EET.
  * @since 1.13
- * @ingroup Eet_Cipher_Group
  */
 EAPI Eina_Bool
 eet_identity_verify(Eet_File *ef,
                     const char *certificate_file);
 
 /**
- * Get the x509 der certificate associated with an Eet_File. Will return NULL
+ * @ingroup Eet_Cipher_Group
+ * @brief Gets the x509 der certificate associated with an Eet_File. Will return NULL
  * if the file is not signed.
  *
  * @param ef The file handle to query.
@@ -2094,28 +2095,28 @@ eet_identity_verify(Eet_File *ef,
  * @return the x509 certificate or @c NULL on error.
  *
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI const void *
 eet_identity_x509(Eet_File *ef,
                   int *der_length);
 
 /**
- * Get the raw signature associated with an Eet_File. Will return NULL
+ * @ingroup Eet_Cipher_Group
+ * @brief Gets the raw signature associated with an Eet_File. Will return NULL
  * if the file is not signed.
  *
  * @param ef The file handle to query.
  * @param signature_length The length of returned data, may be @c NULL.
- * @return the raw signature or @c NULL on error.
+ * @return The raw signature or @c NULL on error.
  *
- * @ingroup Eet_Cipher_Group
  */
 EAPI const void *
 eet_identity_signature(Eet_File *ef,
                        int *signature_length);
 
 /**
- * Get the SHA1 associated with a file. Could be the one used to
+ * @ingroup Eet_Cipher_Group
+ * @brief Gets the SHA1 associated with a file. Could be the one used to
  * sign the data or if the data where not signed, it will be the
  * SHA1 of the file.
  *
@@ -2124,14 +2125,14 @@ eet_identity_signature(Eet_File *ef,
  * @return the associated SHA1 or @c NULL on error.
  *
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI const void *
 eet_identity_sha1(Eet_File *ef,
                   int *sha1_length);
 
 /**
- * Display the x509 der certificate to out.
+ * @ingroup Eet_Cipher_Group
+ * @brief Displays the x509 der certificate to out.
  *
  * @param certificate the x509 certificate to print
  * @param der_length The length the certificate.
@@ -2139,7 +2140,6 @@ eet_identity_sha1(Eet_File *ef,
  *
  * @warning You need to compile signature support in EET.
  * @since 1.2.0
- * @ingroup Eet_Cipher_Group
  */
 EAPI void
 eet_identity_certificate_print(const unsigned char *certificate,
@@ -2642,19 +2642,19 @@ typedef struct _Eet_Data_Descriptor_Class Eet_Data_Descriptor_Class;
  * @typedef (*Eet_Descriptor_Hash_Foreach_Callback_Callback)
  *
  * Callback prototype for Eet_Descriptor_Hash_Foreach_Callback
- * @param h the hash
- * @param k the key
- * @param dt the data
- * @param fdt the data passed to the callback
- * @return an integer
+ * @param h The hash
+ * @param k The key
+ * @param dt The data
+ * @param fdt The data passed to the callback
+ * @return An integer
  */
 typedef int                             (*Eet_Descriptor_Hash_Foreach_Callback_Callback)(void *h, const char *k, void *dt, void *fdt);
 
 /**
  * @typedef (*Eet_Descriptor_Mem_Alloc_Callback)
  *
- * Callback prototype for Eet_Descriptor_Mem_Alloc
- * @param size is the size of memory to alloc on call of the callback
+ * Callback prototype for Eet_Descriptor_Mem_Alloc.
+ * @param size Is the size of memory to alloc on call of the callback
  */
 typedef void *                          (*Eet_Descriptor_Mem_Alloc_Callback)(size_t size);
 
@@ -2662,7 +2662,7 @@ typedef void *                          (*Eet_Descriptor_Mem_Alloc_Callback)(siz
  * @typedef (*Eet_Descriptor_Mem_Free_Callback)
  *
  * Callback prototype for Eet_Descriptor_Mem_Alloc
- * @param mem must be a pointer to free on call of the callback
+ * @param mem Must be a pointer to free on call of the callback
  */
 typedef void                            (*Eet_Descriptor_Mem_Free_Callback)(void *mem);
 
@@ -2670,8 +2670,8 @@ typedef void                            (*Eet_Descriptor_Mem_Free_Callback)(void
  * @typedef (*Eet_Descriptor_Str_Alloc_Callback)
  *
  * Callback prototype for Eet_Descriptor_Str_Alloc
- * @param str must be the string to alloc
- * @return have must be an allocated char * for the given string
+ * @param str Must be the string to alloc
+ * @return have Must be an allocated char * for the given string
  */
 typedef char *                          (*Eet_Descriptor_Str_Alloc_Callback)(const char *str);
 
@@ -2679,7 +2679,7 @@ typedef char *                          (*Eet_Descriptor_Str_Alloc_Callback)(con
  * @typedef (*Eet_Descriptor_Str_Free_Callback)
  *
  * Callback prototype for Eet_Descriptor_Str_Free
- * @param str must be an allocated string to free
+ * @param str Must be an allocated string to free
  */
 typedef void                            (*Eet_Descriptor_Str_Free_Callback)(const char *str);
 
@@ -2687,8 +2687,8 @@ typedef void                            (*Eet_Descriptor_Str_Free_Callback)(cons
  * @typedef (*Eet_Descriptor_List_Next_Callback)
  *
  * Callback prototype for Eet_Descriptor_List_Next
- * @param l must be a pointer to the list
- * @return must be a pointer to the list
+ * @param l Must be a pointer to the list
+ * @return Must be a pointer to the list
  */
 typedef void *                          (*Eet_Descriptor_List_Next_Callback)(void *l);
 
@@ -2696,9 +2696,9 @@ typedef void *                          (*Eet_Descriptor_List_Next_Callback)(voi
  * @typedef (*Eet_Descriptor_List_Append_Callback)
  *
  * Callback prototype for Eet_Descriptor_List_Append
- * @param l must be a pointer to the list
- * @param d the data to append to the list
- * @return must be a pointer to the list
+ * @param l Must be a pointer to the list
+ * @param d The data to append to the list
+ * @return Must be a pointer to the list
  */
 typedef void *                          (*Eet_Descriptor_List_Append_Callback)(void *l, void *d);
 
@@ -2707,8 +2707,8 @@ typedef void *                          (*Eet_Descriptor_List_Append_Callback)(v
  * @typedef (*Eet_Descriptor_List_Data_Callback)
  *
  * Callback prototype for Eet_Descriptor_List_Data
- * @param l must be a pointer to the list
- * @return must be a pointer to the list
+ * @param l Must be a pointer to the list
+ * @return Must be a pointer to the list
  */
 typedef void *                          (*Eet_Descriptor_List_Data_Callback)(void *l);
 
@@ -2716,7 +2716,7 @@ typedef void *                          (*Eet_Descriptor_List_Data_Callback)(voi
  * @typedef (*Eet_Descriptor_List_Free_Callback)
  *
  * Callback prototype for Eet_Descriptor_List_Free
- * @param l must be a pointer to the list to free
+ * @param l Must be a pointer to the list to free
  */
 typedef void *                          (*Eet_Descriptor_List_Free_Callback)(void *l);
 
@@ -2724,9 +2724,9 @@ typedef void *                          (*Eet_Descriptor_List_Free_Callback)(voi
  * @typedef (*Eet_Descriptor_Hash_Foreach_Callback)
  *
  * Callback for Eet_Descriptor_Hash_Foreach
- * @param h the hash
- * @param func the function callback to call on each iteration
- * @param fdt the data to pass to the callbac setted in param func
+ * @param h The hash
+ * @param func The function callback to call on each iteration
+ * @param fdt The data to pass to the callbac setted in param func
  */
 typedef void                            (*Eet_Descriptor_Hash_Foreach_Callback)(void *h, Eet_Descriptor_Hash_Foreach_Callback_Callback func, void *fdt);
 
@@ -2734,9 +2734,9 @@ typedef void                            (*Eet_Descriptor_Hash_Foreach_Callback)(
  * @typedef (*Eet_Descriptor_Hash_Add_Callback)
  *
  * Callback prototype for Eet_Descriptor_Hash_Add
- * @param h the hash
- * @param k the key
- * @param d the data to associate with the 'k' key
+ * @param h The hash
+ * @param k The key
+ * @param d The data to associate with the 'k' key
  */
 typedef void *                          (*Eet_Descriptor_Hash_Add_Callback)(void *h, const char *k, void *d);
 
@@ -2744,7 +2744,7 @@ typedef void *                          (*Eet_Descriptor_Hash_Add_Callback)(void
  * @typedef (*Eet_Descriptor_Hash_Free_Callback)
  *
  * Callback prototype for Eet_Descriptor_Hash_Free
- * @param h the hash to free
+ * @param h The hash to free
  */
 typedef void                            (*Eet_Descriptor_Hash_Free_Callback)(void *h);
 
@@ -2752,8 +2752,8 @@ typedef void                            (*Eet_Descriptor_Hash_Free_Callback)(voi
  * @typedef (*Eet_Descriptor_Str_Alloc_Callback)
  *
  * Callback prototype for Eet_Descriptor_Str_Alloc
- * @param str the string to allocate
- * @return an allocated pointer to the string
+ * @param str The string to allocate
+ * @return An allocated pointer to the string
  */
 typedef char *                          (*Eet_Descriptor_Str_Direct_Alloc_Callback)(const char *str);
 
@@ -2761,7 +2761,7 @@ typedef char *                          (*Eet_Descriptor_Str_Direct_Alloc_Callba
  * @typedef (*Eet_Descriptor_Str_Free_Callback)
  *
  * Callback prototype for Eet_Descriptor_Str_Free
- * @param str the string to free
+ * @param str The string to free
  */
 typedef void                            (*Eet_Descriptor_Str_Direct_Free_Callback)(const char *str);
 
@@ -2770,7 +2770,7 @@ typedef void                            (*Eet_Descriptor_Str_Direct_Free_Callbac
  * @typedef (*Eet_Descriptor_Type_Get_Callback)
  *
  * Callback prototype for Eet_Descriptor_Type_Get
- * @param data data to pass to the callback
+ * @param data Data to pass to the callback
  * @param unknow Eina_Bool __FIXME__
  */
 typedef const char *                    (*Eet_Descriptor_Type_Get_Callback)(const void *data, Eina_Bool *unknow);
@@ -2779,8 +2779,8 @@ typedef const char *                    (*Eet_Descriptor_Type_Get_Callback)(cons
  * @typedef (*Eet_Descriptor_Type_Set_Callback)
  *
  * Callback prototype for Eet_Descriptor_Type_Set
- * @param type the type to set
- * @param data to pass to the callback
+ * @param type The type to set
+ * @param data To pass to the callback
  * @param unknow Eina_Bool __FIXME__
  */
 typedef Eina_Bool                       (*Eet_Descriptor_Type_Set_Callback)(const char *type, void *data, Eina_Bool unknow);
@@ -2847,7 +2847,11 @@ struct _Eet_Data_Descriptor_Class
  */
 
 /**
- * Create a new empty data structure descriptor.
+ *
+ * @ingroup Eet_Data_Group
+ * @deprecated use eet_data_descriptor_stream_new() or
+ *             eet_data_descriptor_file_new()
+ * @brief Creates a new empty data structure descriptor.
  * @param name The string name of this data structure (most be a
  *        global constant and never change).
  * @param size The size of the struct (in bytes).
@@ -2879,10 +2883,7 @@ struct _Eet_Data_Descriptor_Class
  * needed if you use those data types, else you can pass NULL instead.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  *
- * @deprecated use eet_data_descriptor_stream_new() or
- *             eet_data_descriptor_file_new()
  */
 EINA_DEPRECATED EAPI Eet_Data_Descriptor *
 eet_data_descriptor_new(const char *name,
@@ -2906,6 +2907,7 @@ EINA_DEPRECATED EAPI Eet_Data_Descriptor *
  eet_data_descriptor3_new(const Eet_Data_Descriptor_Class *eddc);
 
 /**
+ * @ingroup Eet_Data_Group
  * This function creates a new data descriptor and returns a handle to the
  * new data descriptor. On creation it will be empty, containing no contents
  * describing anything other than the shell of the data structure.
@@ -2928,12 +2930,12 @@ EINA_DEPRECATED EAPI Eet_Data_Descriptor *
  * and duplicated in memory.
  *
  * @since 1.2.3
- * @ingroup Eet_Data_Group
  */
 EAPI Eet_Data_Descriptor *
 eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc);
 
 /**
+ * @ingroup Eet_Data_Group
  * This function creates a new data descriptor and returns a handle to the
  * new data descriptor. On creation it will be empty, containing no contents
  * describing anything other than the shell of the data structure.
@@ -2978,12 +2980,12 @@ eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc);
  * @endcode
  *
  * @since 1.2.3
- * @ingroup Eet_Data_Group
  */
 EAPI Eet_Data_Descriptor *
 eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc);
 
 /**
+ * @ingroup Eet_Data_Group
  * This function is an helper that set all the parameters of an
  * Eet_Data_Descriptor_Class correctly when you use Eina data type
  * with a stream.
@@ -2991,7 +2993,7 @@ eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc);
  * @param eddc_size The size of the Eet_Data_Descriptor_Class at the compilation time.
  * @param name The name of the structure described by this class.
  * @param size The size of the structure described by this class.
- * @return EINA_TRUE if the structure was correctly set (The only
+ * @return @c EINA_TRUE if the structure was correctly set (The only
  *         reason that could make it fail is if you did give wrong
  *         parameter).
  *
@@ -2999,7 +3001,6 @@ eet_data_descriptor_file_new(const Eet_Data_Descriptor_Class *eddc);
  * the EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET macro is recommended.
  *
  * @since 1.2.3
- * @ingroup Eet_Data_Group
  */
 EAPI Eina_Bool
 eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
@@ -3008,6 +3009,7 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
                                           int size);
 
 /**
+ * @ingroup Eet_Data_Group
  * This macro is an helper that set all the parameter of an
  * Eet_Data_Descriptor_Class correctly when you use Eina data type
  * with stream.
@@ -3019,12 +3021,12 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
  *
  * @see eet_data_descriptor_stream_new
  * @since 1.2.3
- * @ingroup Eet_Data_Group
  */
 #define EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(clas, type) \
   (eet_eina_stream_data_descriptor_class_set(clas, sizeof (*(clas)), # type, sizeof(type)))
 
 /**
+ * @ingroup Eet_Data_Group
  * This function is an helper that set all the parameter of an
  * Eet_Data_Descriptor_Class correctly when you use Eina data type
  * with a file.
@@ -3032,7 +3034,7 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
  * @param eddc_size The size of the Eet_Data_Descriptor_Class at the compilation time.
  * @param name The name of the structure described by this class.
  * @param size The size of the structure described by this class.
- * @return EINA_TRUE if the structure was correctly set (The only
+ * @return @c EINA_TRUE if the structure was correctly set (The only
  *         reason that could make it fail is if you did give wrong
  *         parameter).
  *
@@ -3040,7 +3042,6 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
  * the EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET macro is recommended.
  *
  * @since 1.2.3
- * @ingroup Eet_Data_Group
  */
 EAPI Eina_Bool
 eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
@@ -3049,24 +3050,25 @@ eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
                                         int size);
 
 /**
+ * @ingroup Eet_Data_Group
  * This macro is an helper that set all the parameter of an
  * Eet_Data_Descriptor_Class correctly when you use Eina data type
  * with file.
  * @param clas The Eet_Data_Descriptor_Class you want to set.
  * @param type The type of the structure described by this class.
- * @return EINA_TRUE if the structure was correctly set (The only
+ * @return @c EINA_TRUE if the structure was correctly set (The only
  *         reason that could make it fail is if you did give wrong
  *         parameter).
  *
  * @see eet_data_descriptor_file_new
  * @since 1.2.3
- * @ingroup Eet_Data_Group
  */
 #define EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(clas, type) \
   (eet_eina_file_data_descriptor_class_set(clas, sizeof (*(clas)), # type, sizeof(type)))
 
 /**
- * This function frees a data descriptor when it is not needed anymore.
+ * @ingroup Eet_Data_Group
+ * @brief This function frees a data descriptor when it is not needed anymore.
  * @param edd The data descriptor to free.
  *
  * This function takes a data descriptor handle as a parameter and frees all
@@ -3074,21 +3076,21 @@ eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc,
  * call the descriptor is no longer valid.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI void
 eet_data_descriptor_free(Eet_Data_Descriptor *edd);
 
 /**
- * This function returns the name of a data descriptor.
+ * @ingroup Eet_Data_Group
+ * @brief This function returns the name of a data descriptor.
  *
  * @since 1.8.0
- * @ingroup Eet_Data_Group
  */
 EAPI const char *eet_data_descriptor_name_get(const Eet_Data_Descriptor *edd);
 
 /**
- * This function is an internal used by macros.
+ * @ingroup Eet_Data_Group
+ * @brief This function is an internal used by macros.
  *
  * This function is used by macros EET_DATA_DESCRIPTOR_ADD_BASIC(),
  * EET_DATA_DESCRIPTOR_ADD_SUB() and EET_DATA_DESCRIPTOR_ADD_LIST(). It is
@@ -3111,7 +3113,6 @@ EAPI const char *eet_data_descriptor_name_get(const Eet_Data_Descriptor *edd);
  * @param subtype If contains a subtype, then its data descriptor.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI void
 eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
@@ -3125,7 +3126,8 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
                                 Eet_Data_Descriptor *subtype);
 
 /**
- * Read a data structure from an eet file and decodes it.
+ * @ingroup Eet_Data_Group
+ * @brief Reads a data structure from an eet file and decodes it.
  * @param ef The eet file handle to read from.
  * @param edd The data descriptor handle to use when decoding.
  * @param name The key the data is stored under in the eet file.
@@ -3149,7 +3151,6 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
  * @see eet_data_read_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI void *
 eet_data_read(Eet_File *ef,
@@ -3157,13 +3158,14 @@ eet_data_read(Eet_File *ef,
               const char *name);
 
 /**
- * Write a data structure from memory and store in an eet file.
+ * @ingroup Eet_Data_Group
+ * @brief Writes a data structure from memory and store in an eet file.
  * @param ef The eet file handle to write to.
  * @param edd The data descriptor to use when encoding.
  * @param name The key to store the data under in the eet file.
  * @param data A pointer to the data structure to save and encode.
  * @param compress Compression flags for storage.
- * @return bytes written on successful write, 0 on failure.
+ * @return bytes Written on successful write, @c 0 on failure.
  *
  * This function is the reverse of eet_data_read(), saving a data structure
  * to an eet file. The file must have been opening in write mode and the data
@@ -3173,7 +3175,6 @@ eet_data_read(Eet_File *ef,
  * @see eet_data_write_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI int
 eet_data_write(Eet_File *ef,
@@ -3187,20 +3188,21 @@ eet_data_write(Eet_File *ef,
  * 
  * Callback protoype for Eet_Dump 
  *
- * @param data to passe to the callback
- * @param str the string to dump 
+ * @param data To passe to the callback
+ * @param str The string to dump 
  *
  */
 typedef void (*Eet_Dump_Callback)(void *data, const char *str);
 
 /**
- * Dump an eet encoded data structure into ascii text
+ * @ingroup Eet_Data_Group
+ * @brief Dumps an eet encoded data structure into ascii text
  * @param data_in The pointer to the data to decode into a struct.
  * @param size_in The size of the data pointed to in bytes.
  * @param dumpfunc The function to call passed a string when new
  *        data is converted to text
  * @param dumpdata The data to pass to the @p dumpfunc callback.
- * @return 1 on success, 0 on failure
+ * @return @c 1 on success, @c 0 on failure
  *
  * This function will take a chunk of data encoded by
  * eet_data_descriptor_encode() and convert it into human readable
@@ -3238,7 +3240,6 @@ typedef void (*Eet_Dump_Callback)(void *data, const char *str);
  * @see eet_data_text_dump_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI int
 eet_data_text_dump(const void *data_in,
@@ -3247,7 +3248,8 @@ eet_data_text_dump(const void *data_in,
                    void *dumpdata) EINA_ARG_NONNULL(3);
 
 /**
- * Take an ascii encoding from eet_data_text_dump() and re-encode in binary.
+ * @ingroup Eet_Data_Group
+ * @brief Takes an ascii encoding from eet_data_text_dump() and re-encode in binary.
  * @param text The pointer to the string data to parse and encode.
  * @param textlen The size of the string in bytes (not including 0
  *        byte terminator).
@@ -3263,7 +3265,6 @@ eet_data_text_dump(const void *data_in,
  * @see eet_data_text_undump_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI void *
 eet_data_text_undump(const char *text,
@@ -3271,13 +3272,14 @@ eet_data_text_undump(const char *text,
                      int *size_ret) EINA_ARG_NONNULL(3);
 
 /**
- * Dump an eet encoded data structure from an eet file into ascii text
+ * @ingroup Eet_Data_Group
+ * @brief Dumps an eet encoded data structure from an eet file into ascii text.
  * @param ef A valid eet file handle.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param dumpfunc The function to call passed a string when new
  *        data is converted to text
  * @param dumpdata The data to pass to the @p dumpfunc callback.
- * @return 1 on success, 0 on failure
+ * @return @c 1 on success, @c 0 on failure
  *
  * This function will take an open and valid eet file from
  * eet_open() request the data encoded by
@@ -3291,7 +3293,6 @@ eet_data_text_undump(const char *text,
  * @see eet_data_dump_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI int
 eet_data_dump(Eet_File *ef,
@@ -3300,14 +3301,15 @@ eet_data_dump(Eet_File *ef,
               void *dumpdata) EINA_ARG_NONNULL(3);
 
 /**
- * Take an ascii encoding from eet_data_dump() and re-encode in binary.
+ * @ingroup Eet_Data_Group
+ * @brief Takes an ascii encoding from eet_data_dump() and re-encode in binary.
  * @param ef A valid eet file handle.
  * @param name Name of the entry. eg: "/base/file_i_want".
  * @param text The pointer to the string data to parse and encode.
  * @param textlen The size of the string in bytes (not including 0
  *        byte terminator).
  * @param compress Compression flags (1 == compress, 0 = don't compress).
- * @return 1 on success, 0 on failure
+ * @return @c 1 on success, @c 0 on failure
  *
  * This function will parse the string pointed to by @p text,
  * encode it the same way eet_data_descriptor_encode() takes an
@@ -3319,7 +3321,6 @@ eet_data_dump(Eet_File *ef,
  * @see eet_data_undump_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI int
 eet_data_undump(Eet_File *ef,
@@ -3329,8 +3330,9 @@ eet_data_undump(Eet_File *ef,
                 int compress);
 
 /**
- * Decode a data structure from an arbitrary location in memory.
- * @param edd The data  descriptor to use when decoding.
+ * @ingroup Eet_Data_Group
+ * @brief Decodes a data structure from an arbitrary location in memory.
+ * @param edd The data descriptor to use when decoding.
  * @param data_in The pointer to the data to decode into a struct.
  * @param size_in The size of the data pointed to in bytes.
  * @return NULL on failure, or a valid decoded struct pointer on success.
@@ -3353,7 +3355,6 @@ eet_data_undump(Eet_File *ef,
  * @see eet_data_descriptor_decode_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI void *
 eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
@@ -3361,8 +3362,9 @@ eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
                            int size_in);
 
 /**
- * Encode a dsata struct to memory and return that encoded data.
- * @param edd The data  descriptor to use when encoding.
+ * @ingroup Eet_Data_Group
+ * @brief Encodes a dsata struct to memory and return that encoded data.
+ * @param edd The data descriptor to use when encoding.
  * @param data_in The pointer to the struct to encode into data.
  * @param size_ret pointer to the an int to be filled with the decoded size.
  * @return NULL on failure, or a valid encoded data chunk on success.
@@ -3387,7 +3389,6 @@ eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
  * @see eet_data_descriptor_encode_cipher()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 EAPI void *
 eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
@@ -3395,7 +3396,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
                            int *size_ret);
 
 /**
- * Add a basic data element to a data descriptor.
+ * @ingroup Eet_Data_Group
+ * @brief Adds a basic data element to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3415,7 +3417,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * EET_T_USHORT, EET_T_UINT, EET_T_ULONG_LONG or EET_T_STRING.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_BASIC(edd, struct_type, name, member, type) \
   do {                                                                      \
@@ -3427,7 +3428,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while(0)
 
 /**
- * Add a sub-element type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a sub-element type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3442,7 +3444,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * this element.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_SUB(edd, struct_type, name, member, subtype)   \
   do {                                                                         \
@@ -3454,7 +3455,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a nested sub-element type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a nested sub-element type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3468,7 +3470,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * All the parameters are the same as for EET_DATA_DESCRIPTOR_ADD_SUB().
  *
  * @since 1.8.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_SUB_NESTED(edd, struct_type, name, member, subtype)   \
   do {                                                                         \
@@ -3480,7 +3481,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a linked list type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a linked list type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3494,7 +3496,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * element that is in each member of the linked list to be stored.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_LIST(edd, struct_type, name, member, subtype) \
   do {                                                                        \
@@ -3506,7 +3507,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a linked list of string to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a linked list of string to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3517,7 +3519,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * parameters are the same as for EET_DATA_DESCRIPTOR_ADD_BASIC().
  *
  * @since 1.5.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_LIST_STRING(edd, struct_type, name, member) \
   do {                                                                      \
@@ -3529,7 +3530,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a hash type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a hash type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3544,7 +3546,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * The hash keys must be strings.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_HASH(edd, struct_type, name, member, subtype) \
   do {                                                                        \
@@ -3556,7 +3557,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a hash of string to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a hash of string to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3567,7 +3569,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * parameters are the same as for EET_DATA_DESCRIPTOR_ADD_HASH().
  *
  * @since 1.3.4
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_HASH_STRING(edd, struct_type, name, member) \
   do {                                                                      \
@@ -3579,7 +3580,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a hash of generic value storage to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a hash of generic value storage to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3590,7 +3592,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * parameters are the same as for EET_DATA_DESCRIPTOR_ADD_HASH().
  *
  * @since 1.18
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_HASH_VALUE(edd, struct_type, name, member) \
   do {                                                                     \
@@ -3602,7 +3603,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add an array of basic data elements to a data descriptor.
+ * @ingroup Eet_Data_Group
+ * @brief Adds an array of basic data elements to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3617,7 +3619,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * struct containing it.
  *
  * @since 1.5.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_BASIC_ARRAY(edd, struct_type, name, member, type) \
   do {                                                                            \
@@ -3631,7 +3632,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while(0)
 
 /**
- * Add a variable array of basic data elements to a data descriptor.
+ * @ingroup Eet_Data_Group
+ * @brief Adds a variable array of basic data elements to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3648,7 +3650,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * is in.
  *
  * @since 1.6.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_BASIC_VAR_ARRAY(edd, struct_type, name, member, type) \
   do {                                                                                \
@@ -3663,7 +3664,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while(0)
 
 /**
- * Add a fixed size array type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a fixed size array type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3680,7 +3682,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * struct containing it.
  *
  * @since 1.0.2
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_ARRAY(edd, struct_type, name, member, subtype)   \
   do {                                                                           \
@@ -3693,7 +3694,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a variable size array type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a variable size array type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3712,7 +3714,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * is in.
  *
  * @since 1.0.2
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_VAR_ARRAY(edd, struct_type, name, member, subtype) \
   do {                                                                             \
@@ -3730,7 +3731,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a variable size array type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a variable size array type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3741,7 +3743,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * the parameters are the same as for EET_DATA_DESCRIPTOR_ADD_BASIC().
  *
  * @since 1.4.0
- * @ingroup Eet_Data_Group
  */
 #define EET_DATA_DESCRIPTOR_ADD_VAR_ARRAY_STRING(edd, struct_type, name, member) \
   do {                                                                           \
@@ -3759,7 +3760,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add an union type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds an union type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3774,7 +3776,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * callback of unified_type should be defined.
  *
  * @since 1.2.4
- * @ingroup Eet_Data_Group
  * @see Eet_Data_Descriptor_Class
  */
 #define EET_DATA_DESCRIPTOR_ADD_UNION(edd, struct_type, name, member, type_member, unified_type) \
@@ -3789,7 +3790,8 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a automatically selectable type to a data descriptor
+ * @ingroup Eet_Data_Group
+ * @brief Adds a automatically selectable type to a data descriptor.
  * @param edd The data descriptor to add the type to.
  * @param struct_type The type of the struct.
  * @param name The string name to use to encode/decode this member
@@ -3806,7 +3808,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * given previously and telling it by setting unknow to EINA_TRUE.
  *
  * @since 1.2.4
- * @ingroup Eet_Data_Group
  * @see Eet_Data_Descriptor_Class
  */
 #define EET_DATA_DESCRIPTOR_ADD_VARIANT(edd, struct_type, name, member, type_member, unified_type) \
@@ -3821,13 +3822,13 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
     } while (0)
 
 /**
- * Add a mapping to a data descriptor that will be used by union, variant or inherited type
+ * @ingroup Eet_Data_Group
+ * @brief Adds a mapping to a data descriptor that will be used by union, variant or inherited type.
  * @param unified_type The data descriptor to add the mapping to.
  * @param name The string name to get/set type.
  * @param subtype The matching data descriptor.
  *
  * @since 1.2.4
- * @ingroup Eet_Data_Group
  * @see Eet_Data_Descriptor_Class
  */
 #define EET_DATA_DESCRIPTOR_ADD_MAPPING(unified_type, name, subtype) \
@@ -3841,13 +3842,13 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
                                   subtype)
 
 /**
- * Add a mapping of a basic type to a data descriptor that will be used by a union type.
+ * @ingroup Eet_Data_Group
+ * @brief Adds a mapping of a basic type to a data descriptor that will be used by a union type.
  * @param unified_type The data descriptor to add the mapping to.
  * @param name The string name to get/set type.
  * @param basic_type The matching basic type.
  *
  * @since 1.8
- * @ingroup Eet_Data_Group
  * @see Eet_Data_Descriptor_Class
  */
 #define EET_DATA_DESCRIPTOR_ADD_MAPPING_BASIC(unified_type, name, basic_type) \
@@ -3861,17 +3862,18 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
                                   NULL)
 /**
  * @defgroup Eet_Data_Cipher_Group Eet Data Serialization using A Ciphers
+ * @ingroup Eet_Data_Group
  *
  * Most of the @ref Eet_Data_Group have alternative versions that
  * accounts for ciphers to protect their content.
  *
  * @see @ref Eet_Cipher_Group
  *
- * @ingroup Eet_Data_Group
  */
 
 /**
- * Read a data structure from an eet file and decodes it using a cipher.
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Reads a data structure from an eet file and decodes it using a cipher.
  * @param ef The eet file handle to read from.
  * @param edd The data descriptor handle to use when decoding.
  * @param name The key the data is stored under in the eet file.
@@ -3896,7 +3898,6 @@ eet_data_descriptor_encode(Eet_Data_Descriptor *edd,
  * @see eet_data_read()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI void *
 eet_data_read_cipher(Eet_File *ef,
@@ -3905,14 +3906,15 @@ eet_data_read_cipher(Eet_File *ef,
                      const char *cipher_key);
 
 /**
- * Read a data structure from an eet file and decodes it into a buffer using a cipher,
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Reads a data structure from an eet file and decodes it into a buffer using a cipher.
  * @param ef The eet file handle to read from.
  * @param edd The data descriptor handle to use when decoding.
  * @param name The key the data is stored under in the eet file.
  * @param cipher_key The key to use as cipher.
  * @param buffer Buffer.
  * @param buffer_size The buffer size.
- * @return A pointer to buffer if successful and NULL on error.
+ * @return A pointer to buffer if successful, and NULL on error.
  *
  * This function decodes a data structure stored in an eet file, returning
  * a pointer to it if it decoded successfully, or NULL on failure. This
@@ -3932,7 +3934,6 @@ eet_data_read_cipher(Eet_File *ef,
  * @see eet_data_read_cipher()
  *
  * @since 1.10.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI void *
 eet_data_read_cipher_buffer(Eet_File            *ef,
@@ -3943,7 +3944,8 @@ eet_data_read_cipher_buffer(Eet_File            *ef,
                             int                 buffer_size);
 
 /**
- * Read a data structure from an eet extended attribute and decodes it using a cipher.
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Reads a data structure from an eet extended attribute and decodes it using a cipher.
  * @param filename The file to extract the extended attribute from.
  * @param attribute The attribute to get the data from.
  * @param edd The data descriptor handle to use when decoding.
@@ -3963,7 +3965,6 @@ eet_data_read_cipher_buffer(Eet_File            *ef,
  * is as simple as a single function call.
  *
  * @since 1.5.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI void *
 eet_data_xattr_cipher_get(const char *filename,
@@ -3972,7 +3973,8 @@ eet_data_xattr_cipher_get(const char *filename,
                           const char *cipher_key);
 
 /**
- * Write a data structure from memory and store in an eet file
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Writes a data structure from memory and store in an eet file
  * using a cipher.
  * @param ef The eet file handle to write to.
  * @param edd The data descriptor to use when encoding.
@@ -3986,7 +3988,6 @@ eet_data_xattr_cipher_get(const char *filename,
  * to an eet file.
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI int
 eet_data_write_cipher(Eet_File *ef,
@@ -3997,7 +3998,8 @@ eet_data_write_cipher(Eet_File *ef,
                       int compress);
 
 /**
- * Write a data structure from memory and store in an eet extended attribute
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Writes a data structure from memory and store in an eet extended attribute
  * using a cipher.
  * @param filename The file to write the extended attribute to.
  * @param attribute The attribute to store the data to.
@@ -4011,7 +4013,6 @@ eet_data_write_cipher(Eet_File *ef,
  * to an eet extended attribute.
  *
  * @since 1.5.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI Eina_Bool
 eet_data_xattr_cipher_set(const char *filename,
@@ -4022,14 +4023,15 @@ eet_data_xattr_cipher_set(const char *filename,
                           Eina_Xattr_Flags flags);
 
 /**
- * Dump an eet encoded data structure into ascii text using a cipher.
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Dumps an eet encoded data structure into ascii text using a cipher.
  * @param data_in The pointer to the data to decode into a struct.
  * @param cipher_key The key to use as cipher.
  * @param size_in The size of the data pointed to in bytes.
  * @param dumpfunc The function to call passed a string when new
  *        data is converted to text
  * @param dumpdata The data to pass to the @p dumpfunc callback.
- * @return 1 on success, 0 on failure
+ * @return @c 1 on success, @c 0 on failure
  *
  * This function will take a chunk of data encoded by
  * eet_data_descriptor_encode() and convert it into human readable
@@ -4067,7 +4069,6 @@ eet_data_xattr_cipher_set(const char *filename,
  * @see eet_data_text_dump()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI int
 eet_data_text_dump_cipher(const void *data_in,
@@ -4077,7 +4078,8 @@ eet_data_text_dump_cipher(const void *data_in,
                           void *dumpdata) EINA_ARG_NONNULL(4);
 
 /**
- * Take an ascii encoding from eet_data_text_dump() and re-encode
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Takes an ascii encoding from eet_data_text_dump() and re-encode
  * in binary using a cipher.
  * @param text The pointer to the string data to parse and encode.
  * @param cipher_key The key to use as cipher.
@@ -4095,7 +4097,6 @@ eet_data_text_dump_cipher(const void *data_in,
  * @see eet_data_text_undump()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI void *
 eet_data_text_undump_cipher(const char *text,
@@ -4104,7 +4105,8 @@ eet_data_text_undump_cipher(const char *text,
                             int *size_ret) EINA_ARG_NONNULL(4);
 
 /**
- * Dump an eet encoded data structure from an eet file into ascii
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Dumps an eet encoded data structure from an eet file into ascii
  * text using a cipher.
  * @param ef A valid eet file handle.
  * @param name Name of the entry. eg: "/base/file_i_want".
@@ -4112,7 +4114,7 @@ eet_data_text_undump_cipher(const char *text,
  * @param dumpfunc The function to call passed a string when new
  *        data is converted to text
  * @param dumpdata The data to pass to the @p dumpfunc callback.
- * @return 1 on success, 0 on failure
+ * @return @c 1 on success, @c 0 on failure
  *
  * This function will take an open and valid eet file from
  * eet_open() request the data encoded by
@@ -4126,7 +4128,6 @@ eet_data_text_undump_cipher(const char *text,
  * @see eet_data_dump()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI int
 eet_data_dump_cipher(Eet_File *ef,
@@ -4136,7 +4137,8 @@ eet_data_dump_cipher(Eet_File *ef,
                      void *dumpdata) EINA_ARG_NONNULL(4);
 
 /**
- * Take an ascii encoding from eet_data_dump() and re-encode in
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Takes an ascii encoding from eet_data_dump() and re-encode in
  * binary using a cipher.
  * @param ef A valid eet file handle.
  * @param name Name of the entry. eg: "/base/file_i_want".
@@ -4145,7 +4147,7 @@ eet_data_dump_cipher(Eet_File *ef,
  * @param textlen The size of the string in bytes (not including 0
  *        byte terminator).
  * @param compress Compression flags (1 == compress, 0 = don't compress).
- * @return 1 on success, 0 on failure
+ * @return @c 1 on success, @c 0 on failure
  *
  * This function will parse the string pointed to by @p text,
  * encode it the same way eet_data_descriptor_encode() takes an
@@ -4157,7 +4159,6 @@ eet_data_dump_cipher(Eet_File *ef,
  * @see eet_data_undump()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI int
 eet_data_undump_cipher(Eet_File *ef,
@@ -4168,7 +4169,8 @@ eet_data_undump_cipher(Eet_File *ef,
                        int compress);
 
 /**
- * Decode a data structure from an arbitrary location in memory
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Decodes a data structure from an arbitrary location in memory
  * using a cipher.
  * @param edd The data  descriptor to use when decoding.
  * @param data_in The pointer to the data to decode into a struct.
@@ -4194,7 +4196,6 @@ eet_data_undump_cipher(Eet_File *ef,
  * @see eet_data_descriptor_decode()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI void *
 eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
@@ -4203,9 +4204,10 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
                                   int size_in);
 
 /**
- * Encode a data struct to memory and return that encoded data
+ * @ingroup Eet_Data_Cipher_Group
+ * @brief Encodes a data struct to memory and return that encoded data
  * using a cipher.
- * @param edd The data  descriptor to use when encoding.
+ * @param edd The data descriptor to use when encoding.
  * @param data_in The pointer to the struct to encode into data.
  * @param cipher_key The key to use as cipher.
  * @param size_ret pointer to the an int to be filled with the decoded size.
@@ -4231,7 +4233,6 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
  * @see eet_data_descriptor_encode()
  *
  * @since 1.0.0
- * @ingroup Eet_Data_Cipher_Group
  */
 EAPI void *
 eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
@@ -4287,164 +4288,164 @@ struct _Eet_Node_Data
  */
 
 /**
- * Create a new character node.
+ * @ingroup Eet_Node_Group
+ * @brief Creates a new character node.
  * @param name Name of the node.
  * @param c Character value.
  * @return A new character node.
- * @ingroup Eet_Node_Group
  */
 EAPI Eet_Node *
 eet_node_char_new(const char *name,
                   char c);
 
 /**
- * Create a new short node.
- * @param name Name of the node.
- * @param s short value.
- * @return A new short node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new short node.
+ * @param name Name of the node.
+ * @param s Short value.
+ * @return A new short node.
  */
 EAPI Eet_Node *
 eet_node_short_new(const char *name,
                    short s);
 
 /**
- * Create a new integer node.
- * @param name Name of the node.
- * @param i integer value.
- * @return A new integer node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new integer node.
+ * @param name Name of the node.
+ * @param i Integer value.
+ * @return A new integer node.
  */
 EAPI Eet_Node *
 eet_node_int_new(const char *name,
                  int i);
 
 /**
- * Create a new long long integer node.
- * @param name Name of the node.
- * @param l long long integer value.
- * @return A new long long integer node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new long long integer node.
+ * @param name Name of the node.
+ * @param l Long long integer value.
+ * @return A new long long integer node.
  */
 EAPI Eet_Node *
 eet_node_long_long_new(const char *name,
                        long long l);
 
 /**
- * Create a new float node.
- * @param name Name of the node.
- * @param f float value.
- * @return A new float node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new float node.
+ * @param name Name of the node.
+ * @param f Float value.
+ * @return A new float node.
  */
 EAPI Eet_Node *
 eet_node_float_new(const char *name,
                    float f);
 
 /**
- * Create a new double node.
- * @param name Name of the node.
- * @param d double value.
- * @return A new double node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new double node.
+ * @param name Name of the node.
+ * @param d Double value.
+ * @return A new double node.
  */
 EAPI Eet_Node *
 eet_node_double_new(const char *name,
                     double d);
 
 /**
- * Create a new unsigned character node.
- * @param name Name of the node.
- * @param uc unsigned char value.
- * @return A new unsigned char node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new unsigned character node.
+ * @param name Name of the node.
+ * @param uc Unsigned char value.
+ * @return A new unsigned char node.
  */
 EAPI Eet_Node *
 eet_node_unsigned_char_new(const char *name,
                            unsigned char uc);
 
 /**
- * Create a new unsigned short node.
- * @param name Name of the node.
- * @param us unsigned short value.
- * @return A new unsigned short node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new unsigned short node.
+ * @param name Name of the node.
+ * @param us Unsigned short value.
+ * @return A new unsigned short node.
  */
 EAPI Eet_Node *
 eet_node_unsigned_short_new(const char *name,
                             unsigned short us);
 
 /**
- * Create a new unsigned integer node.
- * @param name Name of the node.
- * @param ui unsigned integer value.
- * @return A new unsigned integer node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new unsigned integer node.
+ * @param name Name of the node.
+ * @param ui Unsigned integer value.
+ * @return A new unsigned integer node.
  */
 EAPI Eet_Node *
 eet_node_unsigned_int_new(const char *name,
                           unsigned int ui);
 
 /**
- * Create a new unsigned long long integer node.
- * @param name Name of the node.
- * @param l unsigned long long integer value.
- * @return A new unsigned long long integer node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new unsigned long long integer node.
+ * @param name Name of the node.
+ * @param l Unsigned long long integer value.
+ * @return A new unsigned long long integer node.
  */
 EAPI Eet_Node *
 eet_node_unsigned_long_long_new(const char *name,
                                 unsigned long long l);
 
 /**
- * Create a new string node.
- * @param name Name of the node.
- * @param str string value.
- * @return A new string node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new string node.
+ * @param name Name of the node.
+ * @param str String value.
+ * @return A new string node.
  */
 EAPI Eet_Node *
 eet_node_string_new(const char *name,
                     const char *str);
 
 /**
- * Create a new inlined string node.
- * @param name Name of the node.
- * @param str string value.
- * @return A new inlined string node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new inlined string node.
+ * @param name Name of the node.
+ * @param str String value.
+ * @return A new inlined string node.
  */
 EAPI Eet_Node *
 eet_node_inlined_string_new(const char *name,
                             const char *str);
 
 /**
- * Create a new empty node.
+ * @ingroup Eet_Node_Group
+ * @brief Creates a new empty node.
  * @param name Name of the node.
  * @return A new empty node.
- * @ingroup Eet_Node_Group
  */
 EAPI Eet_Node *
 eet_node_null_new(const char *name);
 
 /**
- * Create a new list node.
- * @param name Name of the node.
- * @param nodes list of nodes.
- * @return A new list node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new list node.
+ * @param name Name of the node.
+ * @param nodes List of nodes.
+ * @return A new list node.
  */
 EAPI Eet_Node *
 eet_node_list_new(const char *name,
                   Eina_List *nodes);
 
 /**
- * Create a new array node.
- * @param name Name of the node.
- * @param count number of nodes
- * @param nodes list of nodes.
- * @return A new array node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new array node.
+ * @param name Name of the node.
+ * @param count Number of nodes
+ * @param nodes List of nodes.
+ * @return A new array node.
  */
 EAPI Eet_Node *
 eet_node_array_new(const char *name,
@@ -4452,11 +4453,11 @@ eet_node_array_new(const char *name,
                    Eina_List *nodes);
 
 /**
- * Create a new variable array node.
- * @param name Name of the node.
- * @param nodes list of nodes.
- * @return A new variable array node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new variable array node.
+ * @param name Name of the node.
+ * @param nodes List of nodes.
+ * @return A new variable array node.
  */
 EAPI Eet_Node *
 eet_node_var_array_new(const char *name,
@@ -4467,11 +4468,11 @@ eet_node_var_array_new(const char *name,
  * @ingroup Eet_Node_Group
  */
 /**
- * Create a new short node.
- * @param name Name of the node.
- * @param s short value.
- * @return A new short node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new short node.
+ * @param name Name of the node.
+ * @param s Short value.
+ * @return A new short node.
  */
 EAPI Eet_Node *
 eet_node_hash_new(const char *name,
@@ -4479,11 +4480,11 @@ eet_node_hash_new(const char *name,
                   Eet_Node *node);
 
 /**
- * Create a new struct node.
- * @param name Name of the node.
- * @param nodes list of nodes.
- * @return A new struct node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new struct node.
+ * @param name Name of the node.
+ * @param nodes List of nodes.
+ * @return A new struct node.
  */
 EAPI Eet_Node *
 eet_node_struct_new(const char *name,
@@ -4494,18 +4495,18 @@ eet_node_struct_new(const char *name,
  * @ingroup Eet_Node_Group
  */
 /**
- * Create a new short node.
- * @param name Name of the node.
- * @param s short value.
- * @return A new short node.
  * @ingroup Eet_Node_Group
+ * @brief Creates a new short node.
+ * @param name Name of the node.
+ * @param s Short value.
+ * @return A new short node.
  */
 EAPI Eet_Node *
 eet_node_struct_child_new(const char *parent,
                           Eet_Node *child);
 
 /**
- * @brief Get a node's child nodes
+ * @brief Gets a node's child nodes.
  * @param node The node
  * @return The first child node which contains a pointer to the
  * next child node and the parent.
@@ -4515,7 +4516,7 @@ EAPI Eet_Node *
 eet_node_children_get(Eet_Node *node);
 
 /**
- * @brief Get the next node in a list of nodes
+ * @brief Gets the next node in a list of nodes.
  * @param node The node
  * @return A node which contains a pointer to the
  * next child node and the parent.
@@ -4525,7 +4526,7 @@ EAPI Eet_Node *
 eet_node_next_get(Eet_Node *node);
 
 /**
- * @brief Get the parent node of a node
+ * @brief Gets the parent node of a node.
  * @param node The node
  * @return The parent node of @p node
  * @since 1.5
@@ -4534,8 +4535,8 @@ EAPI Eet_Node *
 eet_node_parent_get(Eet_Node *node);
 
 /**
- * @brief Append a "list" node TODO FIX ME
  * @ingroup Eet_Node_Group
+ * @brief Appends a "list" node TODO FIX ME.
  */
 EAPI void
 eet_node_list_append(Eet_Node *parent,
@@ -4572,7 +4573,7 @@ eet_node_dump(Eet_Node *n,
               void *dumpdata);
 
 /**
- * @brief Return the type of a node
+ * @brief Returns the type of a node.
  * @param node The node
  * @return The node's type (EET_T_$TYPE)
  * @since 1.5
@@ -4581,7 +4582,7 @@ EAPI int
 eet_node_type_get(Eet_Node *node);
 
 /**
- * @brief Return the node's data
+ * @brief Returns the node's data.
  * @param node The node
  * @return The data contained in the node
  * @since 1.5
@@ -4647,7 +4648,7 @@ typedef struct _Eet_Node_Walk Eet_Node_Walk;
  *
  * Callback prototype for Eet_Node_Walk_Struct_Alloc
  * @param type The allocation type
- * @param user_data the data passed by the user to the callback
+ * @param user_data The data passed by the user to the callback
  */
 typedef void *              (*Eet_Node_Walk_Struct_Alloc_Callback)(const char *type, void *user_data);
 
@@ -4656,9 +4657,9 @@ typedef void *              (*Eet_Node_Walk_Struct_Alloc_Callback)(const char *t
  *
  * Callback prototype for Eet_Node_Walk_Struct_Add
  * @param parent The parent node
- * @param name the name for the new node
- * @param child the child node
- * @param user_data the data passed by the user to the callback
+ * @param name The name for the new node
+ * @param child The child node
+ * @param user_data The data passed by the user to the callback
  */
 typedef void                (*Eet_Node_Walk_Struct_Add_Callback)(void *parent, const char *name, void *child, void *user_data);
 
@@ -4666,10 +4667,10 @@ typedef void                (*Eet_Node_Walk_Struct_Add_Callback)(void *parent, c
  * @typedef (*Eet_Node_Walk_Array_Callback)
  *
  * Callback prototype for Eet_Node_Walk_Array
- * @param variable EINA_TRUE or EINA_FALSE
- * @param name a name
- * @param count a counter
- * @param user_data the data passed by the user to the callback
+ * @param variable @c EINA_TRUE or @c EINA_FALSE
+ * @param name A name
+ * @param count A counter
+ * @param user_data The data passed by the user to the callback
  */
 typedef void *              (*Eet_Node_Walk_Array_Callback)(Eina_Bool variable, const char *name, int count, void *user_data);
 
@@ -4713,40 +4714,40 @@ eet_node_walk(void *parent,
  */
 
 /**
+ * @ingroup Eet_Connection_Group
  * @typedef Eet_Connection
  * Opaque handle to track paquet for a specific connection.
  *
- * @ingroup Eet_Connection_Group
  */
 typedef struct _Eet_Connection Eet_Connection;
 
 /**
+ * @ingroup Eet_Connection_Group
  * @typedef Eet_Read_Cb
  * Called back when an @ref Eet_Data_Group has been received completely and could be used.
  *
- * @ingroup Eet_Connection_Group
  */
 typedef Eina_Bool Eet_Read_Cb (const void *eet_data, size_t size, void *user_data);
 
 /**
+ * @ingroup Eet_Connection_Group
  * @typedef Eet_Write_Cb
  * Called back when a packet containing @ref Eet_Data_Group data is ready to be send.
  *
- * @ingroup Eet_Connection_Group
  */
 typedef Eina_Bool Eet_Write_Cb (const void *data, size_t size, void *user_data);
 
 /**
- * Instanciate a new connection to track.
+ * @ingroup Eet_Connection_Group
+ * @brief Instanciates a new connection to track.
  * @param eet_read_cb Function to call when one Eet_Data packet has been fully assemble.
  * @param eet_write_cb Function to call when one Eet_Data packet is ready to be send over the wire.
  * @param user_data Pointer provided to both functions to be used as a context handler.
- * @return NULL on failure, or a valid Eet_Connection handler.
+ * @return @c NULL on failure, or a valid Eet_Connection handler.
  *
  * For every connection to track you will need a separate Eet_Connection provider.
  *
  * @since 1.2.4
- * @ingroup Eet_Connection_Group
  */
 EAPI Eet_Connection *
 eet_connection_new(Eet_Read_Cb *eet_read_cb,
@@ -4754,18 +4755,18 @@ eet_connection_new(Eet_Read_Cb *eet_read_cb,
                    const void *user_data);
 
 /**
- * Process a raw packet received over the link
+ * @ingroup Eet_Connection_Group
+ * @brief Processes a raw packet received over the link.
  * @param conn Connection handler to track.
  * @param data Raw data packet.
  * @param size The size of that packet.
- * @return 0 on complete success, any other value indicate where in the stream it got wrong (It could be before that packet).
+ * @return @c 0 on complete success, any other value indicate where in the stream it got wrong (It could be before that packet).
  *
  * Every time you receive a packet related to your connection, you should pass
  * it to that function so that it could process and assemble packet has you
  * receive it. It will automatically call Eet_Read_Cb when one is fully received.
  *
  * @since 1.2.4
- * @ingroup Eet_Connection_Group
  */
 EAPI int
 eet_connection_received(Eet_Connection *conn,
@@ -4773,26 +4774,27 @@ eet_connection_received(Eet_Connection *conn,
                         size_t size);
 
 /**
- * Tell if the Eet_Connection as received some partial data.
+ * @ingroup Eet_Connection_Group
+ * @brief Tells if the Eet_Connection as received some partial data.
  * @param conn Connection handler to request.
- * @return EINA_TRUE if there is some data pending inside, EINA_FALSE otherwise.
+ * @return @c EINA_TRUE if there is some data pending inside, @c EINA_FALSE otherwise.
  *
  * Eet_Connection buffer data until the received data can be unserialized correctly. This
  * function let you know if there is some data inside that buffer waiting for more data to
  * be received before being processed.
  *
  * @since 1.7
- * @ingroup Eet_Connection_Group
  */
 EAPI Eina_Bool eet_connection_empty(Eet_Connection *conn);
 
 /**
- * Convert a complex structure and prepare it to be send.
+ * @ingroup Eet_Connection_Group
+ * @brief Converts a complex structure and prepare it to be send.
  * @param conn Connection handler to track.
  * @param edd The data descriptor to use when encoding.
  * @param data_in The pointer to the struct to encode into data.
  * @param cipher_key The key to use as cipher.
- * @return EINA_TRUE if the data where correctly send, EINA_FALSE if they don't.
+ * @return @c EINA_TRUE if the data where correctly send, @c EINA_FALSE if they don't.
  *
  * This function serialize data_in with edd, assemble the packet and call
  * Eet_Write_Cb when ready. The data passed Eet_Write_Cb are temporary allocated
@@ -4801,7 +4803,6 @@ EAPI Eina_Bool eet_connection_empty(Eet_Connection *conn);
  * @see eet_data_descriptor_encode_cipher
  *
  * @since 1.2.4
- * @ingroup Eet_Connection_Group
  */
 EAPI Eina_Bool
 eet_connection_send(Eet_Connection *conn,
@@ -4810,11 +4811,12 @@ eet_connection_send(Eet_Connection *conn,
                     const char *cipher_key);
 
 /**
- * Convert a Eet_Node tree and prepare it to be send.
+ * @ingroup Eet_Connection_Group
+ * @brief Converts a Eet_Node tree and prepare it to be send.
  * @param conn Connection handler to track.
  * @param node The data tree to use when encoding.
  * @param cipher_key The key to use as cipher.
- * @return EINA_TRUE if the data where correctly send, EINA_FALSE if they don't.
+ * @return @c EINA_TRUE if the data where correctly send, @c EINA_FALSE if they don't.
  *
  * This function serialize node, assemble the packet and call
  * Eet_Write_Cb when ready. The data passed Eet_Write_Cb are temporary allocated
@@ -4823,7 +4825,6 @@ eet_connection_send(Eet_Connection *conn,
  * @see eet_data_node_encode_cipher
  *
  * @since 1.2.4
- * @ingroup Eet_Connection_Group
  */
 EAPI Eina_Bool
 eet_connection_node_send(Eet_Connection *conn,
@@ -4831,13 +4832,13 @@ eet_connection_node_send(Eet_Connection *conn,
                          const char *cipher_key);
 
 /**
- * Close a connection and lost its track.
+ * @ingroup Eet_Connection_Group
+ * @brief Closes a connection and lost its track.
  * @param conn Connection handler to close.
  * @param on_going Signal if a partial packet wasn't completed.
  * @return the user_data passed to both callback.
  *
  * @since 1.2.4
- * @ingroup Eet_Connection_Group
  */
 EAPI void *
 eet_connection_close(Eet_Connection *conn,