summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Mazoyer <gmazoyer@gravitons.in>2014-08-05 17:16:49 +0200
committerGuillaume Mazoyer <gmazoyer@gravitons.in>2014-08-05 17:16:49 +0200
commitdf07d122fa1dafd9f80fb2a4b97f9db933faf110 (patch)
treea2fa6d4cbd54c0a1a9afc21dd639247aa60d831b
parent57426df53ccd8de915d94a5ca3b32ee4d44652f1 (diff)
parent37f461a2a4a5abfa49a392038465971114055bc6 (diff)
Merge pull request #5 from rboissat/master
Adding a disclaimer to example config file and moving out some defaults.
-rw-r--r--config.php.example5
-rw-r--r--includes/config.defaults.php3
2 files changed, 6 insertions, 2 deletions
diff --git a/config.php.example b/config.php.example
index 13f7b33..a0191de 100644
--- a/config.php.example
+++ b/config.php.example
@@ -1,4 +1,9 @@
<?php
+/* Main configuration file example.
+ *
+ * DO NOT EDIT NOR RENAME, please copy to 'config.php' and edit the new file!
+ *
+ */
// People to contact
$config['contact']['name'] = 'Example Support';
diff --git a/includes/config.defaults.php b/includes/config.defaults.php
index b58a650..60d783b 100644
--- a/includes/config.defaults.php
+++ b/includes/config.defaults.php
@@ -6,8 +6,7 @@ $config = array (
'frontpage' => array (
// CSS to use
'css' => 'css/style.css',
- // Title of the page
- 'title' => 'Looking Glass',
+ // Display the title
'show_title' => true,
// Show visitor IP address
'show_visitor_ip' => true,