From 37c23632c35f0c77ba6e0f3ba98bfd53efa7ba0d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 11:37:26 +0100 Subject: added missing config metadata FS#2383 Translators need to add another string. --- conf/dokuwiki.php | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 298c8e572..41f0fd566 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -18,6 +18,7 @@ $conf['dmode'] = 0755; //set directory creation mode $conf['lang'] = 'en'; //your language $conf['basedir'] = ''; //absolute dir from serveroot - blank for autodetection $conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect +$conf['cookiedir'] = ''; //Cookie path. Leave blank for using baseurl. $conf['savedir'] = './data'; //where to store all the files $conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1 $conf['mediarevisions'] = 1; //enable/disable media revisions -- cgit v1.2.3 From eb20307ad68614b8834c804eeade389967db5ed4 Mon Sep 17 00:00:00 2001 From: Dominik Eckelmann Date: Sun, 8 Jan 2012 14:38:52 +0100 Subject: removed xmlrpc and xmlrpcuser - added remote and remoteuser config option --- conf/dokuwiki.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 298c8e572..4238f7e53 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -78,8 +78,8 @@ $conf['sneaky_index'] = 0; //check for namespace read permission i $conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view $conf['securecookie'] = 1; //never send HTTPS cookies via HTTP -$conf['xmlrpc'] = 0; //Enable/disable XML-RPC interface -$conf['xmlrpcuser'] = '!!not set!!'; //Restrict XML-RPC access to this groups/users +$conf['remote'] = 0; //Enable/disable remote interfaces +$conf['remoteuser'] = '!!not set !!'; //user/groups that have access to remote interface (comma separated) /* Advanced Options */ -- cgit v1.2.3 From 91e9045718073c3a4ad4ce581e9192f0a87baaf7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 29 Jan 2012 19:15:13 +0000 Subject: added two new config options: tagline and sidebar Templates authors should support these to make the transition between templates easier. Templates which already have a sidebar could first check for $conf['sidebar'] and use it if it's defined, otherwise use their old own sidebar functionality to stay backwards-compatible. --- conf/dokuwiki.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 41f0fd566..7a7e4bf1a 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -28,6 +28,8 @@ $conf['mediarevisions'] = 1; //enable/disable media revisions $conf['start'] = 'start'; //name of start page $conf['title'] = 'DokuWiki'; //what to show in the title $conf['template'] = 'default'; //see lib/tpl directory +$conf['tagline'] = ''; //tagline in header (if template supports it) +$conf['sidebar'] = 'sidebar'; //name of sidebar in root namespace (if template supports it) $conf['license'] = 'cc-by-nc-sa'; //see conf/license.php $conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1 $conf['recent'] = 20; //how many entries to show in recent -- cgit v1.2.3 From a7c93226bd0fa1293e1dc99e679390dc2f8d803c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 2 Mar 2012 08:08:29 +0100 Subject: make RSS contents (media/pages) configurable --- conf/dokuwiki.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 7a7e4bf1a..8da818638 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -127,14 +127,18 @@ $conf['rss_linkto'] = 'diff'; //what page RSS entries link to: // 'page' - the revised page itself // 'rev' - page showing all revisions // 'current' - most recent revision of page -$conf['rss_content'] = 'abstract'; // what to put in the items by default? +$conf['rss_content'] = 'abstract'; //what to put in the items by default? // 'abstract' - plain text, first paragraph or so // 'diff' - plain text unified diff wrapped in 
 tags
                                          //  'htmldiff' - diff as HTML table
                                          //  'html'     - the full page rendered in XHTML
+$conf['rss_media']   = 'both';           //what should be listed?
+                                         //  'both'     - page and media changes
+                                         //  'pages'    - page changes only
+                                         //  'media'    - media changes only
 $conf['rss_update'] = 5*60;              //Update the RSS feed every n seconds (defaults to 5 minutes)
-$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
 $conf['rss_show_summary'] = 1;           //Add revision summary to title? 0|1
+$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
 $conf['broken_iua']  = 0;                //Platform with broken ignore_user_abort (IIS+CGI) 0|1
 $conf['xsendfile']   = 0;                //Use X-Sendfile (1 = lighttpd, 2 = standard)
 $conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generation
-- 
cgit v1.2.3


From 1cbac89c9507d874eec8bd832f6ac734b3140471 Mon Sep 17 00:00:00 2001
From: Andreas Gohr 
Date: Sat, 10 Mar 2012 16:55:05 +0100
Subject: make new template the default

---
 conf/dokuwiki.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 7a7e4bf1a..2eb43f535 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -27,7 +27,7 @@ $conf['mediarevisions'] = 1;              //enable/disable media revisions
 
 $conf['start']       = 'start';           //name of start page
 $conf['title']       = 'DokuWiki';        //what to show in the title
-$conf['template']    = 'default';         //see lib/tpl directory
+$conf['template']    = 'dokuwiki';        //see lib/tpl directory
 $conf['tagline']     = '';                //tagline in header (if template supports it)
 $conf['sidebar']     = 'sidebar';         //name of sidebar in root namespace (if template supports it)
 $conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
-- 
cgit v1.2.3