Index: appendices/creat-comm.xml
===================================================================
--- appendices/creat-comm.xml	(revision bf7a21ddeb19de583c1235a8bc9a799fe3447e4b)
+++ appendices/creat-comm.xml	(revision dcee7a56bb00fedc0b0ca76863f182c787316e61)
@@ -16,84 +16,115 @@
   <title>Creative Commons License</title>
 
-  <para role='title'>Creative Commons Legal Code</para>
-
-  <para role='title'>Attribution-NonCommercial-ShareAlike 2.0</para>
+  <para role='title'>
+    Creative Commons Legal Code
+  </para>
+
+  <para role='title'>
+    Attribution-NonCommercial-ShareAlike 2.0
+  </para>
 
   <important>
-    <para>CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT
-    PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN
-    "AS-IS" BASIS.  CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
-    PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS
-    USE.</para>
+    <para>
+      CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+      LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+      ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+      INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+      REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES
+      RESULTING FROM ITS USE.
+    </para>
   </important>
 
-  <para role='title'>License</para>
-
-  <para>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-  COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-  COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-  AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.</para>
-
-  <para>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE
-  BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
-  CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-  CONDITIONS.</para>
+  <para role='title'>
+    License
+  </para>
+
+  <para>
+    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+    COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+    COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+    AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+  </para>
+
+  <para>
+    BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+    TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE
+    RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
+    AND CONDITIONS.
+  </para>
 
   <orderedlist>
     <?dbfo label-width="1.5em"?>
     <listitem>
-      <para>Definitions</para>
+      <para>
+        Definitions
+      </para>
 
       <orderedlist>
         <listitem>
-          <para>"Collective Work" means a work, such as a periodical issue, anthology or
-          encyclopedia, in which the Work in its entirety in unmodified form, along
-          with a number of other contributions, constituting separate and independent
-          works in themselves, are assembled into a collective whole. A work that
-          constitutes a Collective Work will not be considered a Derivative Work (as
-          defined below) for the purposes of this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>"Derivative Work" means a work based upon the Work or upon
-          the Work and other pre-existing works, such as a translation, musical
-          arrangement, dramatization, fictionalization, motion picture version, sound
-          recording, art reproduction, abridgment, condensation, or any other form in
-          which the Work may be recast, transformed, or adapted, except that a work
-          that constitutes a Collective Work will not be considered a Derivative Work
-          for the purpose of this License. For the avoidance of doubt, where the Work
-          is a musical composition or sound recording, the synchronization of the Work
-          in timed-relation with a moving image ("synching") will be considered a
-          Derivative Work for the purpose of this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>"Licensor" means the individual or entity that offers the
-          Work under the terms of this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>"Original Author" means the individual or entity who created
-          the Work.</para>
-        </listitem>
-
-        <listitem>
-          <para>"Work" means the copyrightable work of authorship offered
-          under the terms of this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>"You" means an individual or entity exercising rights under
-          this License who has not previously violated the terms of this License with
-          respect to the Work, or who has received express permission from the
-          Licensor to exercise rights under this License despite a previous
-          violation.</para>
-        </listitem>
-
-        <listitem>
-          <para>"License Elements" means the following high-level license
-          attributes as selected by Licensor and indicated in the title of this
-          License: Attribution, Noncommercial, ShareAlike.</para>
+          <para>
+            "Collective Work" means a work, such as a periodical issue,
+            anthology or encyclopedia, in which the Work in its entirety in
+            unmodified form, along with a number of other contributions,
+            constituting separate and independent works in themselves,
+            are assembled into a collective whole. A work that constitutes a
+            Collective Work will not be considered a Derivative Work (as
+            defined below) for the purposes of this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            "Derivative Work" means a work based upon the Work or upon the
+            Work and other pre-existing works, such as a translation, musical
+            arrangement, dramatization, fictionalization, motion picture
+            version, sound recording, art reproduction, abridgment,
+            condensation, or any other form in which the Work may be recast,
+            transformed, or adapted, except that a work that constitutes a
+            Collective Work will not be considered a Derivative Work for the
+            purpose of this License. For the avoidance of doubt, where the
+            Work is a musical composition or sound recording, the
+            synchronization of the Work in timed-relation with a moving image
+            ("synching") will be considered a Derivative Work for the purpose
+            of this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            "Licensor" means the individual or entity that offers the
+            Work under the terms of this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            "Original Author" means the individual or entity who created
+            the Work.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            "Work" means the copyrightable work of authorship offered
+            under the terms of this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            "You" means an individual or entity exercising rights under this
+            License who has not previously violated the terms of this License
+            with respect to the Work, or who has received express permission
+            from the Licensor to exercise rights under this License despite a
+            previous violation.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            "License Elements" means the following high-level license
+            attributes as selected by Licensor and indicated in the title of
+            this License: Attribution, Noncommercial, ShareAlike.
+          </para>
         </listitem>
 
@@ -102,168 +133,208 @@
 
     <listitem>
-      <para>Fair Use Rights. Nothing in this license is intended to reduce,
-      limit, or restrict any rights arising from fair use, first sale or other
-      limitations on the exclusive rights of the copyright owner under copyright law
-      or other applicable laws.</para>
-    </listitem>
-
-
-    <listitem>
-      <para>License Grant. Subject to the terms and conditions of this
-      License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-      perpetual (for the duration of the applicable copyright) license to exercise
-      the rights in the Work as stated below:</para>
+      <para>
+        Fair Use Rights. Nothing in this license is intended to reduce, limit,
+        or restrict any rights arising from fair use, first sale or other
+        limitations on the exclusive rights of the copyright owner under
+        copyright law or other applicable laws.
+      </para>
+    </listitem>
+
+
+    <listitem>
+      <para>
+        License Grant. Subject to the terms and conditions of this License,
+        Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+        perpetual (for the duration of the applicable copyright) license to
+        exercise the rights in the Work as stated below:
+      </para>
 
       <orderedlist>
 
         <listitem>
-          <para>to reproduce the Work, to incorporate the Work into one or
-          more Collective Works, and to reproduce the Work as incorporated in the
-          Collective Works;</para>
-        </listitem>
-
-        <listitem>
-          <para>to create and reproduce Derivative Works;</para>
-        </listitem>
-
-        <listitem>
-          <para>to distribute copies or phonorecords of, display publicly,
-          perform publicly, and perform publicly by means of a digital audio
-          transmission the Work including as incorporated in Collective
-          Works;</para>
-        </listitem>
-
-        <listitem>
-          <para>to distribute copies or phonorecords of, display publicly,
-          perform publicly, and perform publicly by means of a digital audio
-          transmission Derivative Works;</para>
+          <para>
+            to reproduce the Work, to incorporate the Work into one or more
+            Collective Works, and to reproduce the Work as incorporated in the
+            Collective Works;
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            to create and reproduce Derivative Works;
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            to distribute copies or phonorecords of, display publicly, perform
+            publicly, and perform publicly by means of a digital audio
+            transmission the Work including as incorporated in Collective
+            Works;
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            to distribute copies or phonorecords of, display publicly,
+            perform publicly, and perform publicly by means of a digital audio
+            transmission Derivative Works;
+          </para>
         </listitem>
 
       </orderedlist>
 
-      <para>The above rights may be exercised in all media and formats whether now
-      known or hereafter devised. The above rights include the right to make such
-      modifications as are technically necessary to exercise the rights in other
-      media and formats. All rights not expressly granted by Licensor are hereby
-      reserved, including but not limited to the rights set forth in Sections 4(e)
-      and 4(f).</para>
-    </listitem>
-
-    <listitem>
-      <para>Restrictions.The license granted in Section 3 above is
-      expressly made subject to and limited by the following
-      restrictions:</para>
+      <para>
+        The above rights may be exercised in all media and formats whether now
+        known or hereafter devised. The above rights include the right to make
+        such modifications as are technically necessary to exercise the rights
+        in other media and formats. All rights not expressly granted by
+        Licensor are hereby reserved, including but not limited to the rights
+        set forth in Sections 4(e) and 4(f).
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Restrictions.The license granted in Section 3 above is
+        expressly made subject to and limited by the following
+        restrictions:
+      </para>
 
       <orderedlist>
 
         <listitem>
