Merge branch 'v1.0.x'

diff --git a/Doxyfile b/Doxyfile
index 3b67c46e7bf993746e94727f89c481e72a084536..d0ed1883c77f2c991034c657cb544dbd4b86f4b9 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -100,7 +100,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = php_propro.h
+INPUT                  = php_propro.h src
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO

diff --git a/src/php_propro_api.h b/src/php_propro_api.h
index d82055ffa6d5c01b7bb98e02796221a66d2bf2c5..2c03c0f8e9a73d1ac9f863e7616fbb62b712735b 100644 (file)
--- a/src/php_propro_api.h
+++ b/src/php_propro_api.h
@@ -35,7 +35,7 @@ typedef struct php_property_proxy php_property_proxy_t;
  * member accessible by reference from PHP userland.
  *
  * Example:
- * ~~~~~~~~~~{.c}
+ * \code{.c}
  * static zval *my_read_prop(zval *object, zval *member, int type, void **cache_slot, zval *tmp)
  * {
  *    zval *return_value;
@@ -59,7 +59,7 @@ typedef struct php_property_proxy php_property_proxy_t;
  *
  *    return return_value;
  * }
- * ~~~~~~~~~~
+ * \endcode
  */
 struct php_property_proxy_object {
        /** The actual property proxy */