Only use XML standard entities

diff --git a/doc/comstack.xml b/doc/comstack.xml
index bfec43d..7ef336a 100644 (file)
--- a/doc/comstack.xml
+++ b/doc/comstack.xml
@@ -1,4 +1,4 @@
-<!-- $Id: comstack.xml,v 1.14 2006-10-05 08:26:58 adam Exp $ -->
+<!-- $Id: comstack.xml,v 1.15 2007-02-01 09:56:14 adam Exp $ -->

  <chapter id="comstack"><title>The COMSTACK Module</title>
   
   <sect1 id="comstack.synopsis"><title>Synopsis (blocking mode)</title>
  <chapter id="comstack"><title>The COMSTACK Module</title>
   
   <sect1 id="comstack.synopsis"><title>Synopsis (blocking mode)</title>

@@ -431,7 +431,7 @@ if (buf)
    </para>
 
    <synopsis>
    </para>
 
    <synopsis>

-    &lt;host> &lsqb; ':' &lt;portnum> &rsqb;
+    &lt;host> [ ':' &lt;portnum> ]

    </synopsis>
 
    <para>
    </synopsis>
 
    <para>

@@ -559,7 +559,7 @@ if (buf)
    </para>
 
    <synopsis>
    </para>
 
    <synopsis>

-    extern const char *cs_errlist&lsqb;&rsqb;;
+    extern const char *cs_errlist[];

    </synopsis>
 
    <para>
    </synopsis>
 
    <para>

diff --git a/doc/credits.xml b/doc/credits.xml
index 1a6f667..d145a84 100644 (file)
--- a/doc/credits.xml
+++ b/doc/credits.xml
@@ -1,4 +1,4 @@
-<!-- $Id: credits.xml,v 1.16 2006-04-25 11:25:08 marc Exp $ -->
+<!-- $Id: credits.xml,v 1.17 2007-02-01 09:56:14 adam Exp $ -->

  <appendix id="credits"><title>Credits</title>
   <para>
    This appendix lists individuals that have contributed in the development
  <appendix id="credits"><title>Credits</title>
   <para>
    This appendix lists individuals that have contributed in the development

@@ -12,7 +12,7 @@
      Dimitrios Andreadis
     </para></listitem>
    <listitem><para>
      Dimitrios Andreadis
     </para></listitem>
    <listitem><para>

-     Morten B&oslash;geskov
+     Morten B&#xf8;geskov

     </para></listitem>
    <listitem><para>
      Rocco Carbone
     </para></listitem>
    <listitem><para>
      Rocco Carbone

@@ -93,7 +93,7 @@
      Charles Woodfield
     </para></listitem>
    <listitem><para>
      Charles Woodfield
     </para></listitem>
    <listitem><para>

-     Tom Andr&eacute; &Oslash;verland
+     Tom Andr&#xe9; &#xd8;verland

     </para></listitem>
   </itemizedlist>
  </appendix>
     </para></listitem>
   </itemizedlist>
  </appendix>

diff --git a/doc/frontend.xml b/doc/frontend.xml
index 0f83a6e..14a564b 100644 (file)
--- a/doc/frontend.xml
+++ b/doc/frontend.xml
@@ -1,4 +1,4 @@
-<!-- $Id: frontend.xml,v 1.32 2006-10-05 08:26:58 adam Exp $ -->
+<!-- $Id: frontend.xml,v 1.33 2007-02-01 09:56:14 adam Exp $ -->

  <chapter id="server"><title>Generic server</title>
   <sect1 id="server.introduction"><title>Introduction</title>
    
  <chapter id="server"><title>Generic server</title>
   <sect1 id="server.introduction"><title>Introduction</title>
    

