From 7d65722db6107ed7bee465a98bb46b2046756ff9 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sun, 22 Dec 2013 21:26:42 +0100 Subject: Bug 952793: Remove HTML4 elements which are obsolete in HTML5 r/a=justdave --- template/en/default/admin/admin.html.tmpl | 2 +- template/en/default/admin/params/advanced.html.tmpl | 2 +- .../en/default/admin/params/attachment.html.tmpl | 20 ++++++++++---------- template/en/default/admin/params/auth.html.tmpl | 12 ++++++------ template/en/default/admin/params/core.html.tmpl | 6 +++--- template/en/default/admin/params/general.html.tmpl | 8 ++++---- template/en/default/admin/params/ldap.html.tmpl | 2 +- template/en/default/admin/params/shadowdb.html.tmpl | 6 +++--- 8 files changed, 29 insertions(+), 29 deletions(-) (limited to 'template/en/default/admin') diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 38194e963..5c109dc3f 100644 --- a/template/en/default/admin/admin.html.tmpl +++ b/template/en/default/admin/admin.html.tmpl @@ -44,7 +44,7 @@
Sanity Check
Run sanity checks to locate problems in your database. This may take several tens of minutes depending on the size of your installation. - You can also automate this check by running sanitycheck.pl from a cron job. + You can also automate this check by running sanitycheck.pl from a cron job. A notification will be sent per email to the specified user if errors are detected.
[% class = (user.in_group('editusers') || user.can_bless) ? "" : "forbidden" %] diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl index 076d2dc7b..d2e38f34e 100644 --- a/template/en/default/admin/params/advanced.html.tmpl +++ b/template/en/default/admin/params/advanced.html.tmpl @@ -58,7 +58,7 @@ proxy_url => "$terms.Bugzilla may have to access the web to get notifications about" - _ " new releases (see the upgrade_notification parameter)." + _ " new releases (see the upgrade_notification parameter)." _ " If your $terms.Bugzilla server is behind a proxy, it may be" _ " necessary to enter its URL if the web server cannot access the" _ " HTTP_PROXY environment variable. If you have to authenticate," diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl index 6e0301908..e60753d90 100644 --- a/template/en/default/admin/params/attachment.html.tmpl +++ b/template/en/default/admin/params/attachment.html.tmpl @@ -19,29 +19,29 @@ _ "

This is a security restriction for installations where untrusted" _ " users may upload attachments that could be potentially damaging if" _ " viewed directly in the browser.

" - _ "

It is highly recommended that you set the attachment_base" + _ "

It is highly recommended that you set the attachment_base" _ " parameter if you turn this parameter on.", attachment_base => - "When the allow_attachment_display parameter is on, it is " + "When the allow_attachment_display parameter is on, it is " _ " possible for a malicious attachment to steal your cookies or" _ " perform an attack on $terms.Bugzilla using your credentials." _ "

If you would like additional security on attachments to avoid" _ " this, set this parameter to an alternate URL for your $terms.Bugzilla" - _ " that is not the same as urlbase or sslbase." + _ " that is not the same as urlbase or sslbase." _ " That is, a different domain name that resolves to this exact" _ " same $terms.Bugzilla installation.

" _ "

Note that if you have set the" - _ " cookiedomain" - _" parameter, you should set attachment_base to use a" + _ " cookiedomain" + _" parameter, you should set attachment_base to use a" _ " domain that would not be matched by" - _ " cookiedomain.

" - _ "

For added security, you can insert %bugid% into the URL," + _ " cookiedomain.

" + _ "

