diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/FAQ.html | 14 | ||||
-rw-r--r-- | doc/catalog.html | 2 | ||||
-rw-r--r-- | doc/intro.html | 7 | ||||
-rw-r--r-- | doc/xml.html | 28 | ||||
-rw-r--r-- | doc/xmlio.html | 1 |
5 files changed, 22 insertions, 30 deletions
diff --git a/doc/FAQ.html b/doc/FAQ.html index 208f7afa..d41dcd09 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -94,18 +94,14 @@ A:link, A:visited, A:active { text-decoration: underline } <ol> <li> <em>Licensing Terms for libxml</em> - <p>libxml is released under 2 (compatible) licences:</p> -<ul> -<li>the <a href="http://www.gnu.org/copyleft/lgpl.html">LGPL</a>: GNU - Library General Public License</li> -<li>the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720.html">W3C - IPR</a>: very similar to the XWindow licence</li> -</ul> + <p>libxml is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT + Licence</a>, see the file Copyright in the distribution for the precise + wording</p> </li> <li> <em>Can I embed libxml in a proprietary application ?</em> - <p>Yes. The W3C IPR allows you to also keep proprietary the changes you - made to libxml, but it would be graceful to provide back bugfixes and + <p>Yes. The MIT Licence allows you to also keep proprietary the changes + you made to libxml, but it would be graceful to provide back bugfixes and improvements as patches for possible incorporation in the main development tree</p> </li> diff --git a/doc/catalog.html b/doc/catalog.html index cb9b731c..0b400f32 100644 --- a/doc/catalog.html +++ b/doc/catalog.html @@ -398,7 +398,7 @@ literature to point at:</p> directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on the resources found on the system. Otherwise it will just create ~/xmlcatalog and ~/dbkxmlcatalog and doing: - <p><code> export XMLCATALOG=$HOME/xmlcatalog</code></p> + <p><code>export XMLCATALOG=$HOME/xmlcatalog</code></p> <p>should allow to process DocBook documentations without requiring network accesses for the DTd or stylesheets</p> </li> diff --git a/doc/intro.html b/doc/intro.html index 15a698aa..d2081be2 100644 --- a/doc/intro.html +++ b/doc/intro.html @@ -100,10 +100,9 @@ structured documents/data.</p> <li>The internal document repesentation is as close as possible to the <a href="http://www.w3.org/DOM/">DOM</a> interfaces.</li> <li>Libxml also has a <a href="http://www.megginson.com/SAX/index.html">SAX like interface</a>; the interface is designed to be compatible with <a href="http://www.jclark.com/xml/expat.html">Expat</a>.</li> -<li>This library is released both under the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980720.html">W3C - IPR</a> and the <a href="http://www.gnu.org/copyleft/lesser.html">GNU - LGPL</a>. Use either at your convenience, basically this should make - everybody happy, if not, drop me a mail.</li> +<li>This library is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT + Licence</a> see the Copyright file in the distribution for the precise + wording.</li> </ul> <p>Warning: unless you are forced to because your application links with a Gnome library requiring it, <strong><span style="background-color: #FF0000">Do Not Use libxml1</span></strong>, use diff --git a/doc/xml.html b/doc/xml.html index 03d0daeb..eb92c76c 100644 --- a/doc/xml.html +++ b/doc/xml.html @@ -112,11 +112,10 @@ structured documents/data.</p> <li>Libxml also has a <a href="http://www.megginson.com/SAX/index.html">SAX like interface</a>; the interface is designed to be compatible with <a href="http://www.jclark.com/xml/expat.html">Expat</a>.</li> - <li>This library is released both under the <a - href="http://www.w3.org/Consortium/Legal/copyright-software-19980720.html">W3C - IPR</a> and the <a href="http://www.gnu.org/copyleft/lesser.html">GNU - LGPL</a>. Use either at your convenience, basically this should make - everybody happy, if not, drop me a mail.</li> + <li>This library is released under the <a + href="http://www.opensource.org/licenses/mit-license.html">MIT + Licence</a> see the Copyright file in the distribution for the precise + wording.</li> </ul> <p>Warning: unless you are forced to because your application links with a @@ -137,18 +136,14 @@ libxml2</p> <h3><a name="Licence">Licence</a>(s)</h3> <ol> <li><em>Licensing Terms for libxml</em> - <p>libxml is released under 2 (compatible) licences:</p> - <ul> - <li>the <a href="http://www.gnu.org/copyleft/lgpl.html">LGPL</a>: GNU - Library General Public License</li> - <li>the <a - href="http://www.w3.org/Consortium/Legal/copyright-software-19980720.html">W3C - IPR</a>: very similar to the XWindow licence</li> - </ul> + <p>libxml is released under the <a + href="http://www.opensource.org/licenses/mit-license.html">MIT + Licence</a>, see the file Copyright in the distribution for the precise + wording</p> </li> <li><em>Can I embed libxml in a proprietary application ?</em> - <p>Yes. The W3C IPR allows you to also keep proprietary the changes you - made to libxml, but it would be graceful to provide back bugfixes and + <p>Yes. The MIT Licence allows you to also keep proprietary the changes + you made to libxml, but it would be graceful to provide back bugfixes and improvements as patches for possible incorporation in the main development tree</p> </li> @@ -2196,6 +2191,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + } </pre> </li> <li>And then use it to save the document: @@ -2587,7 +2583,7 @@ literature to point at:</p> directory, it will set-up /etc/xml/catalog and /etc/xml/docbook based on the resources found on the system. Otherwise it will just create ~/xmlcatalog and ~/dbkxmlcatalog and doing: - <p><code> export XMLCATALOG=$HOME/xmlcatalog</code></p> + <p><code>export XMLCATALOG=$HOME/xmlcatalog</code></p> <p>should allow to process DocBook documentations without requiring network accesses for the DTd or stylesheets</p> </li> diff --git a/doc/xmlio.html b/doc/xmlio.html index f881db29..a5488ced 100644 --- a/doc/xmlio.html +++ b/doc/xmlio.html @@ -235,6 +235,7 @@ xmlOutputBufferCreateOwn(FILE *file, xmlCharEncodingHandlerPtr encoder) { + } </pre> </li> <li>And then use it to save the document: |