diff --git a/config/config.apps.sample.php b/config/config.apps.sample.php
new file mode 100644
index 000000000000..75bd59fca4d2
--- /dev/null
+++ b/config/config.apps.sample.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This configuration file is only provided to document the different
+ * configuration options and their usage for apps maintained by ownCloud.
+ *
+ * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THESE SAMPLES. THIS MAY BREAK
+ * YOUR INSTANCE. Instead, manually copy configuration switches that you
+ * consider important for your instance to your working ``config.php``, and
+ * apply configuration options that are pertinent for your instance.
+ *
+ * All keys are only valid if the corresponding app is installed and enabled.
+ * You MUST copy the keys needed to the active config.php file.
+ * 
+ * This file is used to generate the configuration documentation.
+ * Please consider following requirements of the current parser:
+ *  * all comments need to start with `/**` and end with ` *\/` - each on their
+ *    own line
+ *  * add a `@see CONFIG_INDEX` to copy a previously described config option
+ *    also to this line
+ *  * everything between the ` *\/` and the next `/**` will be treated as the
+ *    config option
+ *  * use RST syntax
+ */
+
+$CONFIG = array(
+
+/**
+ * App: Activity
+ *
+ * Retention for activities of the activity app
+ * 
+ * activity_expire_days: days
+ */
+
+'activity_expire_days' => 365,
+
+/**
+ * App: LDAP
+ *
+ * 
+ * ldapIgnoreNamingRules: 'doSet' or false
+ * user_ldap.enable_medial_search: true or false
+ */
+
+'ldapIgnoreNamingRules' => false,
+'user_ldap.enable_medial_search' => false,
+
+/**
+ * App: Market
+ *
+ * Configuring the download URL for apps
+ * 
+ * appstoreurl: URL
+ */
+
+'appstoreurl' => 'https://marketplace.owncloud.com',
+
+/**
+ * App: Firstrunwizard
+ * 
+ * Configuring the download links for ownCloud clients, 
+ * as seen in the first-run wizard and on Personal pages
+ * 
+ * customclient_desktop: URL
+ * customclient_android: URL
+ * customclient_ios: URL
+ */
+ 
+'customclient_desktop' =>
+	'https://owncloud.org/install/#install-clients',
+'customclient_android' =>
+	'https://play.google.com/store/apps/details?id=com.owncloud.android',
+'customclient_ios' =>
+	'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8',
+
+/**
+ * App: Richdocuments
+ *
+ * Configuring the group name for users allowed to use collabora
+ * 
+ * collabora_group: string
+ */
+
+'collabora_group' => '',
+
+
+);
diff --git a/config/config.sample.php b/config/config.sample.php
index 00ce45d61bc9..087ef5f8fe3b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -2,7 +2,7 @@
 
 /**
  * This configuration file is only provided to document the different
- * configuration options and their usage.
+ * configuration options and their usage for the core system.
  *
  * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK
  * YOUR INSTANCE. Instead, manually copy configuration switches that you
@@ -716,16 +716,6 @@
  * Some of the ownCloud code may be stored in alternate locations.
  */
 
-/**
- * This section is for configuring the download links for ownCloud clients, as
- * seen in the first-run wizard and on Personal pages.
- */
-'customclient_desktop' =>
-	'https://owncloud.org/install/#install-clients',
-'customclient_android' =>
-	'https://play.google.com/store/apps/details?id=com.owncloud.android',
-'customclient_ios' =>
-	'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8',
 
 /**
  * If you want to store apps in a custom directory instead of ownCloud’s default 
@@ -980,7 +970,7 @@
 	'port' => 6379,
 	'timeout' => 0.0,
 	'password' => '', // Optional, if not defined no password will be used.
-	'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
+	'dbindex' => 0,   // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
 ],
 
 /**
@@ -992,8 +982,8 @@
  * Redis Cluster support requires the php module phpredis in version 3.0.0 or higher.
  *
  * Available failover modes:
- *  - \RedisCluster::FAILOVER_NONE - only send commands to master nodes (default)
- *  - \RedisCluster::FAILOVER_ERROR - failover to slaves for read commands if master is unavailable
+ *  - \RedisCluster::FAILOVER_NONE       - only send commands to master nodes (default)
+ *  - \RedisCluster::FAILOVER_ERROR      - failover to slaves for read commands if master is unavailable
  *  - \RedisCluster::FAILOVER_DISTRIBUTE - randomly distribute read commands across master and slaves
  */
 'redis.cluster' => [