diff --git a/config/config.sample.php b/config/config.sample.php
index 10b079caa8..35aacc31b6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -48,15 +48,15 @@ $CONFIG = array(
 'instanceid' => '',
 
  /**
- * The salt used to hash all passwords, auto-generated by the ownCloud
- * installer. (There are also per-user salts.) If you lose this salt you lose
- * all your passwords. This example is for documentation only,
- * and you should never use it.
- *
- * @deprecated This salt is deprecated and only used for legacy-compatibility, developers
- * should *NOT* use this value for anything nowadays.
- *
- *'passwordsalt' => 'd3c944a9af095aa08f',
+  * The salt used to hash all passwords, auto-generated by the ownCloud
+  * installer. (There are also per-user salts.) If you lose this salt you lose
+  * all your passwords. This example is for documentation only, and you should
+  * never use it.
+  *
+  * @deprecated This salt is deprecated and only used for legacy-compatibility,
+  * developers should *NOT* use this value for anything nowadays.
+  *
+  * 'passwordsalt' => 'd3c944a9af095aa08f',
  */
 'passwordsalt' => '',
 
@@ -80,8 +80,8 @@ $CONFIG = array(
 
 /**
  * Where user files are stored; this defaults to ``data/`` in the ownCloud
- * directory. The SQLite database is also stored here, when you use SQLite. (SQLite is
- * available only in ownCloud Community Edition)
+ * directory. The SQLite database is also stored here, when you use SQLite.
+ * (SQLite is available only in ownCloud Community Edition)
  */
 'datadirectory' => '/var/www/owncloud/data',
 
@@ -145,8 +145,8 @@ $CONFIG = array(
 ),
 
 /**
- * sqlite3 journal mode can be specified using this config parameter - can be 'WAL' or 'DELETE'
- * see for more details https://www.sqlite.org/wal.html
+ * sqlite3 journal mode can be specified using this config parameter - can be
+ * 'WAL' or 'DELETE' see for more details https://www.sqlite.org/wal.html
  */
 'sqlite.journal_mode' => 'DELETE',
 
@@ -512,8 +512,9 @@ $CONFIG = array(
  * Default is within the tmp directory. The file is named in the following way
  *   owncloud-server-$INSTANCEID-cron.lock
  * where $INSTANCEID is the string specified in the instanceid field.
- * Because the cron lock file is accessed in regular intervals, it may prevent enabled disk drives from spinning down.
- * A different location for this file can solve such issues.
+ * Because the cron lock file is accessed in regular intervals, it may prevent
+ * enabled disk drives from spinning down. A different location for this file
+ * can solve such issues.
  */
 'cron.lockfile.location' => '',
 
@@ -812,8 +813,8 @@ $CONFIG = array(
 
 /**
  * Server details for one or more memcached servers to use for memory caching.
- * Memcache is only used if other memory cache options (xcache, apc, apcu, redis) are
- * not available.
+ * Memcache is only used if other memory cache options (xcache, apc, apcu,
+ * redis) are not available.
  */
 'memcached_servers' => array(
 	// hostname, port and optional weight. Also see: