[libvirt] [PATCH] build: fix HTML errors in nwfilter docs
A build on Ubuntu reported: || Generating formatnwfilter.html.tmp /dados/develop/libvirt/docs/formatnwfilter.html.in|390| HTML parser error : Unexpected end tag : p || </p> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|705| HTML parser error : Unexpected end tag : code || <td>End of range of valid source ports</code></td> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|710| HTML parser error : Unexpected end tag : code || <td>Start of range of valid destination ports</code></td> || ^ * docs/formatnwfilter.html.in: Fix invalid HTML constructs. Reported by Eduardo Otubo. --- Don't know why a build on Fedora didn't catch these, so I won't push until I get an ack that this fixes things on Ubuntu. docs/formatnwfilter.html.in | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index f03e9ce..586a4fb 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -384,10 +384,11 @@ </table> <p> Valid Strings for <code>protocolid</code> are: arp, rarp, ipv4, ipv6 - <br><br> - Example: <pre><mac match='no' srcmacaddr='$MAC'/></pre> - <br><br> </p> +<pre> +[...] +<mac match='no' srcmacaddr='$MAC'/> +</pre> <h5><a name="nwfelemsRulesProtoARP">ARP/RARP</a></h5> <p> @@ -702,12 +703,12 @@ <tr> <td>srcportend</td> <td>UINT16</td> - <td>End of range of valid source ports</code></td> + <td>End of range of valid source ports</td> </tr> <tr> <td>dstportstart</td> <td>UINT16</td> - <td>Start of range of valid destination ports</code></td> + <td>Start of range of valid destination ports</td> </tr> <tr> <td>dstportend</td> -- 1.7.0.1
On 05/25/2010 08:22 PM, Eric Blake wrote:
A build on Ubuntu reported:
|| Generating formatnwfilter.html.tmp /dados/develop/libvirt/docs/formatnwfilter.html.in|390| HTML parser error : Unexpected end tag : p ||</p> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|705| HTML parser error : Unexpected end tag : code ||<td>End of range of valid source ports</code></td> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|710| HTML parser error : Unexpected end tag : code ||<td>Start of range of valid destination ports</code></td> || ^
* docs/formatnwfilter.html.in: Fix invalid HTML constructs. Reported by Eduardo Otubo.
Tested on my Ubuntu 10.04. ACK.
---
Don't know why a build on Fedora didn't catch these, so I won't push until I get an ack that this fixes things on Ubuntu.
docs/formatnwfilter.html.in | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index f03e9ce..586a4fb 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -384,10 +384,11 @@ </table> <p> Valid Strings for<code>protocolid</code> are: arp, rarp, ipv4, ipv6 -<br><br> - Example:<pre><mac match='no' srcmacaddr='$MAC'/></pre> -<br><br> </p> +<pre> +[...] +<mac match='no' srcmacaddr='$MAC'/> +</pre>
<h5><a name="nwfelemsRulesProtoARP">ARP/RARP</a></h5> <p> @@ -702,12 +703,12 @@ <tr> <td>srcportend</td> <td>UINT16</td> -<td>End of range of valid source ports</code></td> +<td>End of range of valid source ports</td> </tr> <tr> <td>dstportstart</td> <td>UINT16</td> -<td>Start of range of valid destination ports</code></td> +<td>Start of range of valid destination ports</td> </tr> <tr> <td>dstportend</td>
-- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo@linux.vnet.ibm.com
On 05/25/2010 05:31 PM, Eduardo Otubo wrote:
On 05/25/2010 08:22 PM, Eric Blake wrote:
A build on Ubuntu reported:
|| Generating formatnwfilter.html.tmp /dados/develop/libvirt/docs/formatnwfilter.html.in|390| HTML parser error : Unexpected end tag : p ||</p> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|705| HTML parser error : Unexpected end tag : code ||<td>End of range of valid source ports</code></td> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|710| HTML parser error : Unexpected end tag : code ||<td>Start of range of valid destination ports</code></td> || ^
* docs/formatnwfilter.html.in: Fix invalid HTML constructs. Reported by Eduardo Otubo.
Tested on my Ubuntu 10.04. ACK.
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Tue, May 25, 2010 at 05:22:34PM -0600, Eric Blake wrote:
A build on Ubuntu reported:
|| Generating formatnwfilter.html.tmp /dados/develop/libvirt/docs/formatnwfilter.html.in|390| HTML parser error : Unexpected end tag : p || </p> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|705| HTML parser error : Unexpected end tag : code || <td>End of range of valid source ports</code></td> || ^ /dados/develop/libvirt/docs/formatnwfilter.html.in|710| HTML parser error : Unexpected end tag : code || <td>Start of range of valid destination ports</code></td> || ^
* docs/formatnwfilter.html.in: Fix invalid HTML constructs. Reported by Eduardo Otubo. ---
Don't know why a build on Fedora didn't catch these, so I won't push until I get an ack that this fixes things on Ubuntu.
Are you missing the 'xhtml1-dtds' RPM on your machine ? Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On 05/26/2010 02:44 AM, Daniel P. Berrange wrote:
* docs/formatnwfilter.html.in: Fix invalid HTML constructs. Reported by Eduardo Otubo. ---
Don't know why a build on Fedora didn't catch these, so I won't push until I get an ack that this fixes things on Ubuntu.
Are you missing the 'xhtml1-dtds' RPM on your machine ?
$ rpm -q xhtml1-dtds xhtml1-dtds-1.0-20020801.5.noarch But either that didn't catch it; or it did catch it but we have a bug in the makefile that ignored the failure, such that I didn't notice it scroll by. Just to test things, I reverted to an older version, and tried again; sure enough: Generating formatnwfilter.html.tmp formatnwfilter.html.in:390: HTML parser error : Unexpected end tag : p </p> ^ formatnwfilter.html.in:705: HTML parser error : Unexpected end tag : code <td>End of range of valid source ports</code></td> ^ formatnwfilter.html.in:710: HTML parser error : Unexpected end tag : code <td>Start of range of valid destination ports</code></td> ^ It's still the right thing to skip a test if xhtml1-dtds is not installed, but it looks like we could improve the makefile to bail out when we detect bad html. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange -
Eduardo Otubo -
Eric Blake