From c54b95497f0b3f6d609b0be56e57d154d588e369 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 26 Aug 2015 16:18:44 +0200
Subject: [PATCH] Switch constant DEBUG to proper config option

* see owncloud/core#18510
---
 admin_manual/issues/index.rst          |  4 ++--
 developer_manual/app/tutorial.rst      |  8 ++++++--
 developer_manual/core/configfile.rst   |  2 --
 developer_manual/general/debugging.rst | 10 ++++++++--
 developer_manual/general/devenv.rst    |  8 ++++++--
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/admin_manual/issues/index.rst b/admin_manual/issues/index.rst
index f889378ec..15e118e98 100644
--- a/admin_manual/issues/index.rst
+++ b/admin_manual/issues/index.rst
@@ -49,11 +49,11 @@ information on these log levels.
 
 Some logging - for example JavaScript console logging - needs manually editing the
 configuration file.
-Edit :file:`config/config.php` and add ``define('DEBUG', true);``::
+Edit :file:`config/config.php` and set ``debug`` to ``true``::
 
     <?php
-    define('DEBUG',true);
     $CONFIG = array (
+        'debug' => true,
         ... configuration goes here ...
     );
 
diff --git a/developer_manual/app/tutorial.rst b/developer_manual/app/tutorial.rst
index 18af1acfe..43f45fc38 100644
--- a/developer_manual/app/tutorial.rst
+++ b/developer_manual/app/tutorial.rst
@@ -15,9 +15,13 @@ After the `development tool <https://github.com/owncloud/ocdev/blob/master/READM
 
 .. note:: $BRANCH is the desired ownCloud branch (e.g. stable7 for ownCloud 7, stable8 for ownCloud 8, etc)
 
-First you want to enable debug mode to get proper error messages. To do that add **DEFINE('DEBUG', true);** at the end of the **owncloud/config/config.php** file::
+First you want to enable debug mode to get proper error messages. To do that set ``debug`` to ``true`` in the **owncloud/config/config.php** file::
 
-    echo "\nDEFINE('DEBUG', true);" >> owncloud/config/config.php
+    <?php
+    $CONFIG = array (
+        'debug' => true,
+        ... configuration goes here ...
+    );
 
 .. note:: PHP errors are logged to **owncloud/data/owncloud.log**
 
diff --git a/developer_manual/core/configfile.rst b/developer_manual/core/configfile.rst
index 45dd721d3..c0358f5a8 100644
--- a/developer_manual/core/configfile.rst
+++ b/developer_manual/core/configfile.rst
@@ -5,8 +5,6 @@ App config
 
   <?php
 
-  define("DEBUG", true);
-
   $CONFIG = array(
   /* Flag to indicate ownCloud is successfully installed (true = installed) */
   "installed" => false,
diff --git a/developer_manual/general/debugging.rst b/developer_manual/general/debugging.rst
index 76fc0c673..e78e5a0a6 100644
--- a/developer_manual/general/debugging.rst
+++ b/developer_manual/general/debugging.rst
@@ -4,9 +4,15 @@ Debugging
 Debug mode
 ----------
 
-When debug mode is enabled in ownCloud, a variety of debugging features are enabled - see debugging documentation. Add the following to the very end of :file:`/config/config.php` to enable it::
+When debug mode is enabled in ownCloud, a variety of debugging features are enabled - see debugging documentation. Set ``debug`` to ``true`` in :file:`/config/config.php` to enable it:
 
-  define( "DEBUG", 1);
+.. code-block:: php
+
+  <?php
+  $CONFIG = array (
+      'debug' => true,
+      ... configuration goes here ...
+  );
 
 
 Identifying errors
diff --git a/developer_manual/general/devenv.rst b/developer_manual/general/devenv.rst
index 7707e80ff..ad25984c0 100644
--- a/developer_manual/general/devenv.rst
+++ b/developer_manual/general/devenv.rst
@@ -81,9 +81,13 @@ Enabling debug mode
 
 .. note:: Do not enable this for production! This can create security problems and is only meant for debugging and development!
 
-To disable JavaScript and CSS caching debugging has to be enabled in :file:`core/config/config.php` by adding this to the end of the file::
+To disable JavaScript and CSS caching debugging has to be enabled by setting ``debug`` to ``true`` in :file:`core/config/config.php`::
 
-  DEFINE('DEBUG', true);
+  <?php
+  $CONFIG = array (
+      'debug' => true,
+      ... configuration goes here ...
+  );
 
 Keep the code up-to-date
 ------------------------