[Spice-devel] [PATCH 1/2] SpiceUserManual.xml: small clean-ups

[Alon Levy]

On 03/14/2014 03:48 PM, Marc-André Lureau wrote:
> Remove some non-conventional/non-freesoftware editor-specific lines.
> 
> Remove trailing whitespaces
> 
> Get rid of DTD, which is too strict for docbook, see also:
> http://docbook.org/tdg5/en/html/ch02.html
> 
> This get rids of the following warning/error:
> 
> I/O error : Attempt to load network entity
> http://docbook.org/xml/5.0/dtd/docbook.dtd
> /home/elmarco/src/spice/spice-master/docs/manual/SpiceUserManual.xml:4:
> warning: failed to load external entity
> "http://docbook.org/xml/5.0/dtd/docbook.dtd"
>           "http://docbook.org/xml/5.0/dtd/docbook.dtd">
>                                                        ^

Looks good to me, ACK series. Reading the reference above, if anyone is
using an editor that requires a DTD they may be in trouble, but we can
wait for that.

Strange that you get the failure - there is a document that looks
superficially correct there.

> ---
>  docs/manual/SpiceUserManual.xml | 24 +++++++++++-------------
>  1 file changed, 11 insertions(+), 13 deletions(-)
> 
> diff --git a/docs/manual/SpiceUserManual.xml b/docs/manual/SpiceUserManual.xml
> index d710636..875a0da 100644
> --- a/docs/manual/SpiceUserManual.xml
> +++ b/docs/manual/SpiceUserManual.xml
> @@ -1,14 +1,12 @@
>  <?xml version="1.0" encoding="UTF-8"?>
> -<?oxygen RNGSchema="http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" type="xml"?>
> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
> -          "http://docbook.org/xml/5.0/dtd/docbook.dtd">
> -<book xmlns="http://docbook.org/ns/docbook" 
> +
> +<book xmlns="http://docbook.org/ns/docbook"
>          xmlns:xi="http://www.w3.org/2001/XInclude"
>          xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
>          xml:lang="en">
>      <info>
>          <title>Spice User Manual</title>
> -        
> +
>          <authorgroup>
>              <author>
>                  <personname>Lubos Kocman</personname>
> @@ -27,7 +25,7 @@
>                  <email>cfergeau at redhat.com</email>
>              </author>
>          </authorgroup>
> -        
> +
>          <copyright>
>              <year>2009</year>
>              <year>2010</year>
> @@ -35,18 +33,18 @@
>              <year>2013</year>
>              <holder>Red Hat, Inc.</holder>
>          </copyright>
> -        
> +
>          <legalnotice>
>              <para>
> -                Licensed under a Creative Commons Attribution-Share Alike 3.0 United States License 
> +                Licensed under a Creative Commons Attribution-Share Alike 3.0 United States License
>                  (see <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://creativecommons.org/licenses/by-sa/3.0/us/legalcode">http://creativecommons.org/licenses/by-sa/3.0/us/legalcode</link>).
>              </para>
>          </legalnotice>
>          <releaseinfo>Draft 6</releaseinfo>
>          <pubdate>Built on <?dbtimestamp format="Y-m-d H:M:S"?></pubdate>
> -        
> +
>          <cover>
> -            
> +
>              <mediaobject>
>                  <imageobject>
>                      <imagedata fileref="resources/pepper.png" format="png">
> @@ -59,13 +57,13 @@
>                  </imageobject>
>              </mediaobject>
>          </cover>
> -        
> +
>      </info>
> -    
> +
>      <xi:include href="SpiceUserManual-Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
>      <xi:include href="SpiceUserManual-Basics.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
>      <xi:include href="SpiceUserManual-References.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
>      <xi:include href="SpiceUserManual-Guest.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
>      <xi:include href="SpiceUserManual-Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
> -       
> +
>  </book>
>