@@ -200,12 +200,12 @@ int statserv_main(int argc, char **argv,
        </para></listitem></varlistentry>
      
      <varlistentry><term>
        </para></listitem></varlistentry>
      
      <varlistentry><term>

-       <literal>char logfile&lsqb;ODR_MAXNAME+1&rsqb;</literal></term>
+       <literal>char logfile[ODR_MAXNAME+1]</literal></term>

       <listitem><para>File for diagnostic output (&quot;&quot;: stderr).
        </para></listitem></varlistentry>
      
      <varlistentry><term>
       <listitem><para>File for diagnostic output (&quot;&quot;: stderr).
        </para></listitem></varlistentry>
      
      <varlistentry><term>

-       <literal>char apdufile&lsqb;ODR_MAXNAME+1&rsqb;</literal></term>
+       <literal>char apdufile[ODR_MAXNAME+1]</literal></term>

       <listitem><para>
        Name of file for logging incoming and outgoing APDUs
        (&quot;&quot;: don't log APDUs, &quot;-&quot;:
       <listitem><para>
        Name of file for logging incoming and outgoing APDUs
        (&quot;&quot;: don't log APDUs, &quot;-&quot;:

@@ -213,7 +213,7 @@ int statserv_main(int argc, char **argv,
        </para></listitem></varlistentry>
 
      <varlistentry><term>
        </para></listitem></varlistentry>
 
      <varlistentry><term>

-      <literal>char default_listen&lsqb;1024&rsqb;</literal></term>
+      <literal>char default_listen[1024]</literal></term>

       <listitem><para>Same form as the command-line specification of
        listener address. &quot;&quot;: no default listener address.
        Default is to listen at &quot;tcp:@:9999&quot;. You can only
       <listitem><para>Same form as the command-line specification of
        listener address. &quot;&quot;: no default listener address.
        Default is to listen at &quot;tcp:@:9999&quot;. You can only

@@ -244,12 +244,12 @@ int statserv_main(int argc, char **argv,
        </para></listitem></varlistentry>
 
      <varlistentry><term>
        </para></listitem></varlistentry>
 
      <varlistentry><term>

-       <literal>char configname&lsqb;ODR_MAXNAME+1&rsqb;</literal></term>
+       <literal>char configname[ODR_MAXNAME+1]</literal></term>

       <listitem><para>Passed to the backend when a new connection is received.
        </para></listitem></varlistentry>
 
      <varlistentry><term>
       <listitem><para>Passed to the backend when a new connection is received.
        </para></listitem></varlistentry>
 
      <varlistentry><term>

-       <literal>char setuid&lsqb;ODR_MAXNAME+1&rsqb;</literal></term>
+       <literal>char setuid[ODR_MAXNAME+1]</literal></term>

       <listitem><para>Set user id to the user specified, after binding
        the listener addresses.
        </para></listitem></varlistentry>
       <listitem><para>Set user id to the user specified, after binding
        the listener addresses.
        </para></listitem></varlistentry>

@@ -762,7 +762,7 @@ typedef struct bend_scan_rr {
    </para>
 
    <synopsis>
    </para>
 
    <synopsis>

-    hostname | IP-number &lsqb;: portnumber&rsqb;
+    hostname | IP-number [: portnumber]

    </synopsis>
    
    <para>
    </synopsis>
    
    <para>

diff --git a/doc/indexdata.xml b/doc/indexdata.xml
index d72a06b..44bbbe2 100644 (file)
--- a/doc/indexdata.xml
+++ b/doc/indexdata.xml
@@ -1,4 +1,4 @@
-<!-- $Id: indexdata.xml,v 1.9 2006-04-25 11:25:08 marc Exp $ -->
+<!-- $Id: indexdata.xml,v 1.10 2007-02-01 09:56:14 adam Exp $ -->

  <appendix id="indexdata"><title>About Index Data</title>
 
   <para>
  <appendix id="indexdata"><title>About Index Data</title>
 
   <para>

@@ -19,7 +19,7 @@
   <para>
    <address>
     Index Data ApS
   <para>
    <address>
     Index Data ApS

-    <street>K&oslash;bmagergade 43 2.</street>
+    <street>K&#xf8;bmagergade 43 2.</street>

     <postcode>1150 Copenhagen K</postcode>
     <country>Denmark</country>
     Phone <phone>+45 3341 0100</phone>
     <postcode>1150 Copenhagen K</postcode>
     <country>Denmark</country>
     Phone <phone>+45 3341 0100</phone>

diff --git a/doc/license.xml b/doc/license.xml
index 6a5380e..37dcd9b 100644 (file)
--- a/doc/license.xml
+++ b/doc/license.xml
@@ -1,10 +1,10 @@
-<!-- $Id: license.xml,v 1.14 2006-12-13 09:40:32 adam Exp $ -->
+<!-- $Id: license.xml,v 1.15 2007-02-01 09:56:14 adam Exp $ -->

  <appendix id="license"><title>License</title>
 
   <sect1 id="license.indexdata"><title>Index Data Copyright</title>
 
    <para>
  <appendix id="license"><title>License</title>
 
   <sect1 id="license.indexdata"><title>Index Data Copyright</title>
 
    <para>

-    Copyright &copy; &copyright-year; Index Data.
+    Copyright &#xa9; &copyright-year; Index Data.

    </para>
    <para>
     All rights reserved.
    </para>
    <para>
     All rights reserved.

@@ -69,7 +69,7 @@
    </para>
 
    <para>
    </para>
 
    <para>

-    Copyright &copy; 1995, the EUROPAGATE consortium (see below).
+    Copyright &#xa9; 1995, the EUROPAGATE consortium (see below).

    </para>
 
    <literallayout>
    </para>
 
    <literallayout>

diff --git a/doc/odr.xml b/doc/odr.xml
index 38d300e..0633205 100644 (file)
--- a/doc/odr.xml
+++ b/doc/odr.xml
@@ -1,4 +1,4 @@
-<!-- $Id: odr.xml,v 1.19 2006-10-05 08:26:58 adam Exp $ -->
+<!-- $Id: odr.xml,v 1.20 2007-02-01 09:56:14 adam Exp $ -->

  <chapter id="odr"><title>The ODR Module</title>
   
   <sect1 id="odr.introduction"><title>Introduction</title>
  <chapter id="odr"><title>The ODR Module</title>
   
   <sect1 id="odr.introduction"><title>Introduction</title>

@@ -492,7 +492,7 @@ void do_nothing_useful(int value)
     </para>
 
     <synopsis>
     </para>
 
     <synopsis>

-     char *odr_errlist&lsqb;&rsqb;
+     char *odr_errlist[]

     </synopsis>
 
     <para>
     </synopsis>
 
     <para>

@@ -789,7 +789,7 @@ int odr_explicit_tag(ODR o, Odr_fun fun, int class, int tag,
     </para>
 
     <screen>
     </para>
 
     <screen>

-     MyInt ::= &lsqb;210&rsqb; IMPLICIT INTEGER
+     MyInt ::= [210] IMPLICIT INTEGER

     </screen>
 
     <para>
     </screen>
 
     <para>

@@ -923,7 +923,7 @@ int mySequence(ODR o, MySequence **p, int optional, const char *name)
      </para>
 
      <screen>
      </para>
 
      <screen>

-MySequence ::= &lsqb;10&rsqb; IMPLICIT SEQUENCE {
+MySequence ::= [10] IMPLICIT SEQUENCE {

       intval INTEGER,
       boolval BOOLEAN OPTIONAL
 }
       intval INTEGER,
       boolval BOOLEAN OPTIONAL
 }

@@ -976,7 +976,7 @@ int mySequence(ODR o, MySequence **p, int optional, const char *name)
      </para>
 
      <screen>
      </para>
 
      <screen>

-MySequence ::= &lsqb;10&rsqb; IMPLICIT SEQUENCE {
+MySequence ::= [10] IMPLICIT SEQUENCE {

    intval INTEGER,
    boolval BOOLEAN OPTIONAL
 }
    intval INTEGER,
    boolval BOOLEAN OPTIONAL
 }

@@ -1107,7 +1107,7 @@ int myArray(ODR o, MyArray **p, int optional, const char *name)
     </para>
 
     <synopsis>
     </para>
 
     <synopsis>

-int odr_choice(ODR o, Odr_arm arm&lsqb;&rsqb;, void *p, void *whichp,
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,

                const char *name);
     </synopsis>
 
                const char *name);
     </synopsis>
 

@@ -1152,7 +1152,7 @@ typedef struct odr_arm
 
      <varlistentry><term>which</term>
       <listitem><para>The value of the discriminator that corresponds to
 
      <varlistentry><term>which</term>
       <listitem><para>The value of the discriminator that corresponds to

-       this CHOICE element. Typically, it will be a &num;defined constant, or
+       this CHOICE element. Typically, it will be a #defined constant, or

        an enum member.</para></listitem>
      </varlistentry>
 
        an enum member.</para></listitem>
      </varlistentry>
 

@@ -1177,7 +1177,7 @@ typedef struct odr_arm
     <screen>
 MyChoice ::= CHOICE {
     untagged INTEGER,
     <screen>
 MyChoice ::= CHOICE {
     untagged INTEGER,

-    tagged   &lsqb;99&rsqb; IMPLICIT INTEGER,
+    tagged   [99] IMPLICIT INTEGER,

     other    BOOLEAN
 }
     </screen>
     other    BOOLEAN
 }
     </screen>

@@ -1211,7 +1211,7 @@ typedef struct MyChoice
     <screen>
 int myChoice(ODR o, MyChoice **p, int optional, const char *name)
 {
     <screen>
 int myChoice(ODR o, MyChoice **p, int optional, const char *name)
 {

-    static Odr_arm arm&lsqb;&rsqb; =
+    static Odr_arm arm[] =

     {
       {-1, -1, -1, MyChoice_untagged, odr_integer, "untagged"},
       {ODR_IMPLICIT, ODR_CONTEXT, 99, MyChoice_tagged, odr_integer,
     {
       {-1, -1, -1, MyChoice_untagged, odr_integer, "untagged"},
       {ODR_IMPLICIT, ODR_CONTEXT, 99, MyChoice_tagged, odr_integer,

diff --git a/doc/tools.xml b/doc/tools.xml
index b062568..8137a14 100644 (file)
--- a/doc/tools.xml
+++ b/doc/tools.xml
@@ -1,4 +1,4 @@
-<!-- $Id: tools.xml,v 1.54 2006-10-31 09:15:00 mike Exp $ -->
+<!-- $Id: tools.xml,v 1.55 2007-02-01 09:56:14 adam Exp $ -->

  <chapter id="tools"><title>Supporting Tools</title>
   
   <para>
  <chapter id="tools"><title>Supporting Tools</title>
   
   <para>

@@ -129,11 +129,11 @@
     <literallayout>
      query ::= top-set query-struct.
 
     <literallayout>
      query ::= top-set query-struct.
 

-     top-set ::= &lsqb; '@attrset' string &rsqb;
+     top-set ::= [ '@attrset' string ]

 
      query-struct ::= attr-spec | simple | complex | '@term' term-type query
 
 
      query-struct ::= attr-spec | simple | complex | '@term' term-type query
 

-     attr-spec ::= '@attr' &lsqb; string &rsqb; string query-struct
+     attr-spec ::= '@attr' [ string ] string query-struct

 
      complex ::= operator query-struct query-struct.
 
 
      complex ::= operator query-struct query-struct.
 

@@ -452,7 +452,7 @@
      <para>
       The CCL parser obeys the following grammar for the FIND argument.
       The syntax is annotated by in the lines prefixed by
      <para>
       The CCL parser obeys the following grammar for the FIND argument.
       The syntax is annotated by in the lines prefixed by

-      <literal>&dash;&dash;</literal>.
+      <literal>--</literal>.

      </para>
 
      <screen>
      </para>
 
      <screen>