-          <para>You may distribute, publicly display, publicly perform, or
-          publicly digitally perform the Work only under the terms of this License, and
-          You must include a copy of, or the Uniform Resource Identifier for, this
-          License with every copy or phonorecord of the Work You distribute, publicly
-          display, publicly perform, or publicly digitally perform. You may not offer
-          or impose any terms on the Work that alter or restrict the terms of this
-          License or the recipients' exercise of the rights granted hereunder. You may
-          not sublicense the Work. You must keep intact all notices that refer to this
-          License and to the disclaimer of warranties. You may not distribute, publicly
-          display, publicly perform, or publicly digitally perform the Work with any
-          technological measures that control access or use of the Work in a manner
-          inconsistent with the terms of this License Agreement. The above applies to
-          the Work as incorporated in a Collective Work, but this does not require the
-          Collective Work apart from the Work itself to be made subject to the terms of
-          this License. If You create a Collective Work, upon notice from any Licensor
-          You must, to the extent practicable, remove from the Collective Work any
-          reference to such Licensor or the Original Author, as requested. If You
-          create a Derivative Work, upon notice from any Licensor You must, to the
-          extent practicable, remove from the Derivative Work any reference to such
-          Licensor or the Original Author, as requested.</para>
-        </listitem>
-
-        <listitem>
-          <para>You may distribute, publicly display, publicly perform, or
-          publicly digitally perform a Derivative Work only under the terms of this
-          License, a later version of this License with the same License Elements as
-          this License, or a Creative Commons iCommons license that contains the same
-          License Elements as this License (e.g. Attribution-NonCommercial-ShareAlike
-          2.0 Japan). You must include a copy of, or the Uniform Resource Identifier
-          for, this License or other license specified in the previous sentence with
-          every copy or phonorecord of each Derivative Work You distribute, publicly
-          display, publicly perform, or publicly digitally perform. You may not offer
-          or impose any terms on the Derivative Works that alter or restrict the terms
-          of this License or the recipients' exercise of the rights granted hereunder,
-          and You must keep intact all notices that refer to this License and to the
-          disclaimer of warranties. You may not distribute, publicly display, publicly
-          perform, or publicly digitally perform the Derivative Work with any
-          technological measures that control access or use of the Work in a manner
-          inconsistent with the terms of this License Agreement. The above applies to
-          the Derivative Work as incorporated in a Collective Work, but this does not
-          require the Collective Work apart from the Derivative Work itself to be made
-          subject to the terms of this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>You may not exercise any of the rights granted to You in
-          Section 3 above in any manner that is primarily intended for or directed
-          toward commercial advantage or private monetary compensation. The exchange of
-          the Work for other copyrighted works by means of digital file-sharing or
-          otherwise shall not be considered to be intended for or directed toward
-          commercial advantage or private monetary compensation, provided there is no
-          payment of any monetary compensation in connection with the exchange of
-          copyrighted works.</para>
-        </listitem>
-
-        <listitem>
-          <para>If you distribute, publicly display, publicly perform, or
-          publicly digitally perform the Work or any Derivative Works or Collective
-          Works, You must keep intact all copyright notices for the Work and give the
-          Original Author credit reasonable to the medium or means You are utilizing by
-          conveying the name (or pseudonym if applicable) of the Original Author if
-          supplied; the title of the Work if supplied; to the extent reasonably
-          practicable, the Uniform Resource Identifier, if any, that Licensor specifies
-          to be associated with the Work, unless such URI does not refer to the
-          copyright notice or licensing information for the Work; and in the case of a
-          Derivative Work, a credit identifying the use of the Work in the Derivative
-          Work (e.g., "French translation of the Work by Original Author," or
-          "Screenplay based on original Work by Original Author"). Such credit may be
-          implemented in any reasonable manner; provided, however, that in the case of
-          a Derivative Work or Collective Work, at a minimum such credit will appear
-          where any other comparable authorship credit appears and in a manner at least
-          as prominent as such other comparable authorship credit.</para>
-        </listitem>
-
-
-        <listitem>
-          <para>For the avoidance of doubt, where the Work is a musical
-          composition:</para>
+          <para>
+            You may distribute, publicly display, publicly perform, or publicly
+            digitally perform the Work only under the terms of this License,
+            and You must include a copy of, or the Uniform Resource Identifier
+            for, this License with every copy or phonorecord of the Work You
+            distribute, publicly display, publicly perform, or publicly
+            digitally perform. You may not offer or impose any terms on the
+            Work that alter or restrict the terms of this License or the
+            recipients' exercise of the rights granted hereunder. You may not
+            sublicense the Work. You must keep intact all notices that refer
+            to this License and to the disclaimer of warranties. You may not
+            distribute, publicly display, publicly perform, or publicly
+            digitally perform the Work with any technological measures that
+            control access or use of the Work in a manner inconsistent with
+            the terms of this License Agreement. The above applies to the Work
+            as incorporated in a Collective Work, but this does not require
+            the Collective Work apart from the Work itself to be made subject
+            to the terms of this License. If You create a Collective Work,
+            upon notice from any Licensor You must, to the extent practicable,
+            remove from the Collective Work any reference to such Licensor or
+            the Original Author, as requested. If You create a Derivative Work,
+            upon notice from any Licensor You must, to the extent practicable,
+            remove from the Derivative Work any reference to such Licensor or
+            the Original Author, as requested.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            You may distribute, publicly display, publicly perform, or publicly
+            digitally perform a Derivative Work only under the terms of this
+            License, a later version of this License with the same License
+            Elements as this License, or a Creative Commons iCommons license
+            that contains the same License Elements as this License (e.g.
+            Attribution-NonCommercial-ShareAlike 2.0 Japan). You must include
+            a copy of, or the Uniform Resource Identifier for, this License or
+            other license specified in the previous sentence with every copy
+            or phonorecord of each Derivative Work You distribute, publicly
+            display, publicly perform, or publicly digitally perform. You may
+            not offer or impose any terms on the Derivative Works that alter
+            or restrict the terms of this License or the recipients' exercise
+            of the rights granted hereunder, and You must keep intact all
+            notices that refer to this License and to the disclaimer of
+            warranties. You may not distribute, publicly display, publicly
+            perform, or publicly digitally perform the Derivative Work with
+            any technological measures that control access or use of the Work
+            in a manner inconsistent with the terms of this License Agreement.
+            The above applies to the Derivative Work as incorporated in a
+            Collective Work, but this does not require the Collective Work
+            apart from the Derivative Work itself to be made subject to the
+            terms of this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            You may not exercise any of the rights granted to You in Section 3
+            above in any manner that is primarily intended for or directed
+            toward commercial advantage or private monetary compensation. The
+            exchange of the Work for other copyrighted works by means of
+            digital file-sharing or otherwise shall not be considered to be
+            intended for or directed toward commercial advantage or private
+            monetary compensation, provided there is no payment of any monetary
+            compensation in connection with the exchange of copyrighted works.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            If you distribute, publicly display, publicly perform, or publicly
+            digitally perform the Work or any Derivative Works or Collective
+            Works, You must keep intact all copyright notices for the Work and
+            give the Original Author credit reasonable to the medium or means
+            You are utilizing by conveying the name (or pseudonym if
+            applicable) of the Original Author if supplied; the title of the
+            Work if supplied; to the extent reasonably practicable, the Uniform
+            Resource Identifier, if any, that Licensor specifies to be
+            associated with the Work, unless such URI does not refer to the
+            copyright notice or licensing information for the Work; and in the
+            case of a Derivative Work, a credit identifying the use of the Work
+            in the Derivative Work (e.g., "French translation of the Work by
+            Original Author," or "Screenplay based on original Work by Original
+            Author"). Such credit may be implemented in any reasonable manner;
+            provided, however, that in the case of a Derivative Work or
+            Collective Work, at a minimum such credit will appear where any
+            other comparable authorship credit appears and in a manner at least
+            as prominent as such other comparable authorship credit.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For the avoidance of doubt, where the Work is a musical
+            composition:
+          </para>
 
           <orderedlist>
 
             <listitem>
-              <para>Performance Royalties Under Blanket Licenses. Licensor
-              reserves the exclusive right to collect, whether individually or via a
-              performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the
-              public performance or public digital performance (e.g. webcast) of the
-              Work if that performance is primarily intended for or directed toward
-              commercial advantage or private monetary compensation.</para>
+              <para>
+                Performance Royalties Under Blanket Licenses. Licensor reserves
+                the exclusive right to collect, whether individually or via a
+                performance rights society (e.g. ASCAP, BMI, SESAC), royalties
+                for the public performance or public digital performance (e.g.
+                webcast) of the Work if that performance is primarily intended
+                for or directed toward commercial advantage or private monetary
+                compensation.
+              </para>
             </listitem>
 
             <listitem>
-              <para>Mechanical Rights and Statutory Royalties. Licensor
-              reserves the exclusive right to collect, whether individually or via a
-              music rights agency or designated agent (e.g. Harry Fox Agency),
-              royalties    for any phonorecord You create from the Work ("cover
-              version") and distribute, subject to the compulsory license created
-              by 17 USC Section 115 of the US Copyright Act (or the equivalent in
-              other jurisdictions), if Your distribution of such cover version is primarily
-              intended for or directed toward commercial advantage or private monetary
-              compensation.  6. Webcasting Rights and Statutory Royalties.  For the
-              avoidance of doubt, where the Work is a sound recording, Licensor
-              reserves the exclusive right to collect, whether individually or via a
-              performance-rights society (e.g. SoundExchange), royalties for the public
-              digital performance (e.g. webcast) of the Work, subject to the compulsory
-              license created by 17 USC Section 114 of the US Copyright Act (or the
-              equivalent in other jurisdictions), if Your public digital performance is
-              primarily intended for or directed toward commercial advantage or private
-              monetary compensation.</para>
+              <para>
+                Mechanical Rights and Statutory Royalties. Licensor reserves
+                the exclusive right to collect, whether individually or via a
+                music rights agency or designated agent (e.g. Harry Fox
+                Agency), royalties    for any phonorecord You create from the
+                Work ("cover version") and distribute, subject to the
+                compulsory license created by 17 USC Section 115 of the US
+                Copyright Act (or the equivalent in other jurisdictions), if
+                Your distribution of such cover version is primarily intended
+                for or directed toward commercial advantage or private monetary
+                compensation.  6. Webcasting Rights and Statutory Royalties.
+                For the avoidance of doubt, where the Work is a sound
+                recording, Licensor reserves the exclusive right to collect,
+                whether individually or via a performance-rights society (e.g.
+                SoundExchange), royalties for the public digital performance
+                (e.g. webcast) of the Work, subject to the compulsory license
+                created by 17 USC Section 114 of the US Copyright Act (or the
+                equivalent in other jurisdictions), if Your public digital
+                performance is primarily intended for or directed toward
+                commercial advantage or private monetary compensation.
+              </para>
             </listitem>
 
@@ -272,13 +343,15 @@
 
         <listitem>
-          <para>Webcasting Rights and Statutory Royalties. For the
-          avoidance of doubt, where the Work is a sound recording, Licensor reserves
-          the exclusive right to collect, whether individually or via a
-          performance-rights society (e.g.  SoundExchange), royalties for the public
-          digital performance (e.g. webcast) of the Work, subject to the compulsory
-          license created by 17 USC Section 114 of the US Copyright Act (or the
-          equivalent in other jurisdictions), if Your public digital performance is
-          primarily intended for or directed toward commercial advantage or private
-          monetary compensation.</para>
+          <para>
+            Webcasting Rights and Statutory Royalties. For the avoidance of
+            doubt, where the Work is a sound recording, Licensor reserves the
+            exclusive right to collect, whether individually or via a
+            performance-rights society (e.g.  SoundExchange), royalties for
+            the public digital performance (e.g. webcast) of the Work, subject
+            to the compulsory license created by 17 USC Section 114 of the US
+            Copyright Act (or the equivalent in other jurisdictions), if Your
+            public digital performance is primarily intended for or directed
+            toward commercial advantage or private monetary compensation.
+          </para>
         </listitem>
 
@@ -287,48 +360,62 @@
 
     <listitem>
-      <para>Representations, Warranties and Disclaimer</para>
-
-      <para>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-      OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
-      CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
-      WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
-      PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
-      ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
-      SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
-      EXCLUSION MAY NOT APPLY TO YOU.</para>
-    </listitem>
-
-    <listitem>
-      <para>Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY
-      APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY
-      FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-      ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN
-      ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</para>
-    </listitem>
-
-    <listitem>
-      <para>Termination</para>
+      <para>
+        Representations, Warranties and Disclaimer
+      </para>
+
+      <para>
+        UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+        OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+        KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+        INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+        FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+        LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+        ERRORS, WHETHER OR NOT DISCOVERABLE.  SOME JURISDICTIONS DO NOT ALLOW
+        THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY
+        TO YOU.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+        LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY
+        FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
+        DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
+        LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        Termination
+      </para>
 
       <orderedlist>
 
         <listitem>
-          <para>This License and the rights granted hereunder will terminate
-          automatically upon any breach by You of the terms of this License.
-          Individuals or entities who have received Derivative Works or Collective
-          Works from You under this License, however, will not have their licenses
-          terminated provided such individuals or entities remain in full compliance
-          with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any
-          termination of this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>Subject to the above terms and conditions, the license
-          granted here is perpetual (for the duration of the applicable copyright in
-          the Work).  Notwithstanding the above, Licensor reserves the right to release
-          the Work under different license terms or to stop distributing the Work at
-          any time; provided, however that any such election will not serve to withdraw
-          this License (or any other license that has been, or is required to be,
-          granted under the terms of this License), and this License will continue in
-          full force and effect unless terminated as stated above.</para>
+          <para>
+            This License and the rights granted hereunder will terminate
+            automatically upon any breach by You of the terms of this License.
+            Individuals or entities who have received Derivative Works or
+            Collective Works from You under this License, however, will not
+            have their licenses terminated provided such individuals or
+            entities remain in full compliance with those licenses. Sections 1,
+            2, 5, 6, 7, and 8 will survive any termination of this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Subject to the above terms and conditions, the license granted
+             here is perpetual (for the duration of the applicable copyright
+             in the Work).  Notwithstanding the above, Licensor reserves the
+             right to release the Work under different license terms or to
+             stop distributing the Work at any time; provided, however that
+             any such election will not serve to withdraw this License (or any
+             other license that has been, or is required to be, granted under
+             the terms of this License), and this License will continue in
+             full force and effect unless terminated as stated above.
+          </para>
         </listitem>
 
@@ -337,45 +424,58 @@
 
     <listitem>
-      <para>Miscellaneous</para>
+      <para>
+        Miscellaneous
+      </para>
 
       <orderedlist>
 
         <listitem>
-          <para>Each time You distribute or publicly digitally perform the
-          Work or a Collective Work, the Licensor offers to the recipient a license to
-          the Work on the same terms and conditions as the license granted to You under
-          this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>Each time You distribute or publicly digitally perform a
-          Derivative Work, Licensor offers to the recipient a license to the original
-          Work on the same terms and conditions as the license granted to You under
-          this License.</para>
-        </listitem>
-
-        <listitem>
-          <para>If any provision of this License is invalid or unenforceable
-          under applicable law, it shall not affect the validity or enforceability of
-          the remainder of the terms of this License, and without further action by the
-          parties to this agreement, such provision shall be reformed to the minimum
-          extent necessary to make such provision valid and
-          enforceable.</para>
-        </listitem>
-
-        <listitem>
-          <para>No term or provision of this License shall be deemed waived
-          and no breach consented to unless such waiver or consent shall be in writing
-          and signed by the party to be charged with such waiver or
-          consent.</para>
-        </listitem>
-
-        <listitem>
-          <para>This License constitutes the entire agreement between the
-          parties with respect to the Work licensed here. There are no understandings,
-          agreements or representations with respect to the Work not specified here.
-          Licensor shall not be bound by any additional provisions that may appear in
-          any communication from You. This License may not be modified without the
-          mutual written agreement of the Licensor and You.</para>
+          <para>
+            Each time You distribute or publicly digitally perform the Work or
+            a Collective Work, the Licensor offers to the recipient a license
+            to the Work on the same terms and conditions as the license granted
+            to You under this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Each time You distribute or publicly digitally perform a Derivative
+            Work, Licensor offers to the recipient a license to the original
+            Work on the same terms and conditions as the license granted to
+            You under this License.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            If any provision of this License is invalid or unenforceable under
+            applicable law, it shall not affect the validity or enforceability
+            of the remainder of the terms of this License, and without further
+            action by the parties to this agreement, such provision shall be
+            reformed to the minimum extent necessary to make such provision
+            valid and enforceable.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            No term or provision of this License shall be deemed waived and no
+            breach consented to unless such waiver or consent shall be in
+            writing and signed by the party to be charged with such waiver or
+            consent.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            This License constitutes the entire agreement between the parties
+            with respect to the Work licensed here. There are no
+            understandings, agreements or representations with respect to the
+            Work not specified here.  Licensor shall not be bound by any
+            additional provisions that may appear in any communication from
+            You. This License may not be modified without the mutual written
+            agreement of the Licensor and You.
+          </para>
         </listitem>
 
@@ -386,23 +486,30 @@
 
   <important>
-    <para>Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be liable to
-    You or any party on any legal theory for any damages whatsoever, including
-    without limitation any general, special, incidental or consequential damages
-    arising in connection to this license. Notwithstanding the foregoing two (2)
-    sentences, if Creative Commons has expressly identified itself as the Licensor
-    hereunder, it shall have all rights and obligations of Licensor.</para>
-
-    <para>Except for the limited purpose of indicating to the public that the Work is
-    licensed under the CCPL, neither party will use the trademark "Creative
-    Commons" or any related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in compliance
-    with Creative Commons' then-current trademark usage guidelines, as may be
-    published on its website or otherwise made available upon request from time to
-    time.</para>
-
-    <para>Creative Commons may be contacted at <ulink url='http://creativecommons.org/' />.</para>
+    <para>
+      Creative Commons is not a party to this License, and makes no warranty
+      whatsoever in connection with the Work. Creative Commons will not be
+      liable to You or any party on any legal theory for any damages
+      whatsoever, including without limitation any general, special, incidental
+      or consequential damages arising in connection to this license.
+      Notwithstanding the foregoing two (2) sentences, if Creative Commons has
+      expressly identified itself as the Licensor hereunder, it shall have all
+      rights and obligations of Licensor.
+    </para>
+
+    <para>
+      Except for the limited purpose of indicating to the public that the Work
+      is licensed under the CCPL, neither party will use the trademark
+      "Creative Commons" or any related trademark or logo of Creative Commons
+      without the prior written consent of Creative Commons. Any permitted use
+      will be in compliance with Creative Commons' then-current trademark
+      usage guidelines, as may be published on its website or otherwise made
+      available upon request from time to time.
+    </para>
+
+    <para>
+      Creative Commons may be contacted at <ulink url=
+      'http://creativecommons.org/'/>.
+    </para>
   </important>
 
-
 </appendix>
Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision bf7a21ddeb19de583c1235a8bc9a799fe3447e4b)
+++ appendices/glossary.xml	(revision dcee7a56bb00fedc0b0ca76863f182c787316e61)
@@ -22,5 +22,7 @@
       </glossterm>
       <glossdef>
-        <para>UNIS/Composer 669 Module</para>
+        <para>
+          UNIS/Composer 669 Module
+        </para>
       </glossdef>
     </glossentry>
@@ -31,5 +33,7 @@
       </glossterm>
       <glossdef>
-        <para>Application Binary Interface</para>
+        <para>
+          Application Binary Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -40,5 +44,7 @@
       </glossterm>
       <glossdef>
-        <para>Asymmetric Digital Subscriber Line</para>
+        <para>
+          Asymmetric Digital Subscriber Line
+        </para>
       </glossdef>
     </glossentry>
@@ -49,5 +55,7 @@
       </glossterm>
       <glossdef>
-        <para>Andrew File System</para>
+        <para>
+          Andrew File System
+        </para>
       </glossdef>
     </glossentry>
@@ -58,5 +66,7 @@
       </glossterm>
       <glossdef>
-        <para>Audio Interchange File Format</para>
+        <para>
+          Audio Interchange File Format
+        </para>
       </glossdef>
     </glossentry>
@@ -67,5 +77,7 @@
       </glossterm>
       <glossdef>
-        <para>Advanced Linux Sound Architecture</para>
+        <para>
+          Advanced Linux Sound Architecture
+        </para>
       </glossdef>
     </glossentry>
@@ -76,5 +88,7 @@
       </glossterm>
       <glossdef>
-        <para>American National Standards Institute</para>
+        <para>
+          American National Standards Institute
+        </para>
       </glossdef>
     </glossentry>
@@ -85,5 +99,7 @@
       </glossterm>
       <glossdef>
-        <para>Application Programming Interface</para>
+        <para>
+          Application Programming Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -94,5 +110,7 @@
       </glossterm>
       <glossdef>
-        <para>Apache Portable Runtime</para>
+        <para>
+          Apache Portable Runtime
+        </para>
       </glossdef>
     </glossentry>
@@ -103,5 +121,7 @@
       </glossterm>
       <glossdef>
-        <para>Address Resolution Protocol</para>
+        <para>
+          Address Resolution Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -112,5 +132,7 @@
       </glossterm>
       <glossdef>
-        <para>American Standard Code for Information Interchange</para>
+        <para>
+          American Standard Code for Information Interchange
+        </para>
       </glossdef>
     </glossentry>
@@ -121,5 +143,7 @@
       </glossterm>
       <glossdef>
-        <para>Abstract Syntax Notation</para>
+        <para>
+          Abstract Syntax Notation
+        </para>
       </glossdef>
     </glossentry>
@@ -130,5 +154,7 @@
       </glossterm>
       <glossdef>
-        <para>Advanced Streaming Format</para>
+        <para>
+          Advanced Streaming Format
+        </para>
       </glossdef>
     </glossentry>
@@ -139,5 +165,7 @@
       </glossterm>
       <glossdef>
-        <para>Advanced Technology Attachment</para>
+        <para>
+          Advanced Technology Attachment
+        </para>
       </glossdef>
     </glossentry>
@@ -148,5 +176,7 @@
       </glossterm>
       <glossdef>
-        <para>Advanced Television Systems Committee</para>
+        <para>
+          Advanced Television Systems Committee
+        </para>
       </glossdef>
     </glossentry>
@@ -157,5 +187,7 @@
       </glossterm>
       <glossdef>
-        <para>Accessibility ToolKit</para>
+        <para>
+          Accessibility ToolKit
+        </para>
       </glossdef>
     </glossentry>
@@ -166,5 +198,7 @@
       </glossterm>
       <glossdef>
-        <para>Audio Video Interleave</para>
+        <para>
+          Audio Video Interleave
+        </para>
       </glossdef>
     </glossentry>
@@ -175,5 +209,7 @@
       </glossterm>
       <glossdef>
-        <para>Abstract Window Toolkit</para>
+        <para>
+          Abstract Window Toolkit
+        </para>
       </glossdef>
     </glossentry>
@@ -184,5 +220,7 @@
       </glossterm>
       <glossdef>
-        <para>Basic Encoding Rules</para>
+        <para>
+          Basic Encoding Rules
+        </para>
       </glossdef>
     </glossentry>
@@ -193,5 +231,7 @@
       </glossterm>
       <glossdef>
-        <para>Berkeley Internet Name Domain</para>
+        <para>
+          Berkeley Internet Name Domain
+        </para>
       </glossdef>
     </glossentry>
@@ -202,5 +242,7 @@
       </glossterm>
       <glossdef>
-        <para>Basic Input/Output System</para>
+        <para>
+          Basic Input/Output System
+        </para>
       </glossdef>
     </glossentry>
@@ -211,5 +253,7 @@
       </glossterm>
       <glossdef>
-        <para>Beyond Linux From Scratch</para>
+        <para>
+          Beyond Linux From Scratch
+        </para>
       </glossdef>
     </glossentry>
@@ -220,5 +264,7 @@
       </glossterm>
       <glossdef>
-        <para>Bit MaP</para>
+        <para>
+          Bit MaP
+        </para>
       </glossdef>
     </glossentry>
@@ -229,5 +275,7 @@
       </glossterm>
       <glossdef>
-        <para>Compact Disk</para>
+        <para>
+          Compact Disk
+        </para>
       </glossdef>
     </glossentry>
@@ -238,5 +286,7 @@
       </glossterm>
       <glossdef>
-        <para>Compact Disc Digital Audio</para>
+        <para>
+          Compact Disc Digital Audio
+        </para>
       </glossdef>
     </glossentry>
@@ -247,5 +297,7 @@
       </glossterm>
       <glossdef>
-        <para>Common Internet File System</para>
+        <para>
+          Common Internet File System
+        </para>
         <glossseealso otherterm="gSMB">SMB</glossseealso>
       </glossdef>
@@ -257,5 +309,7 @@
       </glossterm>
       <glossdef>
-        <para>Cryptographic Message Syntax</para>
+        <para>
+          Cryptographic Message Syntax
+        </para>
       </glossdef>
     </glossentry>
@@ -266,5 +320,7 @@
       </glossterm>
       <glossdef>
-        <para>COmpression/DECompression module</para>
+        <para>
+          COmpression/DECompression module
+        </para>
       </glossdef>
     </glossentry>
@@ -275,5 +331,7 @@
       </glossterm>
       <glossdef>
-        <para>Common Object Request Broker Architecture</para>
+        <para>
+          Common Object Request Broker Architecture
+        </para>
       </glossdef>
     </glossentry>
@@ -284,5 +342,7 @@
       </glossterm>
       <glossdef>
-        <para>Central Processing Unit</para>
+        <para>
+          Central Processing Unit
+        </para>
       </glossdef>
     </glossentry>
@@ -293,5 +353,7 @@
       </glossterm>
       <glossdef>
-        <para>Color Rendering Dictionary</para>
+        <para>
+          Color Rendering Dictionary
+        </para>
       </glossdef>
     </glossentry>
@@ -302,5 +364,7 @@
       </glossterm>
       <glossdef>
-        <para>Color Space Array</para>
+        <para>
+          Color Space Array
+        </para>
       </glossdef>
     </glossentry>
@@ -311,5 +375,7 @@
       </glossterm>
       <glossdef>
-        <para>Contents Scrambling System</para>
+        <para>
+          Contents Scrambling System
+        </para>
       </glossdef>
     </glossentry>
@@ -320,5 +386,7 @@
       </glossterm>
       <glossdef>
-        <para>Cascading Style Sheets</para>
+        <para>
+          Cascading Style Sheets
+        </para>
       </glossdef>
     </glossentry>
@@ -329,5 +397,7 @@
       </glossterm>
       <glossdef>
-        <para>Common Unix Printing System</para>
+        <para>
+          Common Unix Printing System
+        </para>
       </glossdef>
     </glossentry>
@@ -338,5 +408,7 @@
       </glossterm>
       <glossdef>
-        <para>Concurrent Versions System</para>
+        <para>
+          Concurrent Versions System
+        </para>
       </glossdef>
     </glossentry>
@@ -347,5 +419,7 @@
       </glossterm>
       <glossdef>
-        <para>Disc At Once</para>
+        <para>
+          Disc At Once
+        </para>
       </glossdef>
     </glossentry>
@@ -356,5 +430,7 @@
       </glossterm>
       <glossdef>
-        <para>Directory Address Resolution Protocol Allocation</para>
+        <para>
+          Directory Address Resolution Protocol Allocation
+        </para>
       </glossdef>
     </glossentry>
@@ -365,5 +441,7 @@
       </glossterm>
       <glossdef>
-        <para>Digital Equipment Corporation</para>
+        <para>
+          Digital Equipment Corporation
+        </para>
       </glossdef>
     </glossentry>
@@ -374,5 +452,7 @@
       </glossterm>
       <glossdef>
-        <para>Distinguished Encoding Rules</para>
+        <para>
+          Distinguished Encoding Rules
+        </para>
       </glossdef>
     </glossentry>
@@ -383,5 +463,7 @@
       </glossterm>
       <glossdef>
-        <para>Data Encryption Standard</para>
+        <para>
+          Data Encryption Standard
+        </para>
       </glossdef>
     </glossentry>
@@ -392,5 +474,7 @@
       </glossterm>
       <glossdef>
-        <para>Dynamic Host Configuration Protocol</para>
+        <para>
+          Dynamic Host Configuration Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -401,5 +485,7 @@
       </glossterm>
       <glossdef>
-        <para>Dictionary Server Protocol (RFC 2229)</para>
+        <para>
+          Dictionary Server Protocol (RFC 2229)
+        </para>
       </glossdef>
     </glossentry>
@@ -410,5 +496,7 @@
       </glossterm>
       <glossdef>
-        <para>German Industrial Norm</para>
+        <para>
+          German Industrial Norm
+        </para>
       </glossdef>
     </glossentry>
@@ -419,5 +507,7 @@
       </glossterm>
       <glossdef>
-        <para>Domain Name Service</para>
+        <para>
+          Domain Name Service
+        </para>
       </glossdef>
     </glossentry>
@@ -428,5 +518,7 @@
       </glossterm>
       <glossdef>
-        <para>Disk Operating System</para>
+        <para>
+          Disk Operating System
+        </para>
       </glossdef>
     </glossentry>
@@ -437,5 +529,7 @@
       </glossterm>
       <glossdef>
-        <para>Direct Rendering Infrastructure</para>
+        <para>
+          Direct Rendering Infrastructure
+        </para>
       </glossdef>
     </glossentry>
@@ -446,5 +540,7 @@
       </glossterm>
       <glossdef>
-        <para>Document Structuring Conventions</para>
+        <para>
+          Document Structuring Conventions
+        </para>
       </glossdef>
     </glossentry>
@@ -455,5 +551,7 @@
       </glossterm>
       <glossdef>
-        <para>Dynamic Shared Objects</para>
+        <para>
+          Dynamic Shared Objects
+        </para>
       </glossdef>
     </glossentry>
@@ -464,5 +562,7 @@
       </glossterm>
       <glossdef>
-        <para>Document Style Semantics and Specification Language</para>
+        <para>
+          Document Style Semantics and Specification Language
+        </para>
       </glossdef>
     </glossentry>
@@ -473,5 +573,7 @@
       </glossterm>
       <glossdef>
-        <para>Digital Video</para>
+        <para>
+          Digital Video
+        </para>
       </glossdef>
     </glossentry>
@@ -482,5 +584,7 @@
       </glossterm>
       <glossdef>
-        <para>Digital Versatile Disk (also Digital Video Disk)</para>
+        <para>
+          Digital Versatile Disk (also Digital Video Disk)
+        </para>
       </glossdef>
     </glossentry>
@@ -491,5 +595,7 @@
       </glossterm>
       <glossdef>
-        <para>DeVice Independent</para>
+        <para>
+          DeVice Independent
+        </para>
       </glossdef>
     </glossentry>
@@ -500,5 +606,7 @@
       </glossterm>
       <glossdef>
-        <para>Executable and Linking Format</para>
+        <para>
+          Executable and Linking Format
+        </para>
       </glossdef>
     </glossentry>
@@ -509,5 +617,7 @@
       </glossterm>
       <glossdef>
-        <para>Enhanced Parallel Port</para>
+        <para>
+          Enhanced Parallel Port
+        </para>
       </glossdef>
     </glossentry>
@@ -518,5 +628,7 @@
       </glossterm>
       <glossdef>
-        <para>Encapsulated PostScript</para>
+        <para>
+          Encapsulated PostScript
+        </para>
       </glossdef>
     </glossentry>
@@ -527,5 +639,7 @@
       </glossterm>
       <glossdef>
-        <para>Enlighten Sound Daemon</para>
+        <para>
+          Enlighten Sound Daemon
+        </para>
       </glossdef>
     </glossentry>
@@ -536,5 +650,7 @@
       </glossterm>
       <glossdef>
-        <para>Extended Simple Mail Transfer Protocol</para>
+        <para>
+          Extended Simple Mail Transfer Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -545,5 +661,7 @@
       </glossterm>
       <glossdef>
-        <para>File Alteration Monitor</para>
+        <para>
+          File Alteration Monitor
+        </para>
       </glossdef>
     </glossentry>
@@ -554,5 +672,7 @@
       </glossterm>
       <glossdef>
-        <para>Fast Assembly Mpeg Encoder</para>
+        <para>
+          Fast Assembly Mpeg Encoder
+        </para>
       </glossdef>
     </glossentry>
@@ -563,5 +683,7 @@
       </glossterm>
       <glossdef>
-        <para>Frequently Asked Questions</para>
+        <para>
+          Frequently Asked Questions
+        </para>
       </glossdef>
     </glossentry>
@@ -572,5 +694,7 @@
       </glossterm>
       <glossdef>
-        <para>Facsimile</para>
+        <para>
+          Facsimile
+        </para>
       </glossdef>
     </glossentry>
@@ -581,5 +705,7 @@
       </glossterm>
       <glossdef>
-        <para>Frame Buffer</para>
+        <para>
+          Frame Buffer
+        </para>
       </glossdef>
     </glossentry>
@@ -590,5 +716,7 @@
       </glossterm>
       <glossdef>
-        <para>File Hierarchy Standard</para>
+        <para>
+          File Hierarchy Standard
+        </para>
       </glossdef>
     </glossentry>
@@ -610,5 +738,7 @@
       </glossterm>
       <glossdef>
-        <para>Formatted Objects</para>
+        <para>
+          Formatted Objects
+        </para>
       </glossdef>
     </glossentry>
@@ -619,5 +749,7 @@
       </glossterm>
       <glossdef>
-        <para>File Transfer Protocol</para>
+        <para>
+          File Transfer Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -672,5 +804,7 @@
       </glossterm>
       <glossdef>
-        <para>Group IDentity</para>
+        <para>
+          Group IDentity
+        </para>
       </glossdef>
     </glossentry>
@@ -681,5 +815,7 @@
       </glossterm>
       <glossdef>
-        <para>Graphics Interchange Format</para>
+        <para>
+          Graphics Interchange Format
+        </para>
       </glossdef>
     </glossentry>
@@ -690,5 +826,7 @@
       </glossterm>
       <glossdef>
-        <para>OpenGL Utility Toolkit</para>
+        <para>
+          OpenGL Utility Toolkit
+        </para>
       </glossdef>
     </glossentry>
@@ -743,5 +881,7 @@
       </glossterm>
       <glossdef>
-        <para>General Public License</para>
+        <para>
+          General Public License
+        </para>
       </glossdef>
     </glossentry>
@@ -752,5 +892,7 @@
       </glossterm>
       <glossdef>
-        <para>General Purpose Mouse</para>
+        <para>
+          General Purpose Mouse
+        </para>
       </glossdef>
     </glossentry>
@@ -761,5 +903,7 @@
       </glossterm>
       <glossdef>
-        <para>Generic Security Service</para>
+        <para>
+          Generic Security Service
+        </para>
       </glossdef>
     </glossentry>
@@ -770,5 +914,7 @@
       </glossterm>
       <glossdef>
-        <para>Generic Security Service Application Programming Interface</para>
+        <para>
+          Generic Security Service Application Programming Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -790,5 +936,7 @@
       </glossterm>
       <glossdef>
-        <para>Graphical User Interface</para>
+        <para>
+          Graphical User Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -799,5 +947,7 @@
       </glossterm>
       <glossdef>
-        <para>Hierarchical File System</para>
+        <para>
+          Hierarchical File System
+        </para>
       </glossdef>
     </glossentry>
@@ -808,5 +958,7 @@
       </glossterm>
       <glossdef>
-        <para>HyperText Markup Language</para>
+        <para>
+          HyperText Markup Language
+        </para>
       </glossdef>
     </glossentry>
@@ -817,5 +969,7 @@
       </glossterm>
       <glossdef>
-        <para>HyperText Transfer Protocol</para>
+        <para>
+          HyperText Transfer Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -826,5 +980,7 @@
       </glossterm>
       <glossdef>
-        <para>HyperText Transfer Protocol Secured</para>
+        <para>
+          HyperText Transfer Protocol Secured
+        </para>
       </glossdef>
     </glossentry>
@@ -835,5 +991,7 @@
       </glossterm>
       <glossdef>
-        <para>Hang UP</para>
+        <para>
+          Hang UP
+        </para>
       </glossdef>
     </glossentry>
@@ -844,5 +1002,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Assigned Numbers Authority</para>
+        <para>
+          Internet Assigned Numbers Authority
+        </para>
       </glossdef>
     </glossentry>
@@ -853,5 +1013,7 @@
       </glossterm>
       <glossdef>
-        <para>International Color Consortium</para>
+        <para>
+          International Color Consortium
+        </para>
       </glossdef>
     </glossentry>
@@ -862,5 +1024,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Control Message Protocol</para>
+        <para>
+          Internet Control Message Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -871,8 +1035,12 @@
       </glossterm>
       <glossdef>
-        <para>Integrated Drive Electronics</para>
-      </glossdef>
-      <glossdef>
-        <para>Integrated Development Environment</para>
+        <para>
+          Integrated Drive Electronics
+        </para>
+      </glossdef>
+      <glossdef>
+        <para>
+          Integrated Development Environment
+        </para>
       </glossdef>
     </glossentry>
@@ -883,5 +1051,7 @@
       </glossterm>
       <glossdef>
-        <para>Interface Definition Language</para>
+        <para>
+          Interface Definition Language
+        </para>
       </glossdef>
     </glossentry>
@@ -892,5 +1062,7 @@
       </glossterm>
       <glossdef>
-        <para>Ink Jet Systems</para>
+        <para>
+          Ink Jet Systems
+        </para>
       </glossdef>
     </glossentry>
@@ -901,5 +1073,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Location Server</para>
+        <para>
+          Internet Location Server
+        </para>
       </glossdef>
     </glossentry>
@@ -910,5 +1084,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Message Access Protocol</para>
+        <para>
+          Internet Message Access Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -919,5 +1095,7 @@
       </glossterm>
       <glossdef>
-        <para>Inode MONitor</para>
+        <para>
+          Inode MONitor
+        </para>
       </glossdef>
     </glossentry>
@@ -928,5 +1106,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Protocol</para>
+        <para>
+          Internet Protocol
+        </para>
         <glossseealso otherterm="gTCP">TCP</glossseealso>
       </glossdef>
@@ -938,5 +1118,7 @@
       </glossterm>
       <glossdef>
-        <para>Internetwork Packet eXchange</para>
+        <para>
+          Internetwork Packet eXchange
+        </para>
       </glossdef>
     </glossentry>
@@ -947,5 +1129,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Relay Chat</para>
+        <para>
+          Internet Relay Chat
+        </para>
       </glossdef>
     </glossentry>
@@ -956,5 +1140,7 @@
       </glossterm>
       <glossdef>
-        <para>Integrated Services Digital Network</para>
+        <para>
+          Integrated Services Digital Network
+        </para>
       </glossdef>
     </glossentry>
@@ -965,5 +1151,7 @@
       </glossterm>
       <glossdef>
-        <para>International Standards Organisation</para>
+        <para>
+          International Standards Organisation
+        </para>
       </glossdef>
     </glossentry>
@@ -974,5 +1162,7 @@
       </glossterm>
       <glossdef>
-        <para>Internet Service Provider</para>
+        <para>
+          Internet Service Provider
+        </para>
       </glossdef>
     </glossentry>
@@ -983,5 +1173,7 @@
       </glossterm>
       <glossdef>
-        <para>ImpulseTracker Module</para>
+        <para>
+          ImpulseTracker Module
+        </para>
       </glossdef>
     </glossentry>
@@ -992,5 +1184,7 @@
       </glossterm>
       <glossdef>
-        <para>Java Advanced Imaging</para>
+        <para>
+          Java Advanced Imaging
+        </para>
       </glossdef>
     </glossentry>
@@ -1001,5 +1195,7 @@
       </glossterm>
       <glossdef>
-        <para>Java ARchive</para>
+        <para>
+          Java ARchive
+        </para>
       </glossdef>
     </glossentry>
@@ -1010,5 +1206,7 @@
       </glossterm>
       <glossdef>
-        <para>Java Development Kit</para>
+        <para>
+          Java Development Kit
+        </para>
       </glossdef>
     </glossentry>
@@ -1021,4 +1219,5 @@
         <para>
           <acronym>JPEG</acronym> File Interchange Format
+        
         </para>
       </glossdef>
@@ -1030,5 +1229,7 @@
       </glossterm>
       <glossdef>
-        <para>Joint Photographic Experts Group</para>
+        <para>
+          Joint Photographic Experts Group
+        </para>
       </glossdef>
     </glossentry>
@@ -1039,5 +1240,7 @@
       </glossterm>
       <glossdef>
-        <para>Key Distribution Center</para>
+        <para>
+          Key Distribution Center
+        </para>
       </glossdef>
     </glossentry>
@@ -1048,5 +1251,7 @@
       </glossterm>
       <glossdef>
-        <para>KDesktop Environment</para>
+        <para>
+          KDesktop Environment
+        </para>
       </glossdef>
     </glossentry>
@@ -1057,5 +1262,7 @@
       </glossterm>
       <glossdef>
-        <para>Lame Ain't an MP3 Encoder</para>
+        <para>
+          Lame Ain't an MP3 Encoder
+        </para>
       </glossdef>
     </glossentry>
@@ -1066,5 +1273,7 @@
       </glossterm>
       <glossdef>
-        <para>Local Area Network</para>
+        <para>
+          Local Area Network
+        </para>
       </glossdef>
     </glossentry>
@@ -1075,5 +1284,7 @@
       </glossterm>
       <glossdef>
-        <para>Lightweight Directory Access Protocol</para>
+        <para>
+          Lightweight Directory Access Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1084,5 +1295,7 @@
       </glossterm>
       <glossdef>
-        <para>Lightweight Data Interchange Format</para>
+        <para>
+          Lightweight Data Interchange Format
+        </para>
       </glossdef>
     </glossentry>
@@ -1093,5 +1306,7 @@
       </glossterm>
       <glossdef>
-        <para>Linux From Scratch</para>
+        <para>
+          Linux From Scratch
+        </para>
       </glossdef>
     </glossentry>
@@ -1102,5 +1317,7 @@
       </glossterm>
       <glossdef>
-        <para>Library General Public License</para>
+        <para>
+          Library General Public License
+        </para>
       </glossdef>
     </glossentry>
@@ -1111,5 +1328,7 @@
       </glossterm>
       <glossdef>
-        <para>Line PRinter</para>
+        <para>
+          Line PRinter
+        </para>
       </glossdef>
     </glossentry>
@@ -1120,5 +1339,7 @@
       </glossterm>
       <glossdef>
-        <para>Lempel-Ziv-Oberhumer</para>
+        <para>
+          Lempel-Ziv-Oberhumer
+        </para>
       </glossdef>
     </glossentry>
@@ -1129,5 +1350,7 @@
       </glossterm>
       <glossdef>
-        <para>Lempel-Ziv-Welch</para>
+        <para>
+          Lempel-Ziv-Welch
+        </para>
       </glossdef>
     </glossentry>
@@ -1138,5 +1361,7 @@
       </glossterm>
       <glossdef>
-        <para>Media Access Control</para>
+        <para>
+          Media Access Control
+        </para>
       </glossdef>
     </glossentry>
@@ -1147,5 +1372,7 @@
       </glossterm>
       <glossdef>
-        <para>Multimedia COmmunication Protocol</para>
+        <para>
+          Multimedia COmmunication Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1156,5 +1383,7 @@
       </glossterm>
       <glossdef>
-        <para>Multipoint Control Unit</para>
+        <para>
+          Multipoint Control Unit
+        </para>
       </glossdef>
     </glossentry>
@@ -1165,5 +1394,7 @@
       </glossterm>
       <glossdef>
-        <para>Message-Digest</para>
+        <para>
+          Message-Digest
+        </para>
       </glossdef>
     </glossentry>
@@ -1174,5 +1405,7 @@
       </glossterm>
       <glossdef>
-        <para>Mail Delivery Agent</para>
+        <para>
+          Mail Delivery Agent
+        </para>
       </glossdef>
     </glossentry>
@@ -1183,5 +1416,7 @@
       </glossterm>
       <glossdef>
-        <para>MED/OctaMED Module</para>
+        <para>
+          MED/OctaMED Module
+        </para>
       </glossdef>
     </glossentry>
@@ -1192,5 +1427,7 @@
       </glossterm>
       <glossdef>
-        <para>Musical Instrument Digital Interface</para>
+        <para>
+          Musical Instrument Digital Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -1201,5 +1438,7 @@
       </glossterm>
       <glossdef>
-        <para>Maker Interchange Format</para>
+        <para>
+          Maker Interchange Format
+        </para>
       </glossdef>
     </glossentry>
@@ -1210,5 +1449,7 @@
       </glossterm>
       <glossdef>
-        <para>Media Independent Interface</para>
+        <para>
+          Media Independent Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -1219,5 +1460,7 @@
       </glossterm>
       <glossdef>
-        <para>Multipurpose Internet Mail Extensions</para>
+        <para>
+          Multipurpose Internet Mail Extensions
+        </para>
       </glossdef>
     </glossentry>
@@ -1228,5 +1471,7 @@
       </glossterm>
       <glossdef>
-        <para>Massachusetts Institute of Technology</para>
+        <para>
+          Massachusetts Institute of Technology
+        </para>
       </glossdef>
     </glossentry>
@@ -1237,5 +1482,7 @@
       </glossterm>
       <glossdef>
-        <para>Multiple-image Network Graphics</para>
+        <para>
+          Multiple-image Network Graphics
+        </para>
       </glossdef>
     </glossentry>
@@ -1246,5 +1493,7 @@
       </glossterm>
       <glossdef>
-        <para>ProTracker Module</para>
+        <para>
+          ProTracker Module
+        </para>
       </glossdef>
     </glossentry>
@@ -1255,5 +1504,7 @@
       </glossterm>
       <glossdef>
-        <para>MPEG-1 audio layer 3</para>
+        <para>
+          MPEG-1 audio layer 3
+        </para>
       </glossdef>
     </glossentry>
@@ -1264,5 +1515,7 @@
       </glossterm>
       <glossdef>
-        <para>Moving Picture Experts Group</para>
+        <para>
+          Moving Picture Experts Group
+        </para>
       </glossdef>
     </glossentry>
@@ -1273,5 +1526,7 @@
       </glossterm>
       <glossdef>
-        <para>Magick Scripting Language</para>
+        <para>
+          Magick Scripting Language
+        </para>
       </glossdef>
     </glossentry>
@@ -1282,5 +1537,7 @@
       </glossterm>
       <glossdef>
-        <para>Mail Transport Agent</para>
+        <para>
+          Mail Transport Agent
+        </para>
       </glossdef>
     </glossentry>
@@ -1291,5 +1548,7 @@
       </glossterm>
       <glossdef>
-        <para>MultiTracker Module</para>
+        <para>
+          MultiTracker Module
+        </para>
       </glossdef>
     </glossentry>
@@ -1300,5 +1559,7 @@
       </glossterm>
       <glossdef>
-        <para>Mail User Agent</para>
+        <para>
+          Mail User Agent
+        </para>
       </glossdef>
     </glossentry>
@@ -1309,5 +1570,7 @@
       </glossterm>
       <glossdef>
-        <para>Netwide ASseMbler</para>
+        <para>
+          Netwide ASseMbler
+        </para>
       </glossdef>
     </glossentry>
@@ -1318,5 +1581,7 @@
       </glossterm>
       <glossdef>
-        <para>Network News Transfer Protocol</para>
+        <para>
+          Network News Transfer Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1327,5 +1592,7 @@
       </glossterm>
       <glossdef>
-        <para>Network File System</para>
+        <para>
+          Network File System
+        </para>
       </glossdef>
     </glossentry>
@@ -1336,5 +1603,7 @@
       </glossterm>
       <glossdef>
-        <para>Network Information Service</para>
+        <para>
+          Network Information Service
+        </para>
       </glossdef>
     </glossentry>
@@ -1345,5 +1614,7 @@
       </glossterm>
       <glossdef>
-        <para>Native Posix Thread Library</para>
+        <para>
+          Native Posix Thread Library
+        </para>
       </glossdef>
     </glossentry>
@@ -1354,5 +1625,7 @@
       </glossterm>
       <glossdef>
-        <para>Netscape Portable Runtime</para>
+        <para>
+          Netscape Portable Runtime
+        </para>
       </glossdef>
     </glossentry>
@@ -1363,5 +1636,7 @@
       </glossterm>
       <glossdef>
-        <para>Network Security Services</para>
+        <para>
+          Network Security Services
+        </para>
       </glossdef>
     </glossentry>
@@ -1372,5 +1647,7 @@
       </glossterm>
       <glossdef>
-        <para>Network Time Protocol</para>
+        <para>
+          Network Time Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1381,5 +1658,7 @@
       </glossterm>
       <glossdef>
-        <para>Object Activation Framework</para>
+        <para>
+          Object Activation Framework
+        </para>
       </glossdef>
     </glossentry>
@@ -1390,5 +1669,7 @@
       </glossterm>
       <glossdef>
-        <para>Open DataBase Connectivity</para>
+        <para>
+          Open DataBase Connectivity
+        </para>
       </glossdef>
     </glossentry>
@@ -1399,5 +1680,7 @@
       </glossterm>
       <glossdef>
-        <para>Open Metadata Framework</para>
+        <para>
+          Open Metadata Framework
+        </para>
       </glossdef>
     </glossentry>
@@ -1408,5 +1691,7 @@
       </glossterm>
       <glossdef>
-        <para>Object Request Broker</para>
+        <para>
+          Object Request Broker
+        </para>
         <glossseealso otherterm="gCORBA">CORBA</glossseealso>
       </glossdef>
@@ -1418,5 +1703,7 @@
       </glossterm>
       <glossdef>
-        <para>Object Relational Database Management System</para>
+        <para>
+          Object Relational Database Management System
+        </para>
       </glossdef>
     </glossentry>
@@ -1427,5 +1714,7 @@
       </glossterm>
       <glossdef>
-        <para>Operating System</para>
+        <para>
+          Operating System
+        </para>
       </glossdef>
     </glossentry>
@@ -1436,5 +1725,7 @@
       </glossterm>
       <glossdef>
-        <para>Open Software Foundation</para>
+        <para>
+          Open Software Foundation
+        </para>
       </glossdef>
     </glossentry>
@@ -1445,5 +1736,7 @@
       </glossterm>
       <glossdef>
-        <para>Open Sound System</para>
+        <para>
+          Open Sound System
+        </para>
       </glossdef>
     </glossentry>
@@ -1454,5 +1747,7 @@
       </glossterm>
       <glossdef>
-        <para>Pluggable authentication Modules</para>
+        <para>
+          Pluggable authentication Modules
+        </para>
       </glossdef>
     </glossentry>
@@ -1463,5 +1758,7 @@
       </glossterm>
       <glossdef>
-        <para>Portable BitMap</para>
+        <para>
+          Portable BitMap
+        </para>
       </glossdef>
     </glossentry>
@@ -1472,5 +1769,7 @@
       </glossterm>
       <glossdef>
-        <para>Peripheral Component Interconnect</para>
+        <para>
+          Peripheral Component Interconnect
+        </para>
       </glossdef>
     </glossentry>
@@ -1481,5 +1780,7 @@
       </glossterm>
       <glossdef>
-        <para>Printer Control Language</para>
+        <para>
+          Printer Control Language
+        </para>
       </glossdef>
     </glossentry>
@@ -1490,5 +1791,7 @@
       </glossterm>
       <glossdef>
-        <para>Pulse Code Modulation</para>
+        <para>
+          Pulse Code Modulation
+        </para>
       </glossdef>
     </glossentry>
@@ -1499,5 +1802,7 @@
       </glossterm>
       <glossdef>
-        <para>Primary Domain Controller</para>
+        <para>
+          Primary Domain Controller
+        </para>
       </glossdef>
     </glossentry>
@@ -1508,5 +1813,7 @@
       </glossterm>
       <glossdef>
-        <para>Portable Document Format</para>
+        <para>
+          Portable Document Format
+        </para>
       </glossdef>
     </glossentry>
@@ -1517,5 +1824,7 @@
       </glossterm>
       <glossdef>
-        <para>PHP Extension and Application Repository</para>
+        <para>
+          PHP Extension and Application Repository
+        </para>
       </glossdef>
     </glossentry>
@@ -1526,5 +1835,7 @@
       </glossterm>
       <glossdef>
-        <para>Portable Grey Map</para>
+        <para>
+          Portable Grey Map
+        </para>
       </glossdef>
     </glossentry>
@@ -1535,5 +1846,7 @@
       </glossterm>
       <glossdef>
-        <para>Pretty Good Privacy</para>
+        <para>
+          Pretty Good Privacy
+        </para>
       </glossdef>
     </glossentry>
@@ -1544,5 +1857,7 @@
       </glossterm>
       <glossdef>
-        <para>PHP Hypertext Preprocessor</para>
+        <para>
+          PHP Hypertext Preprocessor
+        </para>
       </glossdef>
     </glossentry>
@@ -1553,5 +1868,7 @@
       </glossterm>
       <glossdef>
-        <para>Personal Information Manager</para>
+        <para>
+          Personal Information Manager
+        </para>
       </glossdef>
     </glossentry>
@@ -1562,5 +1879,7 @@
       </glossterm>
       <glossdef>
-        <para>Parallel Line Internet Protocol</para>
+        <para>
+          Parallel Line Internet Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1571,5 +1890,7 @@
       </glossterm>
       <glossdef>
-        <para>Portable Network Graphics</para>
+        <para>
+          Portable Network Graphics
+        </para>
       </glossdef>
     </glossentry>
@@ -1580,5 +1901,7 @@
       </glossterm>
       <glossdef>
-        <para>Portable Object</para>
+        <para>
+          Portable Object
+        </para>
       </glossdef>
     </glossentry>
@@ -1589,5 +1912,7 @@
       </glossterm>
       <glossdef>
-        <para>Plain Old Documentation</para>
+        <para>
+          Plain Old Documentation
+        </para>
       </glossdef>
     </glossentry>
@@ -1598,5 +1923,7 @@
       </glossterm>
       <glossdef>
-        <para>Post Office Protocol</para>
+        <para>
+          Post Office Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1607,5 +1934,7 @@
       </glossterm>
       <glossdef>
-        <para>PostScript Printer Description</para>
+        <para>
+          PostScript Printer Description
+        </para>
       </glossdef>
     </glossentry>
@@ -1616,5 +1945,7 @@
       </glossterm>
       <glossdef>
-        <para>Portable Pixel Map</para>
+        <para>
+          Portable Pixel Map
+        </para>
       </glossdef>
     </glossentry>
@@ -1625,5 +1956,7 @@
       </glossterm>
       <glossdef>
-        <para>Point to Point Protocol</para>
+        <para>
+          Point to Point Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1634,5 +1967,7 @@
       </glossterm>
       <glossdef>
-        <para>Point to Point Protocol over Ethernet</para>
+        <para>
+          Point to Point Protocol over Ethernet
+        </para>
       </glossdef>
     </glossentry>
@@ -1643,5 +1978,7 @@
       </glossterm>
       <glossdef>
-        <para>PostScript</para>
+        <para>
+          PostScript
+        </para>
       </glossdef>
     </glossentry>
@@ -1652,5 +1989,7 @@
       </glossterm>
       <glossdef>
-        <para>Remote Authentication Dial-In User Service</para>
+        <para>
+          Remote Authentication Dial-In User Service
+        </para>
       </glossdef>
     </glossentry>
@@ -1661,5 +2000,7 @@
       </glossterm>
       <glossdef>
-        <para>Random Access Memory</para>
+        <para>
+          Random Access Memory
+        </para>
       </glossdef>
     </glossentry>
@@ -1670,5 +2011,7 @@
       </glossterm>
       <glossdef>
-        <para>Reverse Address Resolution Protocol</para>
+        <para>
+          Reverse Address Resolution Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1679,5 +2022,7 @@
       </glossterm>
       <glossdef>
-        <para>Revision Control System</para>
+        <para>
+          Revision Control System
+        </para>
       </glossdef>
     </glossentry>
@@ -1688,5 +2033,7 @@
       </glossterm>
       <glossdef>
-        <para>Request For Comments</para>
+        <para>
+          Request For Comments
+        </para>
       </glossdef>
     </glossentry>
@@ -1697,5 +2044,7 @@
       </glossterm>
       <glossdef>
-        <para>Red Green Blue</para>
+        <para>
+          Red Green Blue
+        </para>
       </glossdef>
     </glossentry>
@@ -1706,5 +2055,7 @@
       </glossterm>
       <glossdef>
-        <para>Red Green Blue Alpha</para>
+        <para>
+          Red Green Blue Alpha
+        </para>
       </glossdef>
     </glossentry>
@@ -1715,5 +2066,7 @@
       </glossterm>
       <glossdef>
-        <para>Read-Only Memory</para>
+        <para>
+          Read-Only Memory
+        </para>
       </glossdef>
     </glossentry>
@@ -1724,5 +2077,7 @@
       </glossterm>
       <glossdef>
-        <para>Roaring Penguin</para>
+        <para>
+          Roaring Penguin
+        </para>
       </glossdef>
     </glossentry>
@@ -1733,5 +2088,7 @@
       </glossterm>
       <glossdef>
-        <para>Remote Procedure Call</para>
+        <para>
+          Remote Procedure Call
+        </para>
       </glossdef>
     </glossentry>
@@ -1742,5 +2099,7 @@
       </glossterm>
       <glossdef>
-        <para>Real Time Clock</para>
+        <para>
+          Real Time Clock
+        </para>
       </glossdef>
     </glossentry>
@@ -1751,5 +2110,7 @@
       </glossterm>
       <glossdef>
-        <para>Real Time Protocol</para>
+        <para>
+          Real Time Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1760,5 +2121,7 @@
       </glossterm>
       <glossdef>
-        <para>Read Write</para>
+        <para>
+          Read Write
+        </para>
       </glossdef>
     </glossentry>
@@ -1769,5 +2132,7 @@
       </glossterm>
       <glossdef>
-        <para>ScreamTracker Version 3 Module</para>
+        <para>
+          ScreamTracker Version 3 Module
+        </para>
       </glossdef>
     </glossentry>
@@ -1780,4 +2145,5 @@
         <para>
           Secure/<acronym>MIME</acronym>
+        
         </para>
       </glossdef>
@@ -1789,5 +2155,7 @@
       </glossterm>
       <glossdef>
-        <para>Scanner Access Now Easy</para>
+        <para>
+          Scanner Access Now Easy
+        </para>
       </glossdef>
     </glossentry>
@@ -1798,5 +2166,7 @@
       </glossterm>
       <glossdef>
-        <para>Simple Authentication and Security Layer</para>
+        <para>
+          Simple Authentication and Security Layer
+        </para>
       </glossdef>
     </glossentry>
@@ -1807,5 +2177,7 @@
       </glossterm>
       <glossdef>
-        <para>Serial Advanced Technology Attachment</para>
+        <para>
+          Serial Advanced Technology Attachment
+        </para>
       </glossdef>
     </glossentry>
@@ -1816,5 +2188,7 @@
       </glossterm>
       <glossdef>
-        <para>Standard Build Unit</para>
+        <para>
+          Standard Build Unit
+        </para>
       </glossdef>
     </glossentry>
@@ -1825,5 +2199,7 @@
       </glossterm>
       <glossdef>
-        <para>Small Computer System Interface</para>
+        <para>
+          Small Computer System Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -1834,5 +2210,7 @@
       </glossterm>
       <glossdef>
-        <para>Software Development Kit</para>
+        <para>
+          Software Development Kit
+        </para>
       </glossdef>
     </glossentry>
@@ -1843,5 +2221,7 @@
       </glossterm>
       <glossdef>
-        <para>Standard Generalized Markup Language</para>
+        <para>
+          Standard Generalized Markup Language
+        </para>
       </glossdef>
     </glossentry>
@@ -1852,5 +2232,7 @@
       </glossterm>
       <glossdef>
-        <para>Self Monitoring Analysis and Reporting Technology</para>
+        <para>
+          Self Monitoring Analysis and Reporting Technology
+        </para>
       </glossdef>
     </glossentry>
@@ -1861,5 +2243,7 @@
       </glossterm>
       <glossdef>
-        <para>Server Message Block</para>
+        <para>
+          Server Message Block
+        </para>
       </glossdef>
     </glossentry>
@@ -1870,5 +2254,7 @@
       </glossterm>
       <glossdef>
-        <para>Synchronized Multimedia Integration Language</para>
+        <para>
+          Synchronized Multimedia Integration Language
+        </para>
       </glossdef>
     </glossentry>
@@ -1879,5 +2265,7 @@
       </glossterm>
       <glossdef>
-        <para>Simple Mail Transfer Protocol</para>
+        <para>
+          Simple Mail Transfer Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1888,5 +2276,7 @@
       </glossterm>
       <glossdef>
-        <para>Structured Query Language</para>
+        <para>
+          Structured Query Language
+        </para>
       </glossdef>
     </glossentry>
@@ -1897,5 +2287,7 @@
       </glossterm>
       <glossdef>
-        <para>Secure SHell</para>
+        <para>
+          Secure SHell
+        </para>
       </glossdef>
     </glossentry>
@@ -1906,5 +2298,7 @@
       </glossterm>
       <glossdef>
-        <para>Secure Sockets Layer</para>
+        <para>
+          Secure Sockets Layer
+        </para>
       </glossdef>
     </glossentry>
@@ -1915,5 +2309,7 @@
       </glossterm>
       <glossdef>
-        <para>Set User IDentity</para>
+        <para>
+          Set User IDentity
+        </para>
       </glossdef>
     </glossentry>
@@ -1924,5 +2320,7 @@
       </glossterm>
       <glossdef>
-        <para>Scalable Vector Graphics</para>
+        <para>
+          Scalable Vector Graphics
+        </para>
       </glossdef>
     </glossentry>
@@ -1933,5 +2331,7 @@
       </glossterm>
       <glossdef>
-        <para>Super Video Graphics Array</para>
+        <para>
+          Super Video Graphics Array
+        </para>
       </glossdef>
     </glossentry>
@@ -1942,5 +2342,7 @@
       </glossterm>
       <glossdef>
-        <para>Tool Command Language</para>
+        <para>
+          Tool Command Language
+        </para>
       </glossdef>
     </glossentry>
@@ -1951,5 +2353,7 @@
       </glossterm>
       <glossdef>
-        <para>Transmission Control Protocol</para>
+        <para>
+          Transmission Control Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -1960,5 +2364,7 @@
       </glossterm>
       <glossdef>
-        <para>Ticket-Granting Ticket</para>
+        <para>
+          Ticket-Granting Ticket
+        </para>
       </glossdef>
     </glossentry>
@@ -1969,5 +2375,7 @@
       </glossterm>
       <glossdef>
-        <para>Tag(ged) Image File Format</para>
+        <para>
+          Tag(ged) Image File Format
+        </para>
       </glossdef>
     </glossentry>
@@ -1978,5 +2386,7 @@
       </glossterm>
       <glossdef>
-        <para>Transport Layer Security</para>
+        <para>
+          Transport Layer Security
+        </para>
       </glossdef>
     </glossentry>
@@ -1987,5 +2397,7 @@
       </glossterm>
       <glossdef>
-        <para>TrueType Font</para>
+        <para>
+          TrueType Font
+        </para>
       </glossdef>
     </glossentry>
@@ -1996,5 +2408,7 @@
       </glossterm>
       <glossdef>
-        <para>Text To Speech</para>
+        <para>
+          Text To Speech
+        </para>
       </glossdef>
     </glossentry>
@@ -2005,5 +2419,7 @@
       </glossterm>
       <glossdef>
-        <para>Universal Character Set</para>
+        <para>
+          Universal Character Set
+        </para>
       </glossdef>
     </glossentry>
@@ -2014,5 +2430,7 @@
       </glossterm>
       <glossdef>
-        <para>Universal Disk Format</para>
+        <para>
+          Universal Disk Format
+        </para>
       </glossdef>
     </glossentry>
@@ -2023,5 +2441,7 @@
       </glossterm>
       <glossdef>
-        <para>User IDentity</para>
+        <para>
+          User IDentity
+        </para>
       </glossdef>
     </glossentry>
@@ -2032,5 +2452,7 @@
       </glossterm>
       <glossdef>
-        <para>User Datagram Protocol</para>
+        <para>
+          User Datagram Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -2041,5 +2463,7 @@
       </glossterm>
       <glossdef>
-        <para>User Interface</para>
+        <para>
+          User Interface
+        </para>
       </glossdef>
     </glossentry>
@@ -2050,5 +2474,7 @@
       </glossterm>
       <glossdef>
-        <para>Unified Modelling Language</para>
+        <para>
+          Unified Modelling Language
+        </para>
       </glossdef>
     </glossentry>
@@ -2059,5 +2485,7 @@
       </glossterm>
       <glossdef>
-        <para>Uniform Resource Locator</para>
+        <para>
+          Uniform Resource Locator
+        </para>
       </glossdef>
     </glossentry>
@@ -2068,5 +2496,7 @@
       </glossterm>
       <glossdef>
-        <para>Universal Serial Bus</para>
+        <para>
+          Universal Serial Bus
+        </para>
       </glossdef>
     </glossentry>
@@ -2077,5 +2507,7 @@
       </glossterm>
       <glossdef>
-        <para>Upstream Ready</para>
+        <para>
+          Upstream Ready
+        </para>
       </glossdef>
     </glossentry>
@@ -2086,5 +2518,7 @@
       </glossterm>
       <glossdef>
-        <para>UCS Transformation Format</para>
+        <para>
+          UCS Transformation Format
+        </para>
       </glossdef>
     </glossentry>
@@ -2095,5 +2529,7 @@
       </glossterm>
       <glossdef>
-        <para>Unix-to-Unix Copy Protocol</para>
+        <para>
+          Unix-to-Unix Copy Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -2104,5 +2540,7 @@
       </glossterm>
       <glossdef>
-        <para>Video Compact Disk</para>
+        <para>
+          Video Compact Disk
+        </para>
       </glossdef>
     </glossentry>
@@ -2113,5 +2551,7 @@
       </glossterm>
       <glossdef>
-        <para>Video Electronics Standards Association</para>
+        <para>
+          Video Electronics Standards Association
+        </para>
       </glossdef>
     </glossentry>
@@ -2122,5 +2562,7 @@
       </glossterm>
       <glossdef>
-        <para>Video Graphics Array</para>
+        <para>
+          Video Graphics Array
+        </para>
       </glossdef>
     </glossentry>
@@ -2131,5 +2573,7 @@
       </glossterm>
       <glossdef>
-        <para>Virtual Network Computer</para>
+        <para>
+          Virtual Network Computer
+        </para>
       </glossdef>
     </glossentry>
@@ -2140,5 +2584,7 @@
       </glossterm>
       <glossdef>
-        <para>Video OBject</para>
+        <para>
+          Video OBject
+        </para>
       </glossdef>
     </glossentry>
@@ -2149,5 +2595,7 @@
       </glossterm>
       <glossdef>
-        <para>Voice Over IP</para>
+        <para>
+          Voice Over IP
+        </para>
       </glossdef>
     </glossentry>
@@ -2158,5 +2606,7 @@
       </glossterm>
       <glossdef>
-        <para>World Wide Web Consortium</para>
+        <para>
+          World Wide Web Consortium
+        </para>
       </glossdef>
     </glossentry>
@@ -2167,5 +2617,7 @@
       </glossterm>
       <glossdef>
-        <para>Waveform Audio</para>
+        <para>
+          Waveform Audio
+        </para>
       </glossdef>
     </glossentry>
@@ -2176,5 +2628,7 @@
       </glossterm>
       <glossdef>
-        <para>World Wide Web</para>
+        <para>
+          World Wide Web
+        </para>
       </glossdef>
     </glossentry>
@@ -2185,5 +2639,7 @@
       </glossterm>
       <glossdef>
-        <para>XDisplay Manager Control Protocol</para>
+        <para>
+          XDisplay Manager Control Protocol
+        </para>
       </glossdef>
     </glossentry>
@@ -2194,5 +2650,7 @@
       </glossterm>
       <glossdef>
-        <para>FastTracker Module</para>
+        <para>
+          FastTracker Module
+        </para>
       </glossdef>
     </glossentry>
@@ -2203,5 +2661,7 @@
       </glossterm>
       <glossdef>
-        <para>eXtensible Markup Language</para>
+        <para>
+          eXtensible Markup Language
+        </para>
       </glossdef>
     </glossentry>
@@ -2212,5 +2672,7 @@
       </glossterm>
       <glossdef>
-        <para>eXtensible Style Language</para>
+        <para>
+          eXtensible Style Language
+        </para>
       </glossdef>
     </glossentry>
@@ -2221,5 +2683,7 @@
       </glossterm>
       <glossdef>
-        <para>eXtensible Style Language Transformation</para>
+        <para>
+          eXtensible Style Language Transformation
+        </para>
       </glossdef>
     </glossentry>
@@ -2230,5 +2694,7 @@
       </glossterm>
       <glossdef>
-        <para>X/Open System Management</para>
+        <para>
+          X/Open System Management
+        </para>
       </glossdef>
     </glossentry>
@@ -2239,5 +2705,7 @@
       </glossterm>
       <glossdef>
-        <para>XMultiMedia System</para>
+        <para>
+          XMultiMedia System
+        </para>
       </glossdef>
     </glossentry>
@@ -2248,5 +2716,7 @@
       </glossterm>
       <glossdef>
-        <para>Yellow Pages</para>
+        <para>
+          Yellow Pages
+        </para>
       </glossdef>
     </glossentry>
@@ -2257,5 +2727,7 @@
       </glossterm>
       <glossdef>
-        <para>Luminance-Bandwidth-Chrominance</para>
+        <para>
+          Luminance-Bandwidth-Chrominance
+        </para>
       </glossdef>
     </glossentry>
Index: appendices/mit-lic.xml
===================================================================
--- appendices/mit-lic.xml	(revision bf7a21ddeb19de583c1235a8bc9a799fe3447e4b)
+++ appendices/mit-lic.xml	(revision dcee7a56bb00fedc0b0ca76863f182c787316e61)
@@ -16,23 +16,31 @@
   <title>The MIT License</title>
 
-  <para>Copyright &copy; &copyrightdate; &copyholder;</para>
+  <para>
+    Copyright &copy; &copyrightdate; &copyholder;
+  </para>
 
-  <para>Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:</para>
+  <para>
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+  </para>
 
-  <para>The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.</para>
+  <para>
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+  </para>
 
-  <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.</para>
+  <para>
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+  </para>
 
 </appendix>
