Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into htmlmail

* master:
  extended some config options a bit, to make more clear what they do
  rearranged the config options

Conflicts:
	conf/dokuwiki.php
	lib/plugins/config/lang/en/lang.php
	lib/plugins/config/settings/config.metadata.php
  • Loading branch information...
commit 8aea63819532f5f49c22a3a225e18eb2640f1d71 2 parents ae7c596 + b5cc8f4
@splitbrain authored
View
166 conf/dokuwiki.php
@@ -7,39 +7,40 @@
*
* This is a piece of PHP code so PHP syntax applies!
*
- * For help with the configuration see http://www.dokuwiki.org/config
+ * For help with the configuration and a more detailed explanation of the various options
+ * see http://www.dokuwiki.org/config
*/
-/* Datastorage and Permissions */
-
-$conf['fmode'] = 0644; //set file creation mode
-$conf['dmode'] = 0755; //set directory creation mode
+/* Basic Settings */
+$conf['title'] = 'DokuWiki'; //what to show in the title
+$conf['start'] = 'start'; //name of start page
$conf['lang'] = 'en'; //your language
+$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
+$conf['savedir'] = './data'; //where to store all the files
$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['cookiedir'] = ''; //path to use in cookies - blank for basedir
+$conf['dmode'] = 0755; //set directory creation mode
+$conf['fmode'] = 0644; //set file creation mode
$conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1
-$conf['mediarevisions'] = 1; //enable/disable media revisions
-
-/* Display Options */
-$conf['start'] = 'start'; //name of start page
-$conf['title'] = 'DokuWiki'; //what to show in the title
-$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
-$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1
+/* Display Settings */
$conf['recent'] = 20; //how many entries to show in recent
+$conf['recent_days'] = 7; //How many days of recent changes to keep. (days)
$conf['breadcrumbs'] = 10; //how many recent visited pages to show
$conf['youarehere'] = 0; //show "You are here" navigation? 0|1
+$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1
$conf['typography'] = 1; //smartquote conversion 0=off, 1=doublequotes, 2=all quotes
-$conf['htmlok'] = 0; //may raw HTML be embedded? This may break layout and XHTML validity 0|1
-$conf['phpok'] = 0; //may PHP code be embedded? Never do this on the internet! 0|1
$conf['dformat'] = '%Y/%m/%d %H:%M'; //dateformat accepted by PHPs strftime() function
-$conf['signature'] = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki:config for details
+$conf['signature'] = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki page for details
+$conf['showuseras'] = 'loginname'; // 'loginname' users login name
+ // 'username' users full name
+ // 'email' e-mail address (will be obfuscated as per mailguard)
+ // 'email_link' e-mail address as a mailto: link (obfuscated)
$conf['toptoclevel'] = 1; //Level starting with and below to include in AutoTOC (max. 5)
$conf['tocminheads'] = 3; //Minimum amount of headlines that determines if a TOC is built
$conf['maxtoclevel'] = 3; //Up to which level include into AutoTOC (max. 5)
@@ -47,27 +48,10 @@
$conf['camelcase'] = 0; //Use CamelCase for linking? (I don't like it) 0|1
$conf['deaccent'] = 1; //deaccented chars in pagenames (1) or romanize (2) or keep (0)?
$conf['useheading'] = 0; //use the first heading in a page as its name
-$conf['refcheck'] = 1; //check for references before deleting media files
-$conf['refshow'] = 0; //how many references should be shown, 5 is a good value
-$conf['showuseras'] = 'loginname'; // 'loginname' users login name
- // 'username' users full name
- // 'email' e-mail address (will be obfuscated as per mailguard)
- // 'email_link' e-mail address as a mailto: link (obfuscated)
-
-/* Antispam Features */
-
-$conf['usewordblock']= 1; //block spam based on words? 0|1
-$conf['indexdelay'] = 60*60*24*5; //allow indexing after this time (seconds) default is 5 days
-$conf['relnofollow'] = 1; //use rel="nofollow" for external links?
-$conf['mailguard'] = 'hex'; //obfuscate email addresses against spam harvesters?
- //valid entries are:
- // 'visible' - replace @ with [at], . with [dot] and - with [dash]
- // 'hex' - use hex entities to encode the mail address
- // 'none' - do not obfuscate addresses
-$conf['iexssprotect']= 1; // check for JavaScript and HTML in uploaded files 0|1
-
-/* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */
+$conf['sneaky_index']= 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
+$conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes
+/* Authentication Settings */
$conf['useacl'] = 0; //Use Access Control Lists to restrict access?
$conf['autopasswd'] = 1; //autogenerate passwords and email them to user
$conf['authtype'] = 'plain'; //which authentication backend should be used
@@ -76,46 +60,59 @@
$conf['superuser'] = '!!not set!!'; //The admin can be user or @group or comma separated list user1,@group1,user2
$conf['manager'] = '!!not set!!'; //The manager can be user or @group or comma separated list user1,@group1,user2
$conf['profileconfirm'] = 1; //Require current password to confirm changes to user profile
+$conf['rememberme'] = 1; //Enable/disable remember me on login
$conf['disableactions'] = ''; //comma separated list of actions to disable
-$conf['sneaky_index'] = 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
$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['remote'] = 0; //Enable/disable remote interfaces
$conf['remoteuser'] = '!!not set !!'; //user/groups that have access to remote interface (comma separated)
-/* Advanced Options */
-
-$conf['updatecheck'] = 1; //automatically check for new releases?
-$conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal
-$conf['useslash'] = 0; //use slash instead of colon? only when rewrite is on
+/* Antispam Features */
+$conf['usewordblock']= 1; //block spam based on words? 0|1
+$conf['relnofollow'] = 1; //use rel="nofollow" for external links?
+$conf['indexdelay'] = 60*60*24*5; //allow indexing after this time (seconds) default is 5 days
+$conf['mailguard'] = 'hex'; //obfuscate email addresses against spam harvesters?
+ //valid entries are:
+ // 'visible' - replace @ with [at], . with [dot] and - with [dash]
+ // 'hex' - use hex entities to encode the mail address
+ // 'none' - do not obfuscate addresses
+$conf['iexssprotect']= 1; // check for JavaScript and HTML in uploaded files 0|1
+
+/* Editing Settings */
$conf['usedraft'] = 1; //automatically save a draft while editing (0|1)
-$conf['sepchar'] = '_'; //word separator character in page names; may be a
- // letter, a digit, '_', '-', or '.'.
-$conf['canonical'] = 0; //Should all URLs use full canonical http://... style?
-$conf['fnencode'] = 'url'; //encode filenames (url|safe|utf-8)
-$conf['autoplural'] = 0; //try (non)plural form of nonexisting files?
-$conf['compression'] = 'gz'; //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip)
- // bz2 generates smaller files, but needs more cpu-power
-$conf['cachetime'] = 60*60*24; //maximum age for cachefile in seconds (defaults to a day)
+$conf['htmlok'] = 0; //may raw HTML be embedded? This may break layout and XHTML validity 0|1
+$conf['phpok'] = 0; //may PHP code be embedded? Never do this on the internet! 0|1
$conf['locktime'] = 15*60; //maximum age for lockfiles (defaults to 15 minutes)
-$conf['fetchsize'] = 0; //maximum size (bytes) fetch.php may download from extern, disabled by default
-$conf['notify'] = ''; //send change info to this email (leave blank for nobody)
-$conf['registernotify'] = ''; //send info about newly registered users to this email (leave blank for nobody)
-$conf['mailfrom'] = ''; //use this email when sending mails
-$conf['mailprefix'] = ''; //use this as prefix of outgoing mails
-$conf['htmlmail'] = 1; //send HTML multipart mails
-$conf['gzip_output'] = 0; //use gzip content encodeing for the output xhtml (if allowed by browser)
+$conf['cachetime'] = 60*60*24; //maximum age for cachefile in seconds (defaults to a day)
+
+/* Link Settings */
+// Set target to use when creating links - leave empty for same window
+$conf['target']['wiki'] = '';
+$conf['target']['interwiki'] = '';
+$conf['target']['extern'] = '';
+$conf['target']['media'] = '';
+$conf['target']['windows'] = '';
+
+/* Media Settings */
+$conf['mediarevisions'] = 1; //enable/disable media revisions
+$conf['refcheck'] = 1; //check for references before deleting media files
+$conf['refshow'] = 0; //how many references should be shown, 5 is a good value
$conf['gdlib'] = 2; //the GDlib version (0, 1 or 2) 2 tries to autodetect
$conf['im_convert'] = ''; //path to ImageMagicks convert (will be used instead of GD)
$conf['jpg_quality'] = '70'; //quality of compression when scaling jpg images (0-100)
+$conf['fetchsize'] = 0; //maximum size (bytes) fetch.php may download from extern, disabled by default
+
+/* Notification Settings */
$conf['subscribers'] = 0; //enable change notice subscription support
$conf['subscribe_time'] = 24*60*60; //Time after which digests / lists are sent (in sec, default 1 day)
//Should be smaller than the time specified in recent_days
-$conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0
-$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8
-$conf['hidepages'] = ''; //Regexp for pages to be skipped from RSS, Search and Recent Changes
-$conf['send404'] = 0; //Send a HTTP 404 status for non existing pages?
+$conf['notify'] = ''; //send change info to this email (leave blank for nobody)
+$conf['registernotify'] = ''; //send info about newly registered users to this email (leave blank for nobody)
+$conf['mailfrom'] = ''; //use this email when sending mails
+$conf['mailprefix'] = ''; //use this as prefix of outgoing mails
+$conf['htmlmail'] = 1; //send HTML multipart mails
+
+/* Syndication Settings */
$conf['sitemap'] = 0; //Create a google sitemap? How often? In days.
$conf['rss_type'] = 'rss1'; //type of RSS feed to provide, by default:
// 'rss' - RSS 0.91
@@ -139,34 +136,41 @@
// 'media' - media changes only
$conf['rss_update'] = 5*60; //Update the RSS feed every n seconds (defaults to 5 minutes)
$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)
+
+/* Advanced Settings */
+$conf['updatecheck'] = 1; //automatically check for new releases?
+$conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal
+$conf['useslash'] = 0; //use slash instead of colon? only when rewrite is on
+$conf['sepchar'] = '_'; //word separator character in page names; may be a
+ // letter, a digit, '_', '-', or '.'.
+$conf['canonical'] = 0; //Should all URLs use full canonical http://... style?
+$conf['fnencode'] = 'url'; //encode filenames (url|safe|utf-8)
+$conf['autoplural'] = 0; //try (non)plural form of nonexisting files?
+$conf['compression'] = 'gz'; //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip)
+ // bz2 generates smaller files, but needs more cpu-power
+$conf['gzip_output'] = 0; //use gzip content encodeing for the output xhtml (if allowed by browser)
+$conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0
+$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8
+$conf['send404'] = 0; //Send a HTTP 404 status for non existing pages?
$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
-$conf['rememberme'] = 1; //Enable/disable remember me on login
-
-//Set target to use when creating links - leave empty for same window
-$conf['target']['wiki'] = '';
-$conf['target']['interwiki'] = '';
-$conf['target']['extern'] = '';
-$conf['target']['media'] = '';
-$conf['target']['windows'] = '';
+$conf['readdircache'] = 0; //time cache in second for the readdir operation, 0 to deactivate.
-//Proxy setup - if your Server needs a proxy to access the web set these
+/* Network Settings */
+// Proxy setup - if your Server needs a proxy to access the web set these
$conf['proxy']['host'] = '';
$conf['proxy']['port'] = '';
$conf['proxy']['user'] = '';
$conf['proxy']['pass'] = '';
$conf['proxy']['ssl'] = 0;
$conf['proxy']['except'] = '';
-
-/* Safemode Hack */
-
-$conf['safemodehack'] = 0; //read http://www.dokuwiki.org/config:safemodehack !
+// Safemode Hack - read http://www.dokuwiki.org/config:safemodehack !
+$conf['safemodehack'] = 0;
$conf['ftp']['host'] = 'localhost';
$conf['ftp']['port'] = '21';
$conf['ftp']['user'] = 'user';
$conf['ftp']['pass'] = 'password';
$conf['ftp']['root'] = '/home/user/htdocs';
-$conf['readdircache'] = 0; //time cache in second for the readdir opération, 0 to deactivate.
+
View
140 lib/plugins/config/lang/en/lang.php
@@ -36,6 +36,8 @@
$lang['_editing'] = 'Editing Settings';
$lang['_links'] = 'Link Settings';
$lang['_media'] = 'Media Settings';
+$lang['_notifications'] = 'Notification Settings';
+$lang['_syndication'] = 'Syndication Settings';
$lang['_advanced'] = 'Advanced Settings';
$lang['_network'] = 'Network Settings';
// The settings group name for plugins and templates can be set with
@@ -52,117 +54,128 @@
/* -------------------- Config Options --------------------------- */
-$lang['fmode'] = 'File creation mode';
-$lang['dmode'] = 'Directory creation mode';
+/* Basic Settings */
+$lang['title'] = 'Wiki title aka. your wiki\'s name';
+$lang['start'] = 'Page name to use as the starting point for each namespace';
$lang['lang'] = 'Interface language';
-$lang['basedir'] = 'Server path (eg. <code>/dokuwiki/</code>). Leave blank for autodetection.';
-$lang['baseurl'] = 'Server URL (eg. <code>http://www.yourserver.com</code>). Leave blank for autodetection.';
-$lang['savedir'] = 'Directory for saving data';
-$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.';
-$lang['start'] = 'Start page name';
-$lang['title'] = 'Wiki title';
-$lang['template'] = 'Template';
+$lang['template'] = 'Template aka. the design of the wiki.';
$lang['tagline'] = 'Tagline (if template supports it)';
$lang['sidebar'] = 'Sidebar page name (if template supports it), empty field disables the sidebar';
$lang['license'] = 'Under which license should your content be released?';
+$lang['savedir'] = 'Directory for saving data';
+$lang['basedir'] = 'Server path (eg. <code>/dokuwiki/</code>). Leave blank for autodetection.';
+$lang['baseurl'] = 'Server URL (eg. <code>http://www.yourserver.com</code>). Leave blank for autodetection.';
+$lang['cookiedir'] = 'Cookie path. Leave blank for using baseurl.';
+$lang['dmode'] = 'Directory creation mode';
+$lang['fmode'] = 'File creation mode';
+$lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>';
+
+/* Display Settings */
+$lang['recent'] = 'Number of entries per page in the recent changes';
+$lang['recent_days'] = 'How many recent changes to keep (days)';
+$lang['breadcrumbs'] = 'Number of "trace" breadcrumbs. Set to 0 to disable.';
+$lang['youarehere'] = 'Use hierarchical breadcrumbs (you probably want to disable the above option then)';
$lang['fullpath'] = 'Reveal full path of pages in the footer';
-$lang['recent'] = 'Recent changes';
-$lang['breadcrumbs'] = 'Number of breadcrumbs';
-$lang['youarehere'] = 'Hierarchical breadcrumbs';
$lang['typography'] = 'Do typographical replacements';
-$lang['htmlok'] = 'Allow embedded HTML';
-$lang['phpok'] = 'Allow embedded PHP';
$lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)';
-$lang['signature'] = 'Signature';
+$lang['signature'] = 'What to insert with the signature button in the editor';
+$lang['showuseras'] = 'What to display when showing the user that last edited a page';
$lang['toptoclevel'] = 'Top level for table of contents';
$lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built';
$lang['maxtoclevel'] = 'Maximum level for table of contents';
$lang['maxseclevel'] = 'Maximum section edit level';
$lang['camelcase'] = 'Use CamelCase for links';
-$lang['deaccent'] = 'Clean pagenames';
+$lang['deaccent'] = 'How to clean pagenames';
$lang['useheading'] = 'Use first heading for pagenames';
-$lang['refcheck'] = 'Media reference check';
-$lang['refshow'] = 'Number of media references to show';
-$lang['allowdebug'] = 'Allow debug <b>disable if not needed!</b>';
-$lang['mediarevisions'] = 'Enable Mediarevisions?';
+$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.';
+$lang['hidepages'] = 'Hide pages matching this regular expressions from search, the sitemap and other automatic indexes';
-$lang['usewordblock']= 'Block spam based on wordlist';
-$lang['indexdelay'] = 'Time delay before indexing (sec)';
-$lang['relnofollow'] = 'Use rel="nofollow" on external links';
-$lang['mailguard'] = 'Obfuscate email addresses';
-$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code';
-$lang['showuseras'] = 'What to display when showing the user that last edited a page';
-
-/* Authentication Options */
+/* Authentication Settings */
$lang['useacl'] = 'Use access control lists';
$lang['autopasswd'] = 'Autogenerate passwords';
$lang['authtype'] = 'Authentication backend';
$lang['passcrypt'] = 'Password encryption method';
-$lang['defaultgroup']= 'Default group';
+$lang['defaultgroup']= 'Default group, all new users will be placed in this group';
$lang['superuser'] = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings';
$lang['manager'] = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions';
$lang['profileconfirm'] = 'Confirm profile changes with password';
+$lang['rememberme'] = 'Allow permanent login cookies (remember me)';
$lang['disableactions'] = 'Disable DokuWiki actions';
$lang['disableactions_check'] = 'Check';
$lang['disableactions_subscription'] = 'Subscribe/Unsubscribe';
$lang['disableactions_wikicode'] = 'View source/Export Raw';
$lang['disableactions_other'] = 'Other actions (comma separated)';
-$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.';
$lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)';
$lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.';
$lang['remote'] = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.';
$lang['remoteuser'] = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.';
+/* Anti-Spam Settings */
+$lang['usewordblock']= 'Block spam based on wordlist';
+$lang['relnofollow'] = 'Use rel="nofollow" on external links';
+$lang['indexdelay'] = 'Time delay before indexing (sec)';
+$lang['mailguard'] = 'Obfuscate email addresses';
+$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code';
+
+/* Editing Settings */
+$lang['usedraft'] = 'Automatically save a draft while editing';
+$lang['htmlok'] = 'Allow embedded HTML';
+$lang['phpok'] = 'Allow embedded PHP';
+$lang['locktime'] = 'Maximum age for lock files (sec)';
+$lang['cachetime'] = 'Maximum age for cache (sec)';
+
+/* Link settings */
+$lang['target____wiki'] = 'Target window for internal links';
+$lang['target____interwiki'] = 'Target window for interwiki links';
+$lang['target____extern'] = 'Target window for external links';
+$lang['target____media'] = 'Target window for media links';
+$lang['target____windows'] = 'Target window for windows links';
+
+/* Media Settings */
+$lang['mediarevisions'] = 'Enable Mediarevisions?';
+$lang['refcheck'] = 'Check if a media file is still in use before deleting it';
+$lang['refshow'] = 'Number of media references to show when the above setting is enabled';
+$lang['gdlib'] = 'GD Lib version';
+$lang['im_convert'] = 'Path to ImageMagick\'s convert tool';
+$lang['jpg_quality'] = 'JPG compression quality (0-100)';
+$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from external URLs, eg. to cache and resize external images.';
+
+/* Notification Settings */
+$lang['subscribers'] = 'Allow users to subscribe to page changes by email';
+$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.';
+$lang['notify'] = 'Always send change notifications to this email address';
+$lang['registernotify'] = 'Always send info on newly registered users to this email address';
+$lang['mailfrom'] = 'Sender email address to use for automatic mails';
+$lang['mailprefix'] = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title';
+$lang['htmlmail'] = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.';
+
+/* Syndication Settings */
+$lang['sitemap'] = 'Generate Google sitemap this often (in days). 0 to disable';
+$lang['rss_type'] = 'XML feed type';
+$lang['rss_linkto'] = 'XML feed links to';
+$lang['rss_content'] = 'What to display in the XML feed items?';
+$lang['rss_update'] = 'XML feed update interval (sec)';
+$lang['rss_show_summary'] = 'XML feed show summary in title';
+$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?';
+
/* Advanced Options */
$lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.';
$lang['userewrite'] = 'Use nice URLs';
$lang['useslash'] = 'Use slash as namespace separator in URLs';
-$lang['usedraft'] = 'Automatically save a draft while editing';
$lang['sepchar'] = 'Page name word separator';
$lang['canonical'] = 'Use fully canonical URLs';
$lang['fnencode'] = 'Method for encoding non-ASCII filenames.';
$lang['autoplural'] = 'Check for plural forms in links';
$lang['compression'] = 'Compression method for attic files';
-$lang['cachetime'] = 'Maximum age for cache (sec)';
-$lang['locktime'] = 'Maximum age for lock files (sec)';
-$lang['fetchsize'] = 'Maximum size (bytes) fetch.php may download from extern';
-$lang['notify'] = 'Send change notifications to this email address';
-$lang['registernotify'] = 'Send info on newly registered users to this email address';
-$lang['mailfrom'] = 'Email address to use for automatic mails';
-$lang['mailprefix'] = 'Email subject prefix to use for automatic mails';
-$lang['htmlmail'] = 'Send better looking but larger in size HTML multipart emails. Disable for plain text only mails.';
$lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml';
-$lang['gdlib'] = 'GD Lib version';
-$lang['im_convert'] = 'Path to ImageMagick\'s convert tool';
-$lang['jpg_quality'] = 'JPG compression quality (0-100)';
-$lang['subscribers'] = 'Enable page subscription support';
-$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.';
$lang['compress'] = 'Compact CSS and javascript output';
$lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! <code>400</code> to <code>600</code> bytes is a good value. Set <code>0</code> to disable.';
-$lang['hidepages'] = 'Hide matching pages (regular expressions)';
$lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages';
-$lang['sitemap'] = 'Generate Google sitemap (days)';
-$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> for more info.';
+$lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">Bug 852</a> for more info.';
$lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.';
$lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output';
$lang['renderer__core'] = '%s (dokuwiki core)';
$lang['renderer__plugin'] = '%s (plugin)';
-$lang['rememberme'] = 'Allow permanent login cookies (remember me)';
-
-$lang['rss_type'] = 'XML feed type';
-$lang['rss_linkto'] = 'XML feed links to';
-$lang['rss_content'] = 'What to display in the XML feed items?';
-$lang['rss_update'] = 'XML feed update interval (sec)';
-$lang['recent_days'] = 'How many recent changes to keep (days)';
-$lang['rss_show_summary'] = 'XML feed show summary in title';
-$lang['rss_media'] = 'What kind of changes should be listed in the XML feed?';
-
-/* Target options */
-$lang['target____wiki'] = 'Target window for internal links';
-$lang['target____interwiki'] = 'Target window for interwiki links';
-$lang['target____extern'] = 'Target window for external links';
-$lang['target____media'] = 'Target window for media links';
-$lang['target____windows'] = 'Target window for windows links';
/* Proxy Options */
$lang['proxy____host'] = 'Proxy servername';
@@ -180,6 +193,7 @@
$lang['ftp____pass'] = 'FTP password for safemode hack';
$lang['ftp____root'] = 'FTP root directory for safemode hack';
+/* License Options */
$lang['license_o_'] = 'None chosen';
/* typography options */
View
42 lib/plugins/config/settings/config.metadata.php
@@ -104,6 +104,7 @@
$meta['_display'] = array('fieldset');
$meta['recent'] = array('numeric');
+$meta['recent_days'] = array('numeric');
$meta['breadcrumbs'] = array('numeric','_min' => 0);
$meta['youarehere'] = array('onoff');
$meta['fullpath'] = array('onoff');
@@ -118,8 +119,8 @@
$meta['camelcase'] = array('onoff');
$meta['deaccent'] = array('multichoice','_choices' => array(0,1,2));
$meta['useheading'] = array('multichoice','_choices' => array(0,'navigation','content',1));
-$meta['refcheck'] = array('onoff');
-$meta['refshow'] = array('numeric');
+$meta['sneaky_index'] = array('onoff');
+$meta['hidepages'] = array('string');
$meta['_authentication'] = array('fieldset');
$meta['useacl'] = array('onoff');
@@ -131,11 +132,9 @@
$meta['manager'] = array('string');
$meta['profileconfirm'] = array('onoff');
$meta['rememberme'] = array('onoff');
-$meta['registernotify'] = array('email');
$meta['disableactions'] = array('disableactions',
'_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','edit','wikicode','check'),
'_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw')));
-$meta['sneaky_index'] = array('onoff');
$meta['auth_security_timeout'] = array('numeric');
$meta['securecookie'] = array('onoff');
$meta['remote'] = array('onoff');
@@ -152,9 +151,6 @@
$meta['usedraft'] = array('onoff');
$meta['htmlok'] = array('onoff');
$meta['phpok'] = array('onoff');
-$meta['notify'] = array('email', '_multiple' => true);
-$meta['subscribers'] = array('onoff');
-$meta['subscribe_time'] = array('numeric');
$meta['locktime'] = array('numeric');
$meta['cachetime'] = array('numeric');
@@ -171,6 +167,26 @@
$meta['im_convert'] = array('im_convert');
$meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/'); //(0-100)
$meta['fetchsize'] = array('numeric');
+$meta['refcheck'] = array('onoff');
+$meta['refshow'] = array('numeric');
+
+$meta['_notifications'] = array('fieldset');
+$meta['subscribers'] = array('onoff');
+$meta['subscribe_time'] = array('numeric');
+$meta['notify'] = array('email', '_multiple' => true);
+$meta['registernotify'] = array('email');
+$meta['mailfrom'] = array('richemail');
+$meta['mailprefix'] = array('string');
+$meta['htmlmail'] = array('onoff');
+
+$meta['_syndication'] = array('fieldset');
+$meta['sitemap'] = array('numeric');
+$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
+$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current'));
+$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
+$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media'));
+$meta['rss_update'] = array('numeric');
+$meta['rss_show_summary'] = array('onoff');
$meta['_advanced'] = array('fieldset');
$meta['updatecheck'] = array('onoff');
@@ -180,23 +196,11 @@
$meta['canonical'] = array('onoff');
$meta['fnencode'] = array('multichoice','_choices' => array('url','safe','utf-8'));
$meta['autoplural'] = array('onoff');
-$meta['mailfrom'] = array('richemail');
-$meta['mailprefix'] = array('string');
-$meta['htmlmail'] = array('onoff');
$meta['compress'] = array('onoff');
$meta['cssdatauri'] = array('numeric','_pattern' => '/^\d+$/');
$meta['gzip_output'] = array('onoff');
-$meta['hidepages'] = array('string');
$meta['send404'] = array('onoff');
$meta['compression'] = array('compression');
-$meta['sitemap'] = array('numeric');
-$meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
-$meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current'));
-$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
-$meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media'));
-$meta['rss_update'] = array('numeric');
-$meta['rss_show_summary'] = array('onoff');
-$meta['recent_days'] = array('numeric');
$meta['broken_iua'] = array('onoff');
$meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3));
$meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml'));
Please sign in to comment.
Something went wrong with that request. Please try again.