Commit fb6e4564 authored by Steven Wittens's avatar Steven Wittens
Browse files

- Aggregator: fix for http://drupal.org/node/view/5733

- System: the 404 setting instructions advise using 'node', this should be '' (redirecting the user to the front page without any message whatsoever is confusing)
parent b109518b
......@@ -92,7 +92,7 @@ function aggregator_link($type) {
if ($type == 'system') {
if (user_access('administer news feeds')) {
menu('admin/syndication', t('syndication'), NULL, 5);
menu('admin/syndication', t('syndication'), 'aggregator_help_page', 5);
menu('admin/syndication/news', t('RSS/RDF'), 'aggregator_admin');
menu('admin/syndication/news/add/feed', t('new feed'), 'aggregator_admin', 2);
menu('admin/syndication/news/add/bundle', t('new bundle'), 'aggregator_admin', 3);
......
......@@ -92,7 +92,7 @@ function aggregator_link($type) {
if ($type == 'system') {
if (user_access('administer news feeds')) {
menu('admin/syndication', t('syndication'), NULL, 5);
menu('admin/syndication', t('syndication'), 'aggregator_help_page', 5);
menu('admin/syndication/news', t('RSS/RDF'), 'aggregator_admin');
menu('admin/syndication/news/add/feed', t('new feed'), 'aggregator_admin', 2);
menu('admin/syndication/news/add/bundle', t('new bundle'), 'aggregator_admin', 3);
......
......@@ -111,7 +111,7 @@ function system_view_general() {
$group .= form_textarea(t("Footer message"), "site_footer", variable_get("site_footer", ""), 70, 5, t("This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages."));
$group .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 70, 70, t("The name used to indicate anonymous users."));
$group .= form_textfield(t("Default front page"), "site_frontpage", variable_get("site_frontpage", "node"), 70, 70, t("The home page displays content from this relative URL. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'."));
$group .= form_textfield(t("Default 404 (not found) page"), "site_404", variable_get("site_404", ""), 70, 70, t("This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'."));
$group .= form_textfield(t("Default 404 (not found) page"), "site_404", variable_get("site_404", ""), 70, 70, t("This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after '?q='. If unsure, specify nothing."));
$group .= form_radios(t("Clean URLs"), "clean_url", variable_get("clean_url", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable clean URLs. If enabled, you'll need <code>ModRewrite</code> support. See also the <code>.htaccess</code> file in Drupal's top-level directory."));
$output = form_group(t("General settings"), $group);
......
......@@ -111,7 +111,7 @@ function system_view_general() {
$group .= form_textarea(t("Footer message"), "site_footer", variable_get("site_footer", ""), 70, 5, t("This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages."));
$group .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 70, 70, t("The name used to indicate anonymous users."));
$group .= form_textfield(t("Default front page"), "site_frontpage", variable_get("site_frontpage", "node"), 70, 70, t("The home page displays content from this relative URL. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'."));
$group .= form_textfield(t("Default 404 (not found) page"), "site_404", variable_get("site_404", ""), 70, 70, t("This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'."));
$group .= form_textfield(t("Default 404 (not found) page"), "site_404", variable_get("site_404", ""), 70, 70, t("This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after '?q='. If unsure, specify nothing."));
$group .= form_radios(t("Clean URLs"), "clean_url", variable_get("clean_url", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable clean URLs. If enabled, you'll need <code>ModRewrite</code> support. See also the <code>.htaccess</code> file in Drupal's top-level directory."));
$output = form_group(t("General settings"), $group);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment