summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--htdocs/config/validator.conf2
-rwxr-xr-xhtdocs/detailed-form.html2
-rwxr-xr-xhtdocs/detailed-form_directinput.html2
-rwxr-xr-xhtdocs/docs/help.html15
-rw-r--r--htdocs/docs/install_win.html2
-rwxr-xr-xhtdocs/whatsnew.html15
-rw-r--r--share/templates/en_US/opt_show_tidy.tmpl7
-rw-r--r--share/templates/en_US/soap_warnings.tmpl2
-rw-r--r--share/templates/en_US/table.tmpl2
-rw-r--r--share/templates/en_US/ucn_warnings.tmpl6
-rw-r--r--share/templates/en_US/warnings.tmpl4
11 files changed, 36 insertions, 23 deletions
diff --git a/htdocs/config/validator.conf b/htdocs/config/validator.conf
index 0c37dbc..b8921ad 100644
--- a/htdocs/config/validator.conf
+++ b/htdocs/config/validator.conf
@@ -33,7 +33,7 @@
# are always cached in memory.
#Cache = validator
- # configuration file for HTML Tidy Module, if available
+ # configuration file for HTML::Tidy Module, if available
TidyConf = $Base/htdocs/config/tidy.conf
<SGML>
diff --git a/htdocs/detailed-form.html b/htdocs/detailed-form.html
index a574dca..9742e41 100755
--- a/htdocs/detailed-form.html
+++ b/htdocs/detailed-form.html
@@ -23,7 +23,7 @@
</tr>
<tr>
<td><input id="<!--#echo var="fieldset_id" -->-ss" name="ss" type="checkbox" value="1" /><label title="Show Page Source" for="<!--#echo var="fieldset_id" -->-ss">Show Source</label></td>
- <td colspan="2"><input id="<!--#echo var="fieldset_id" -->-st" name="st" type="checkbox" value="1" /><label for="<!--#echo var="fieldset_id" -->-st">Clean up Markup with HTML Tidy</label>
+ <td colspan="2"><input id="<!--#echo var="fieldset_id" -->-st" name="st" type="checkbox" value="1" /><label for="<!--#echo var="fieldset_id" -->-st">Clean up Markup with HTML-Tidy</label>
</td>
diff --git a/htdocs/detailed-form_directinput.html b/htdocs/detailed-form_directinput.html
index 08a10e1..f44f223 100755
--- a/htdocs/detailed-form_directinput.html
+++ b/htdocs/detailed-form_directinput.html
@@ -20,7 +20,7 @@
</tr>
<tr>
<td><input id="<!--#echo var="fieldset_id" -->-ss" name="ss" type="checkbox" value="1" /><label title="Show Page Source" for="<!--#echo var="fieldset_id" -->-ss">Show Source</label></td>
- <td colspan="2"><input id="<!--#echo var="fieldset_id" -->-st" name="st" type="checkbox" value="1" /><label for="<!--#echo var="fieldset_id" -->-st">Clean up Markup with HTML Tidy</label>
+ <td colspan="2"><input id="<!--#echo var="fieldset_id" -->-st" name="st" type="checkbox" value="1" /><label for="<!--#echo var="fieldset_id" -->-st">Clean up Markup with HTML-Tidy</label>
</td>
diff --git a/htdocs/docs/help.html b/htdocs/docs/help.html
index 0d165ea..9a1e722 100755
--- a/htdocs/docs/help.html
+++ b/htdocs/docs/help.html
@@ -326,8 +326,19 @@ mailing-list.</p>
</p>
<h4 id="cleanup">I don't want error messages, I want you to clean up my page!</h4>
- <p>The Markup Validator can not do this for you. You may want to have a look
- at tools such as <a href="http://tidy.sourceforge.net">HTML Tidy</a>.</p>
+ <p>
+ Have a look at tools such as
+ <a href="http://tidy.sourceforge.net/">HTML Tidy</a> and
+ <a href="http://www.tidyp.com/">tidyp</a>. When selected, the
+ "Clean up Markup with HTML-Tidy" option will output a "cleaned"
+ version of the input document in case it was not valid, done with
+ <a href="http://search.cpan.org/dist/HTML-Tidy/">HTML-Tidy</a>, using
+ the Markup Validator's default HTML-Tidy configuration. Note that there
+ are no guarantees about the validity or other aspects of that output,
+ and there are many options to configure in these tools that may result
+ in better clean up than the Validator's default options for your
+ document, so you may want to try out them locally.
+ </p>
<h4 id="icon">"valid" icons</h4>
<h5 id="icon-usage">My document is valid, can I use your "valid" icon?</h5>
diff --git a/htdocs/docs/install_win.html b/htdocs/docs/install_win.html
index b078766..e112f77 100644
--- a/htdocs/docs/install_win.html
+++ b/htdocs/docs/install_win.html
@@ -297,7 +297,7 @@ Include conf/extra/httpd-manual.conf
# Location of template files
Templates = $Base/share/templates
- # configuration file for HTML Tidy Module, if available
+ # configuration file for HTML::Tidy Module, if available
TidyConf = $Base/htdocs/config/tidy.conf
&lt;SGML&gt;
diff --git a/htdocs/whatsnew.html b/htdocs/whatsnew.html
index eddc531..b2b7918 100755
--- a/htdocs/whatsnew.html
+++ b/htdocs/whatsnew.html
@@ -182,7 +182,8 @@
<li>
Enhancement: improved error handling and diagnostics for problems
occurred when decoding Content-Encodings, when cleaning up
- markup with Tidy, and when interfacing with the HTML5 validator.
+ markup with HTML-Tidy, and when interfacing with the HTML5
+ validator.
</li>
<li>
Enhancement: recognition of more (non-recommended) aliases for
@@ -259,8 +260,8 @@
<li>
Bug fix:
<a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=7592">"wide
- characters"</a> in Tidy's output caused an error which prevented
- the whole Tidy output from being displayed.
+ characters"</a> in HTML-Tidy's output caused an error which
+ prevented the whole tidied output from being displayed.
</li>
<li>
Bug fix: there were
@@ -279,8 +280,8 @@
</li>
<li>
Bug fix: the state of the "validate error pages", verbosity,
- error grouping, and "clean up with Tidy" options were not always
- preserved.
+ error grouping, and "clean up with HTML-Tidy" options were not
+ always preserved.
</li>
<li>
Bug fix: several issues in error message locators in shown
@@ -510,7 +511,7 @@
</p>
<ul>
<li>
- Bug Fix: processing of documents through HTML Tidy would be
+ Bug Fix: processing of documents through HTML-Tidy would be
triggered even when not requested. The fix should provide a
noticeable performance boost.
</li>
@@ -673,7 +674,7 @@
Improved interface for better usability, accessibility.
</li>
<li>
- New feature: automatic cleanup of markup (with Tidy).
+ New feature: automatic cleanup of markup (with HTML-Tidy).
</li>
<li>
New feature: additional XML-Well-Formedness check, for more
diff --git a/share/templates/en_US/opt_show_tidy.tmpl b/share/templates/en_US/opt_show_tidy.tmpl
index 40e86aa..41fb25d 100644
--- a/share/templates/en_US/opt_show_tidy.tmpl
+++ b/share/templates/en_US/opt_show_tidy.tmpl
@@ -1,9 +1,10 @@
<div id="tidy">
- <h3>Cleaned-up Source Listing with "Tidy"</h3>
+ <h3>Cleaned-up Source Listing with "HTML-Tidy"</h3>
<p>Below is the <em>cleaned up</em> markup for your document,
- as processed through <a href="http://tidy.sourceforge.net/">HTML Tidy</a>.</p>
- <p>Tidy is a third-party software not developed at W3C,
+ as processed through
+ <a href="http://search.cpan.org/dist/HTML-Tidy/">HTML-Tidy</a>.</p>
+ <p>HTML-Tidy is a third-party software not developed at W3C,
and its output is <em>provided without any guarantee</em>.</p>
<pre class="source"><TMPL_VAR NAME="tidy_output" ESCAPE="HTML"></pre>
diff --git a/share/templates/en_US/soap_warnings.tmpl b/share/templates/en_US/soap_warnings.tmpl
index f0a8f90..33ebd77 100644
--- a/share/templates/en_US/soap_warnings.tmpl
+++ b/share/templates/en_US/soap_warnings.tmpl
@@ -96,7 +96,7 @@
<m:warning><m:messageid>W28</m:messageid><m:message>Using Direct Input mode: UTF-8 character encoding assumed</m:message></m:warning>
</TMPL_IF>
<TMPL_IF NAME="W29">
- <m:warning><m:messageid>W29</m:messageid><m:message>Error cleaning up markup with HTML Tidy</m:message></m:warning>
+ <m:warning><m:messageid>W29</m:messageid><m:message>Error cleaning up markup with HTML-Tidy</m:message></m:warning>
</TMPL_IF>
<TMPL_IF NAME="W@@">
diff --git a/share/templates/en_US/table.tmpl b/share/templates/en_US/table.tmpl
index 7707640..ba15550 100644
--- a/share/templates/en_US/table.tmpl
+++ b/share/templates/en_US/table.tmpl
@@ -154,7 +154,7 @@
<TMPL_IF NAME="opt_show_tidy">
checked="checked"
</TMPL_IF>
- /><label for="st">Clean up Markup with HTML Tidy</label></td>
+ /><label for="st">Clean up Markup with HTML-Tidy</label></td>
</tr>
</table>
diff --git a/share/templates/en_US/ucn_warnings.tmpl b/share/templates/en_US/ucn_warnings.tmpl
index ede030e..19362ea 100644
--- a/share/templates/en_US/ucn_warnings.tmpl
+++ b/share/templates/en_US/ucn_warnings.tmpl
@@ -580,10 +580,10 @@
</TMPL_IF>
<TMPL_IF NAME="W29">
<message type="warning">
- <title>Error cleaning up markup with HTML Tidy.</title>
+ <title>Error cleaning up markup with HTML-Tidy.</title>
<description>
<p>
- An error occurred while cleaning up markup with HTML Tidy. The reported
+ An error occurred while cleaning up markup with HTML-Tidy. The reported
error was:<br />
<TMPL_VAR NAME="W29_msg" ESCAPE="HTML">
</p>
@@ -598,4 +598,4 @@
<message type="warning">
<title>W@@</title>
</message>
-</TMPL_IF> \ No newline at end of file
+</TMPL_IF>
diff --git a/share/templates/en_US/warnings.tmpl b/share/templates/en_US/warnings.tmpl
index ecc00f4..84af9e0 100644
--- a/share/templates/en_US/warnings.tmpl
+++ b/share/templates/en_US/warnings.tmpl
@@ -540,9 +540,9 @@ to check these potential issues, and, if necessary, fix them and re-validate the
</TMPL_IF>
<TMPL_IF NAME="W29">
- <li class="msg_warn" id="W29"><p><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Error cleaning up markup with HTML Tidy.</span></p>
+ <li class="msg_warn" id="W29"><p><span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span> <span class="msg">Error cleaning up markup with HTML-Tidy.</span></p>
<p>
- An error occurred while cleaning up markup with HTML Tidy. The reported
+ An error occurred while cleaning up markup with HTML-Tidy. The reported
error was:<br />
<TMPL_VAR NAME="W29_msg" ESCAPE="HTML">
</p>