Merge "Doxygen grouping" into devel/master

diff --combined dali-toolkit/public-api/controls/text-controls/text-field.h
index 5406361,5ef4432..7b9d11b
--- 1/dali-toolkit/public-api/controls/text-controls/text-field.h
--- 2/dali-toolkit/public-api/controls/text-controls/text-field.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.h
@@@ -31,6 -31,10 +31,10 @@@ namespace Internal DALI_INTERNA
  {
  class TextField;
  }
+ /**
+  * @addtogroup dali-toolkit-controls-text-controls
+  * @{
+  */
  
  /**
   * @brief A control which provides a single-line editable text field.
@@@ -67,7 -71,7 +71,7 @@@ public
        PLACEHOLDER_TEXT,                         ///< name "placeholder-text",                    The text to display when the TextField is empty and inactive,             type STRING
        PLACEHOLDER_TEXT_FOCUSED,                 ///< name "placeholder-text-focused",            The text to display when the TextField is empty with key-input focus,     type STRING
        FONT_FAMILY,                              ///< name "font-family",                         The requested font family,                                                type STRING
 -      FONT_STYLE,                               ///< name "font-style",                          The requested font style e.g. Regular/Italic,                             type STRING
 +      FONT_STYLE,                               ///< name "font-style",                          The requested font style,                                                 type STRING
        POINT_SIZE,                               ///< name "point-size",                          The size of font in points,                                               type FLOAT
        MAX_LENGTH,                               ///< name "max-length"                           The maximum number of characters that can be inserted,                    type INTEGER
        EXCEED_POLICY,                            ///< name "exceed-policy"                        Specifies how the text is truncated when it does not fit,                 type INTEGER
@@@ -201,6 -205,9 +205,9 @@@ public: // Not intended for applicatio
    explicit DALI_INTERNAL TextField( Dali::Internal::CustomActor* internal );
  };
  
+ /**
+  * @}
+  */
  } // namespace Toolkit
  
  } // namespace Dali

diff --combined dali-toolkit/public-api/controls/text-controls/text-label.h
index f882e55,592cfed..7669b05
--- 1/dali-toolkit/public-api/controls/text-controls/text-label.h
--- 2/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@@ -31,6 -31,10 +31,10 @@@ namespace Internal DALI_INTERNA
  {
  class TextLabel;
  }
+ /**
+  * @addtogroup dali-toolkit-controls-text-controls
+  * @{
+  */
  
  /**
   * @brief A control which renders a short text string.
@@@ -60,7 -64,7 +64,7 @@@ public
        RENDERING_BACKEND = PROPERTY_START_INDEX, ///< name "rendering-backend",    The type or rendering e.g. bitmap-based,          type INT
        TEXT,                                     ///< name "text",                 The text to display in UTF-8 format,              type STRING
        FONT_FAMILY,                              ///< name "font-family",          The requested font family,                        type STRING
 -      FONT_STYLE,                               ///< name "font-style",           The requested font style e.g. Regular/Italic,     type STRING
 +      FONT_STYLE,                               ///< name "font-style",           The requested font style,                         type STRING
        POINT_SIZE,                               ///< name "point-size",           The size of font in points,                       type FLOAT
        MULTI_LINE,                               ///< name "multi-line",           The single-line or multi-line layout option,      type BOOLEAN
        HORIZONTAL_ALIGNMENT,                     ///< name "horizontal-alignment", The line horizontal alignment,                    type STRING,  values "BEGIN", "CENTER", "END"
@@@ -144,6 -148,9 +148,9 @@@ public: // Not intended for applicatio
    explicit DALI_INTERNAL TextLabel( Dali::Internal::CustomActor* internal );
  };
  
+ /**
+  * @}
+  */
  } // namespace Toolkit
  
  } // namespace Dali