summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-29 23:04:40 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-29 23:04:40 +0000
commit4bc0210bd31ed1de6554441562bd93ea863ee9d9 (patch)
tree5d83be12538f8c8d3816bbf65916ce383d050c2e /doc
parent727ddbeaf0c53f31cd62c254fdebe26823d537eb (diff)
efl: merge efreet.
seems to be fine, pass distcheck and friends. please report. changes: - documentation hierarchy fixes - replaced __UNUSED__ with EINA_UNUSED - replaced PKG_DATA_DIR with PACKAGE_DATA_DIR"/efreet" SVN revision: 81889
Diffstat (limited to 'doc')
-rw-r--r--doc/Doxyfile.in15
-rw-r--r--doc/main.dox12
2 files changed, 18 insertions, 9 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index c93922a0c2..ce06e1ebf7 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -806,7 +806,9 @@ evas_ _evas_ Evas_ _Evas_ EVAS_ _EVAS_ \
806eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \ 806eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \
807ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \ 807ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \
808eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \ 808eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
809edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ 809edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
810efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_
811
810 812
811#--------------------------------------------------------------------------- 813#---------------------------------------------------------------------------
812# configuration options related to the HTML output 814# configuration options related to the HTML output
@@ -914,13 +916,13 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
914# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 916# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
915# will append .docset to the name. 917# will append .docset to the name.
916 918
917DOCSET_BUNDLE_ID = org.enlightenment.Eina 919DOCSET_BUNDLE_ID = org.enlightenment.Efl
918 920
919# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify 921# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
920# the documentation publisher. This should be a reverse domain-name style 922# the documentation publisher. This should be a reverse domain-name style
921# string, e.g. com.mycompany.MyDocSet.documentation. 923# string, e.g. com.mycompany.MyDocSet.documentation.
922 924
923DOCSET_PUBLISHER_ID = org.enlightenment.Eina 925DOCSET_PUBLISHER_ID = org.enlightenment.Ef;
924 926
925# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. 927# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
926 928
@@ -987,7 +989,7 @@ QCH_FILE =
987# Qt Help Project output. For more information please see 989# Qt Help Project output. For more information please see
988# http://doc.trolltech.com/qthelpproject.html#namespace 990# http://doc.trolltech.com/qthelpproject.html#namespace
989 991
990QHP_NAMESPACE = org.enlightenment.Eina 992QHP_NAMESPACE = org.enlightenment.Efl
991 993
992# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 994# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
993# Qt Help Project output. For more information please see 995# Qt Help Project output. For more information please see
@@ -1038,7 +1040,7 @@ GENERATE_ECLIPSEHELP = NO
1038# the directory name containing the HTML and XML files should also have 1040# the directory name containing the HTML and XML files should also have
1039# this name. 1041# this name.
1040 1042
1041ECLIPSE_DOC_ID = org.enlightenment.Eina 1043ECLIPSE_DOC_ID = org.enlightenment.Efl
1042 1044
1043# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 1045# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
1044# top of each HTML page. The value NO (the default) enables the index and 1046# top of each HTML page. The value NO (the default) enables the index and
@@ -1422,7 +1424,8 @@ PREDEFINED = EINA_MAGIC_DEBUG \
1422 EINA_WARN_UNUSED_RESULT= \ 1424 EINA_WARN_UNUSED_RESULT= \
1423 EAPI= \ 1425 EAPI= \
1424 EINA_PURE= \ 1426 EINA_PURE= \
1425 EINA_CONST= 1427 EINA_CONST= \
1428 EINA_UNUSED=
1426 1429
1427# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 1430# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
1428# this tag can be used to specify a list of macro names that should be expanded. 1431# this tag can be used to specify a list of macro names that should be expanded.
diff --git a/doc/main.dox b/doc/main.dox
index 0b10bae8ea..ef54b214fa 100644
--- a/doc/main.dox
+++ b/doc/main.dox
@@ -17,6 +17,7 @@
17 * @li @ref evil_main microsoft windows portability layer. 17 * @li @ref evil_main microsoft windows portability layer.
18 * @li @ref eio_main asynchronous input/output 18 * @li @ref eio_main asynchronous input/output
19 * @li @ref edbus_main d-bus integration. 19 * @li @ref edbus_main d-bus integration.
20 * @li @ref efreet_main freedesktop.org (xdg) menu and desktop integration.
20 * 21 *
21 */ 22 */
22 23
@@ -77,8 +78,8 @@
77 * @author Mike McCormack <mj.mccormack@@samsung.com> 78 * @author Mike McCormack <mj.mccormack@@samsung.com>
78 * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com> 79 * @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com>
79 * @author Myungjae Lee <mjae.lee@@samsung.com> 80 * @author Myungjae Lee <mjae.lee@@samsung.com>
80 * @author Nathan Ingersoll <ningerso@@d.umn.edu> 81 * @author Nathan 'RbdPngn' Ingersoll <ningerso@@d.umn.edu>
81 * @author Nathan Ingersoll <rbdpngn@@users.sourceforge.net> 82 * @author Nicholas 'Mekius' Hughart
82 * @author Nicholas Curran <quasar@@bigblue.net.au> 83 * @author Nicholas Curran <quasar@@bigblue.net.au>
83 * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com> 84 * @author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
84 * @author Peter Wehrfritz <peter.wehrfritz@@web.de> 85 * @author Peter Wehrfritz <peter.wehrfritz@@web.de>
@@ -91,7 +92,6 @@
91 * @author Samsung SAIT 92 * @author Samsung SAIT
92 * @author Sangho Park <gouache95@gmail.com> 93 * @author Sangho Park <gouache95@gmail.com>
93 * @author Sebastian Dransfeld <sd@@tango.flipp.net> 94 * @author Sebastian Dransfeld <sd@@tango.flipp.net>
94 * @author Sebastian Dransfeld <sebastid@@tango.flipp.net>
95 * @author Seungsoo Woo <om101.woo@@samsung.com> 95 * @author Seungsoo Woo <om101.woo@@samsung.com>
96 * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com> 96 * @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com>
97 * @author Simon Poole <simon.armlinux@@themalago.net> 97 * @author Simon Poole <simon.armlinux@@themalago.net>
@@ -177,3 +177,9 @@
177 * 177 *
178 * @brief D-Bus integration with EFL (Ecore). 178 * @brief D-Bus integration with EFL (Ecore).
179 */ 179 */
180
181/**
182 * @defgroup Efreet
183 *
184 * @brief FreeDesktop.Org (XDG) menu and desktop integration.
185 */