For added security, you can insert %bugid% into the URL," _ " which will be replaced with the ID of the current $terms.bug that" _ " the attachment is on, when you access an attachment. This will limit" _ " attachments to accessing only other attachments on the same" _ " ${terms.bug}. Remember, though, that all those possible domain names " - _ " (such as 1234.your.domain.com) must point to this same" + _ " (such as 1234.your.domain.com) must point to this same" _ " $terms.Bugzilla instance.", allow_attachment_deletion => "If this option is on, administrators will be able to delete " _ @@ -50,13 +50,13 @@ maxattachmentsize => "The maximum size (in kilobytes) of attachments to be stored " _ "in the database. If a file larger than this size is attached " _ "to ${terms.abug}, $terms.Bugzilla will look at the " _ - "maxlocalattachment parameter " _ + "maxlocalattachment parameter " _ "to determine if the file can be stored locally on the web server. " _ "If the file size exceeds both limits, then the attachment is rejected. " _ "Settings both parameters to 0 will prevent attaching files to ${terms.bugs}.", maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _ "locally on the web server. If set to a value lower than the " _ - "maxattachmentsize parameter, " _ + "maxattachmentsize parameter, " _ "attachments will never be kept on the local filesystem." } %] diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl index 228609827..88d54ccf3 100644 --- a/template/en/default/admin/params/auth.html.tmpl +++ b/template/en/default/admin/params/auth.html.tmpl @@ -96,24 +96,24 @@ webservice_email_filter => "Filter email addresses returned by the WebService API depending on " _ "if the user is logged in or not. This works similarly to how the " _ - "web UI currently filters email addresses. If requirelogin " _ + "web UI currently filters email addresses. If requirelogin " _ "is enabled, then this parameter has no effect as users must be logged " _ "in to use ${terms.Bugzilla}.", emailregexp => "This defines the regular expression to use for legal email addresses. " _ "The default tries to match fully qualified email addresses. " _ - "Use .* to accept any email address following the " _ - "RFC 2822 " _ - "specification. Another popular value to put here is ^[^@]+$, " _ + "Use .* to accept any email address following the " _ + "RFC 2822 " _ + "specification. Another popular value to put here is ^[^@]+$, " _ "which means 'local usernames, no @ allowed.'", emailregexpdesc => "This description explains valid addresses that " _ - "are allowed by the emailregexp param.", + "are allowed by the emailregexp param.", emailsuffix => "This is a string to append to any email addresses when actually " _ "sending mail to that address. It is useful if you have changed " _ - "the emailregexp param to only allow local usernames, " _ + "the emailregexp param to only allow local usernames, " _ "but you want the mail to be delivered to username@my.local.hostname.", createemailregexp => "This defines the (case-insensitive) regexp to use for email addresses that are " _ diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl index fd839ed9b..cc533fc91 100644 --- a/template/en/default/admin/params/core.html.tmpl +++ b/template/en/default/admin/params/core.html.tmpl @@ -21,9 +21,9 @@ ssl_redirect => "When this is enabled, $terms.Bugzilla will ensure that every page is" _ " accessed over SSL, by redirecting any plain HTTP requests to HTTPS" - _ " using the sslbase parameter. Also, when this is enabled," - _ " $terms.Bugzilla will send out links using sslbase in emails" - _ " instead of urlbase.", + _ " using the sslbase parameter. Also, when this is enabled," + _ " $terms.Bugzilla will send out links using sslbase in emails" + _ " instead of urlbase.", cookiepath => "Path, relative to your web document root, to which to restrict " _ "$terms.Bugzilla cookies. Normally this is the URI portion of your URL " _ diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index daa1f359e..369e495c7 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -19,7 +19,7 @@ docs_urlbase => "The URL that is the common initial leading part of all" _ " $terms.Bugzilla documentation URLs. It may be an absolute URL," - _ " or a URL relative to the urlbase parameter. Leave this" + _ " or a URL relative to the urlbase parameter. Leave this" _ " empty to suppress links to the documentation." _ "'%lang%' will be replaced by user's preferred language (if" _ " documentation is available in that language).", @@ -45,10 +45,10 @@ _ " display whatever is in this field at the top of every" _ " HTML page. The HTML you put in this field is not wrapped or" _ " enclosed in anything. You might want to wrap it inside a" - _ "<div>. Give the div id=\"message\" to get" + _ "<div>. Give the div id=\"message\" to get" _ " green text inside a red box, or class=\"bz_private\" for" _ " dark red on a red background. Anything defined in " - _ " skins/standard/global.css or skins/custom/global.css" + _ " skins/standard/global.css or skins/custom/global.css" _ " will work. To get centered text, use style=\"text-align: " _ " center;\".", @@ -68,6 +68,6 @@ _ "

  • 'disabled' will never notify you about new releases and no" _ " connection will be established to a remote server.
    • " _ "

    Note that if your $terms.Bugzilla server requires a proxy to" - _ " access the Internet, you may also need to set the proxy_url" + _ " access the Internet, you may also need to set the proxy_url" _ " parameter in the Advanced section.

    ", } %] diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl index 64b3dbd52..7a10c3f64 100644 --- a/template/en/default/admin/params/ldap.html.tmpl +++ b/template/en/default/admin/params/ldap.html.tmpl @@ -40,6 +40,6 @@ " as the $terms.Bugzilla username. You may also want" _ " to set the \"emailsuffix\" parameter, in this case.", - LDAPfilter => "LDAP filter to AND with the LDAPuidattribute for " _ + LDAPfilter => "LDAP filter to AND with the LDAPuidattribute for " _ "filtering the list of valid users." } %] diff --git a/template/en/default/admin/params/shadowdb.html.tmpl b/template/en/default/admin/params/shadowdb.html.tmpl index 9f9f31491..5eb9ceff4 100644 --- a/template/en/default/admin/params/shadowdb.html.tmpl +++ b/template/en/default/admin/params/shadowdb.html.tmpl @@ -14,7 +14,7 @@ shadowdbhost => "The host the shadow database is on.", shadowdbport => "The port the shadow database is on. Ignored if " _ - "shadowdbhost is blank. Note: if the host is the local " _ + "shadowdbhost is blank. Note: if the host is the local " _ "machine, then MySQL will ignore this setting, and you must " _ "specify a socket below.", @@ -23,14 +23,14 @@ "ignores the port specified by the client and connects using " _ "its compiled-in socket path (on unix machines) when connecting " _ "from a client to a local server. If you leave this blank, and " _ - "have the database on localhost, then the shadowdbport " _ + "have the database on localhost, then the shadowdbport " _ "will be ignored.", shadowdb => "If non-empty, then this is the name of another database in " _ "which $terms.Bugzilla will use as a read-only copy of everything. " _ "This is done so that long slow read-only operations can be used " _ "against this db, and not lock up things for everyone else. This " _ - "database is on the shadowdbhost, and must exist. " _ + "database is on the shadowdbhost, and must exist. " _ "$terms.Bugzilla does not update it, if you use this parameter, then " _ "you need to set up replication for your database." } %] -- cgit v1.2.3-24-g4f1b