List new options on the index page.

sideshowbarker · sideshowbarker · commit 4ff323443199 · 2012-03-17T17:24:01.000+09:00
diff --git a/index.html b/index.html
@@ -367,6 +367,18 @@ <h2 id=sample-config>Sample config file</h2>
 new-empty-tags: cfelse
 </pre>
 
+<h2 id="new-config">New configuration options</h2>
+<p>The experimental HTML5-aware fork of Tidy adds the following new
+configuration options:
+<ul>
+<li><a href="http://w3c.github.com/tidy-html5/quickref.html#coerce-endtags">coerce-endtags</a>
+<li><a href="http://w3c.github.com/tidy-html5/quickref.html#drop-empty-elements">drop-empty-elements</a>
+<li><a href="http://w3c.github.com/tidy-html5/quickref.html#merge-emphasis">merge-emphasis</a>
+</ul>
+<p>In addition, it also adds a new <code>html5</code> value for the
+<a href="http://w3c.github.com/tidy-html5/quickref.html#doctype">doctype</a>
+configuration option.
+
 <h2 id=indenting>Indenting output for readability</h2>
 <p>Indenting the source markup of an HTML document makes the markup easier
 to read. Tidy can indent the markup for an HTML document while recognizing
@@ -566,6 +578,7 @@ <h2 id=acks>Acknowledgements</h2>
 <li><a href="#options">Options and configuration settings</a>
 <li><a href="#config">Using a config file</a>
 <li><a href="#sample-config">Sample config file</a>
+<li><a href="#new-config">New configuration options</a>
 <li><a href="#indenting">Indenting output for readability</a>
 <li><a href="#preserve-indenting">Preserving original indenting not possible</a>
 <li><a href="#encodings">Encodings and character references</a>
diff --git a/quickref.html b/quickref.html
@@ -8,7 +8,7 @@
   <body>
     <h1 id="top">Quick Reference</h1>
     <h2>HTML Tidy Configuration Options</h2>
-    <p>Version: <a href="https://github.com/w3c/tidy-html5/tree/3a9a794">https://github.com/w3c/tidy-html5/tree/3a9a794</a></p>
+    <p>Version: <a href="https://github.com/w3c/tidy-html5/tree/3ed33a1">https://github.com/w3c/tidy-html5/tree/3ed33a1</a></p>
     <p>
       <a class="h3" href="#MarkupHeader">HTML, XHTML, XML</a>
       <br />
@@ -943,7 +943,7 @@ <h2>HTML Tidy Configuration Options</h2>
         <td align="right" valign="top"></td>
       </tr>
       <tr>
-        <td colspan="2">This option specifies the DOCTYPE declaration generated by Tidy. If set to "omit" the output won't contain a DOCTYPE declaration. If set to "html5" the DOCTYPE is set to "&lt;!DOCTYPE html&gt;". If set to "auto" (the default) Tidy will use an educated guess based upon the contents of the document. If set to "strict", Tidy will set the DOCTYPE to the strict DTD. If set to "loose", the DOCTYPE is set to the loose (transitional) DTD. Alternatively, you can supply a string for the formal public identifier (FPI).<br /><br />For example: <br />doctype: "-//ACME//DTD HTML 3.14159//EN"<br /><br />If you specify the FPI for an XHTML document, Tidy will set the system identifier to an empty string. For an HTML document, Tidy adds a system identifier only if one was already present in order to preserve the processing mode of some browsers. Tidy leaves the DOCTYPE for generic XML documents unchanged. <code>--doctype omit</code> implies <code>--numeric-entities yes</code>. This option does not offer a validation of the document conformance. </td>
+        <td colspan="2">This option specifies the DOCTYPE declaration generated by Tidy.<br />If set to "omit" the output won't contain a DOCTYPE declaration.<br />If set to "html5" the DOCTYPE is set to "&lt;!DOCTYPE html&gt;".<br />If set to "auto" (the default) Tidy will use an educated guess based upon the contents of the document.<br />If set to "strict", Tidy will set the DOCTYPE to the HTML4 or XHTML1 strict DTD.<br />If set to "loose", the DOCTYPE is set to the HTML4 or XHTML1 loose (transitional) DTD. <br />Alternatively, you can supply a string for the formal public identifier (FPI).<br /><br />For example: <br />doctype: "-//ACME//DTD HTML 3.14159//EN"<br /><br />If you specify the FPI for an XHTML document, Tidy will set the system identifier to an empty string. For an HTML document, Tidy adds a system identifier only if one was already present in order to preserve the processing mode of some browsers. Tidy leaves the DOCTYPE for generic XML documents unchanged. <code>--doctype omit</code> implies <code>--numeric-entities yes</code>. This option does not offer a validation of the document conformance. </td>
       </tr>
       <tr>
         <td>&#160;</td>
diff --git a/src/localize.c b/src/localize.c
@@ -406,14 +406,17 @@ static const TidyOptionDoc option_docs[] =
    , TidyMakeCleanTagsLinks
   },
   {TidyDoctype,
-   "This option specifies the DOCTYPE declaration generated by Tidy. If set "
-   "to \"omit\" the output won't contain a DOCTYPE declaration. If set to "
-   "\"html5\" the DOCTYPE is set to \"&lt;!DOCTYPE html>\". If set to "
-   "\"auto\" (the default) Tidy will use an educated guess based upon the "
-   "contents of the document. If set to \"strict\", Tidy will set the DOCTYPE "
-   "to the strict DTD. If set to \"loose\", the DOCTYPE is set to the loose "
-   "(transitional) DTD. Alternatively, you can supply a string for the formal "
-   "public identifier (FPI).<br />"
+   "This option specifies the DOCTYPE declaration generated by Tidy.<br />"
+   "If set to \"omit\" the output won't contain a DOCTYPE declaration.<br />"
+   "If set to \"html5\" the DOCTYPE is set to \"&lt;!DOCTYPE html>\".<br />"
+   "If set to \"auto\" (the default) Tidy will use an educated guess based "
+   "upon the contents of the document.<br />"
+   "If set to \"strict\", Tidy will set the DOCTYPE to the HTML4 or XHTML1 "
+   "strict DTD.<br />"
+   "If set to \"loose\", the DOCTYPE is set to the HTML4 or XHTML1 loose "
+   "(transitional) DTD. <br />"
+   "Alternatively, you can supply a string for the formal public identifier "
+   "(FPI).<br />"
    "<br />"
    "For example: <br />"
    "doctype: \"-//ACME//DTD HTML 3.14159//EN\"<br />"
diff --git a/src/version.h b/src/version.h
@@ -1 +1 @@
-static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/3ed33a1";
+static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/ddb5702";

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/3ed33a1";`
	`1`	`+static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/ddb5702";`