Merge branch 'master' into external_datasource

.travis.yml

@@ -49,9 +49,10 @@ script:
 
 after_success:
    - git clone --depth=50 -b gh-pages https://$GITAUTH@github.com/acplt/open62541
-   - rm -rf open62541/doxygen
-   - cp -r doc open62541/doxygen
-   - cd open62541/doxygen
+   - git rm -rf open62541/doxygen
+   - git rm -rf open62541/doc
+   - cp -r doc open62541/doc
+   - cd open62541/doc
    - git config --global user.email "open62541-travis-ci@users.noreply.github.com"
    - git config --global user.name "Open62541 travis-ci"
    - git config --global push.default simple

doc/Doxyfile.in

@@ -805,7 +805,7 @@ EXCLUDE_SYMLINKS       = YES
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = */cov-int/*
+EXCLUDE_PATTERNS       = */cov-int/* */ongoing/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

include/ua_connection.h

@@ -22,7 +22,11 @@ extern "C" {
 
 #include "ua_types.h"
 
-/** @defgroup connection Connection */
+/** @defgroup communication Communication */
+
+/**
+ * @ingroup communication
+ * @defgroup connection Connection */
 
 /** Used for zero-copy communication. The array of bytestrings is sent over the
    network as a single buffer. */

include/ua_log.h

@@ -23,6 +23,8 @@ extern "C" {
 #include "ua_config.h"
 
 /**
+ * @ingroup server
+ *
  * @defgroup logging Logging
  *
  * @brief Logging functionality is externally provided to the open62541 libary.

src/server/ua_services.h

@@ -7,6 +7,7 @@
 #include "ua_session.h"
 
 /**
+ * @ingroup server
  * @defgroup services Services
  *
  * @brief This module describes all the services used to communicate in in OPC UA.

src/ua_securechannel.h

@@ -7,7 +7,7 @@
 #include "ua_connection.h"
 
 /**
- *  @ingroup internal
+ *  @ingroup communication
  *
  *  @defgroup securechannel SecureChannel
  */

src/ua_session.h

@@ -5,7 +5,7 @@
 #include "ua_securechannel.h"
 
 /**
- *  @ingroup internal
+ *  @ingroup communication
  *
  *  @defgroup session Session
  */