aboutsummaryrefslogtreecommitdiffstats
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)
downloadefl-4bc0210bd31ed1de6554441562bd93ea863ee9d9.tar.gz
efl-4bc0210bd31ed1de6554441562bd93ea863ee9d9.tar.xz
efl-4bc0210bd31ed1de6554441562bd93ea863ee9d9.zip
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 c93922a0c..ce06e1ebf 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -806,7 +806,9 @@ evas_ _evas_ Evas_ _Evas_ EVAS_ _EVAS_ \
eet_ _eet_ Eet_ _Eet_ EET_ _EET_ \
ecore_ _ecore_ Ecore_ _Ecore_ ECORE_ _ECORE_ \
eio_ _eio_ Eio_ _Eio_ EIO_ _EIO_ \
-edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_
+edbus_ _edbus_ EDBus_ _EDBus_ EDBUS_ _EDBUS_ \
+efreet_ _efreet_ Efreet_ _Efreet_ EFREET_ _EFREET_
+
#---------------------------------------------------------------------------
# configuration options related to the HTML output
@@ -914,13 +916,13 @@ DOCSET_FEEDNAME = "Doxygen generated docs"
# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
# will append .docset to the name.
-DOCSET_BUNDLE_ID = org.enlightenment.Eina
+DOCSET_BUNDLE_ID = org.enlightenment.Efl
# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
# the documentation publisher. This should be a reverse domain-name style
# string, e.g. com.mycompany.MyDocSet.documentation.
-DOCSET_PUBLISHER_ID = org.enlightenment.Eina
+DOCSET_PUBLISHER_ID = org.enlightenment.Ef;
# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
@@ -987,7 +989,7 @@ QCH_FILE =
# Qt Help Project output. For more information please see
# http://doc.trolltech.com/qthelpproject.html#namespace
-QHP_NAMESPACE = org.enlightenment.Eina
+QHP_NAMESPACE = org.enlightenment.Efl
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
# Qt Help Project output. For more information please see
@@ -1038,7 +1040,7 @@ GENERATE_ECLIPSEHELP = NO
# the directory name containing the HTML and XML files should also have
# this name.
-ECLIPSE_DOC_ID = org.enlightenment.Eina
+ECLIPSE_DOC_ID = org.enlightenment.Efl
# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
# top of each HTML page. The value NO (the default) enables the index and
@@ -1422,7 +1424,8 @@ PREDEFINED = EINA_MAGIC_DEBUG \
EINA_WARN_UNUSED_RESULT= \
EAPI= \
EINA_PURE= \
- EINA_CONST=
+ EINA_CONST= \
+ EINA_UNUSED=
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# 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 0b10bae8e..ef54b214f 100644
--- a/doc/main.dox
+++ b/doc/main.dox
@@ -17,6 +17,7 @@
* @li @ref evil_main microsoft windows portability layer.
* @li @ref eio_main asynchronous input/output
* @li @ref edbus_main d-bus integration.
+ * @li @ref efreet_main freedesktop.org (xdg) menu and desktop integration.
*
*/
@@ -77,8 +78,8 @@
* @author Mike McCormack <mj.mccormack@@samsung.com>
* @author Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@@samsung.com> <myoungwoon@@gmail.com>
* @author Myungjae Lee <mjae.lee@@samsung.com>
- * @author Nathan Ingersoll <ningerso@@d.umn.edu>
- * @author Nathan Ingersoll <rbdpngn@@users.sourceforge.net>
+ * @author Nathan 'RbdPngn' Ingersoll <ningerso@@d.umn.edu>
+ * @author Nicholas 'Mekius' Hughart
* @author Nicholas Curran <quasar@@bigblue.net.au>
* @author Nicolas Aguirre <aguirre.nicolas@@gmail.com>
* @author Peter Wehrfritz <peter.wehrfritz@@web.de>
@@ -91,7 +92,6 @@
* @author Samsung SAIT
* @author Sangho Park <gouache95@gmail.com>
* @author Sebastian Dransfeld <sd@@tango.flipp.net>
- * @author Sebastian Dransfeld <sebastid@@tango.flipp.net>
* @author Seungsoo Woo <om101.woo@@samsung.com>
* @author Shilpa Singh <shilpa.singh@@samsung.com> <shilpasingh.o@@gmail.com>
* @author Simon Poole <simon.armlinux@@themalago.net>
@@ -177,3 +177,9 @@
*
* @brief D-Bus integration with EFL (Ecore).
*/
+
+/**
+ * @defgroup Efreet
+ *
+ * @brief FreeDesktop.Org (XDG) menu and desktop integration.
+ */