From 2965a981b7ec22866fbdf2d567d87e2d068d3617 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 31 Jul 2015 16:04:08 -0400
Subject: [PATCH] Allow to search and import missing PGP pubkeys from keyservers using Publickey.js
---
plugins/help/config.inc.php.dist | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/plugins/help/config.inc.php.dist b/plugins/help/config.inc.php.dist
index 0fd321e..f135eef 100644
--- a/plugins/help/config.inc.php.dist
+++ b/plugins/help/config.inc.php.dist
@@ -2,29 +2,36 @@
// Help content iframe source
// %l will be replaced by the language code resolved using the 'help_language_map' option
-$rcmail_config['help_source'] = 'http://roundcube.net/doc/help/0.9/%l/';
+$config['help_source'] = 'http://docs.roundcube.net/doc/help/1.0/%l/';
// Map task/action combinations to deep-links
// Use '<task>/<action>' or only '<task>' strings as keys
// The values will be appended to the 'help_source' URL
-$rcmail_config['help_index_map'] = array(
- 'login' => 'login.html',
- 'mail' => 'mail/index.html',
- 'mail/compose' => 'mail/compose.html',
+$config['help_index_map'] = array(
+ 'login' => 'login.html',
+ 'mail' => 'mail/index.html',
+ 'mail/compose' => 'mail/compose.html',
+ 'addressbook' => 'addressbook/index.html',
+ 'settings' => 'settings/index.html',
+ 'settings/preferences' => 'settings/preferences.html',
+ 'settings/folders' => 'settings/folders.html',
+ 'settings/identities' => 'settings/identities.html',
);
// Map to translate Roundcube language codes into help document languages
// The '*' entry will be used as default
-$rcmail_config['help_language_map'] = array('*' => 'en_US');
+$config['help_language_map'] = array('*' => 'en_US');
// Enter an absolute URL to a page displaying information about this webmail
// Alternatively, create a HTML file under <this-plugin-dir>/content/about.html
-$rcmail_config['help_about_url'] = null;
+$config['help_about_url'] = null;
// Enter an absolute URL to a page displaying information about this webmail
// Alternatively, put your license text to <this-plugin-dir>/content/license.html
-$rcmail_config['help_license_url'] = null;
+$config['help_license_url'] = null;
// Determine whether to open the help in a new window
-$rcmail_config['help_open_extwin'] = false;
+$config['help_open_extwin'] = false;
+// URL to additional information about CSRF protection
+$config['help_csrf_info'] = null;
--
Gitblit v1.9.1