[project @ 2002-01-04 10:18:58 by simonmar]

Replace all instances of '--' with '––' since '--' gets
interpreted by JadeTeX to mean a single dash.

diff --git a/ghc/docs/users_guide/5-00-notes.sgml b/ghc/docs/users_guide/5-00-notes.sgml
index d375b0a..a2f1210 100644 (file)
--- a/ghc/docs/users_guide/5-00-notes.sgml
+++ b/ghc/docs/users_guide/5-00-notes.sgml
@@ -9,7 +9,7 @@
        been added (<xref linkend="ghci">).</para>
       </listitem>
       <listitem>
        been added (<xref linkend="ghci">).</para>
       </listitem>
       <listitem>

-       <para>New <option>--make</option> flag added (<xref
+       <para>New <option>&ndash;&ndash;make</option> flag added (<xref

        linkend="make-mode">).</para>
       </listitem>
       <listitem>
        linkend="make-mode">).</para>
       </listitem>
       <listitem>

@@ -160,7 +160,7 @@
       <listitem>
        <para>The <literal>WithGhcHc</literal> setting in
        <literal>build.mk</literal> has been replaced by the
       <listitem>
        <para>The <literal>WithGhcHc</literal> setting in
        <literal>build.mk</literal> has been replaced by the

-       <literal>--with-ghc=<replaceable>ghc</replaceable></literal>
+       <literal>&ndash;&ndash;with-ghc=<replaceable>ghc</replaceable></literal>

        option to <literal>configure</literal>.  The new option
        <emphasis>must</emphasis> be used if you intend to use
        anything except &ldquo;<literal>ghc</literal>&rdquo; to
        option to <literal>configure</literal>.  The new option
        <emphasis>must</emphasis> be used if you intend to use
        anything except &ldquo;<literal>ghc</literal>&rdquo; to

diff --git a/ghc/docs/users_guide/5-02-notes.sgml b/ghc/docs/users_guide/5-02-notes.sgml
index 9e362dc..ad4f43c 100644 (file)
--- a/ghc/docs/users_guide/5-02-notes.sgml
+++ b/ghc/docs/users_guide/5-02-notes.sgml
@@ -119,7 +119,7 @@
        multiple modules for the <literal>:add</literal> and
        <literal>:load</literal> commands.  From the command line, you
        may specify multiple modules when starting GHCi and when
        multiple modules for the <literal>:add</literal> and
        <literal>:load</literal> commands.  From the command line, you
        may specify multiple modules when starting GHCi and when

-       compiling in <option>--make</option> mode.  See
+       compiling in <option>&ndash;&ndash;make</option> mode.  See

         <xref linkend="ghci-commands">.</para>
       </listitem>
 
         <xref linkend="ghci-commands">.</para>
       </listitem>
 

diff --git a/ghc/docs/users_guide/ffi-chap.sgml b/ghc/docs/users_guide/ffi-chap.sgml
index c1b0c8a..ce24313 100644 (file)
--- a/ghc/docs/users_guide/ffi-chap.sgml
+++ b/ghc/docs/users_guide/ffi-chap.sgml
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
         remember to include <filename>M_stub.o</filename> in the final
         link command line, or you'll get link errors for the missing
         function(s) (this isn't necessary when building your program
         remember to include <filename>M_stub.o</filename> in the final
         link command line, or you'll get link errors for the missing
         function(s) (this isn't necessary when building your program

-        with <literal>ghc --make</literal>, as GHC will automatically
+        with <literal>ghc &ndash;&ndash;make</literal>, as GHC will automatically

         link in the correct bits).</para>
       </sect3>
     </sect2>
         link in the correct bits).</para>
       </sect3>
     </sect2>

diff --git a/ghc/docs/users_guide/flags.sgml b/ghc/docs/users_guide/flags.sgml
index e62592c..68ac80e 100644 (file)
--- a/ghc/docs/users_guide/flags.sgml
+++ b/ghc/docs/users_guide/flags.sgml
@@ -45,19 +45,19 @@
              <entry>-</entry>
            </row>
            <row>
              <entry>-</entry>
            </row>
            <row>

-             <entry><option>--version</option></entry>
+             <entry><option>&ndash;&ndash;version</option></entry>

              <entry>display GHC version</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>
              <entry>display GHC version</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>

-             <entry><option>--numeric-version</option></entry>
+             <entry><option>&ndash;&ndash;numeric-version</option></entry>

              <entry>display GHC version (numeric only)</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>
              <entry>display GHC version (numeric only)</entry>
              <entry>static</entry>
              <entry>-</entry>
            </row>
            <row>

-             <entry><option>--print-libdir</option></entry>
+             <entry><option>&ndash;&ndash;print-libdir</option></entry>

              <entry>display GHC library directory</entry>
              <entry>static</entry>
              <entry>-</entry>
              <entry>display GHC library directory</entry>
              <entry>static</entry>
              <entry>-</entry>

diff --git a/ghc/docs/users_guide/ghci.sgml b/ghc/docs/users_guide/ghci.sgml
index f8f5bbd..87f2944 100644 (file)
--- a/ghc/docs/users_guide/ghci.sgml
+++ b/ghc/docs/users_guide/ghci.sgml
@@ -158,7 +158,7 @@ Main> fac 17
       <para>or it can be set using the <literal>:set</literal> command
       from within GHCi (see <xref
       linkend="ghci-cmd-line-options">)<footnote><para>Note that in
       <para>or it can be set using the <literal>:set</literal> command
       from within GHCi (see <xref
       linkend="ghci-cmd-line-options">)<footnote><para>Note that in

-      GHCi, and <option>--make</option> mode, the <option>-i</option>
+      GHCi, and <option>&ndash;&ndash;make</option> mode, the <option>-i</option>

       option is used to specify the search path for
       <emphasis>source</emphasis> files, whereas in standard
       batch-compilation mode the <option>-i</option> option is used to
       option is used to specify the search path for
       <emphasis>source</emphasis> files, whereas in standard
       batch-compilation mode the <option>-i</option> option is used to

@@ -305,7 +305,7 @@ Ok, modules loaded: A, B, C, D.
     <para>HINT: since GHCi will only use a compiled object file if it
     can sure that the compiled version is up-to-date, a good technique
     when working on a large program is to occasionally run
     <para>HINT: since GHCi will only use a compiled object file if it
     can sure that the compiled version is up-to-date, a good technique
     when working on a large program is to occasionally run

-    <literal>ghc --make</literal> to compile the whole project (say
+    <literal>ghc &ndash;&ndash;make</literal> to compile the whole project (say

     before you go for lunch :-), then continue working in the
     interpreter.  As you modify code, the new modules will be
     interpreted, but the rest of the project will remain
     before you go for lunch :-), then continue working in the
     interpreter.  As you modify code, the new modules will be
     interpreted, but the rest of the project will remain

@@ -543,10 +543,10 @@ Wed Mar 14 12:23:13 GMT 2001
   <sect1 id="ghci-invokation">
     <title>Invoking GHCi</title>
     <indexterm><primary>invoking</primary><secondary>GHCi</secondary></indexterm>
   <sect1 id="ghci-invokation">
     <title>Invoking GHCi</title>
     <indexterm><primary>invoking</primary><secondary>GHCi</secondary></indexterm>

-    <indexterm><primary><option>--interactive</option></primary></indexterm>
+    <indexterm><primary><option>&ndash;&ndash;interactive</option></primary></indexterm>

 
     <para>GHCi is invoked with the command <literal>ghci</literal> or
 
     <para>GHCi is invoked with the command <literal>ghci</literal> or

-    <literal>ghc --interactive</literal>.  One or more modules or
+    <literal>ghc &ndash;&ndash;interactive</literal>.  One or more modules or

     filenames can also be specified on the command line; this
     instructs GHCi to load the specified modules or filenames (and all
     the modules they depend on), just as if you had said
     filenames can also be specified on the command line; this
     instructs GHCi to load the specified modules or filenames (and all
     the modules they depend on), just as if you had said

@@ -728,11 +728,11 @@ Prelude> :mycd ..
 </screen>
 
          <para>Or I could define a simple way to invoke
 </screen>
 
          <para>Or I could define a simple way to invoke

-         &ldquo;<literal>ghc --make Main</literal>&rdquo; in the
+         &ldquo;<literal>ghc &ndash;&ndash;make Main</literal>&rdquo; in the

          current directory:</para>
 
 <screen>
          current directory:</para>
 
 <screen>

-Prelude> :def make (\_ -> return ":! ghc --make Main")
+Prelude> :def make (\_ -> return ":! ghc &ndash;&ndash;make Main")

 </screen>
 
        </listitem>
 </screen>
 
        </listitem>

diff --git a/ghc/docs/users_guide/installing.sgml b/ghc/docs/users_guide/installing.sgml
index 2d15aff..a7b2cd0 100644 (file)
--- a/ghc/docs/users_guide/installing.sgml
+++ b/ghc/docs/users_guide/installing.sgml
@@ -705,7 +705,7 @@ Windows and Unix, as follows: layout:</para>
 <programlisting>
   $(libdir)/
     package.conf           GHC package configuration
 <programlisting>
   $(libdir)/
     package.conf           GHC package configuration

-    ghc-usage.txt          Message displayed by ghc --help
+    ghc-usage.txt          Message displayed by ghc &ndash;&ndash;help

     
     bin/                   [Win32 only]  User-visible binaries
          ghc.exe
     
     bin/                   [Win32 only]  User-visible binaries
          ghc.exe

diff --git a/ghc/docs/users_guide/intro.sgml b/ghc/docs/users_guide/intro.sgml
index 0162421..0013ad8 100644 (file)
--- a/ghc/docs/users_guide/intro.sgml
+++ b/ghc/docs/users_guide/intro.sgml
@@ -358,7 +358,7 @@
     
     <para>The version number of your copy of GHC can be found by
     invoking <literal>ghc</literal> with the
     
     <para>The version number of your copy of GHC can be found by
     invoking <literal>ghc</literal> with the

-    <literal>--version</literal> flag (see <xref
+    <literal>&ndash;&ndash;version</literal> flag (see <xref

     linkend="options-help">).</para>
   </sect1>
 
     linkend="options-help">).</para>
   </sect1>
 

diff --git a/ghc/docs/users_guide/packages.sgml b/ghc/docs/users_guide/packages.sgml
index 80fe70c..3d0bbac 100644 (file)
--- a/ghc/docs/users_guide/packages.sgml
+++ b/ghc/docs/users_guide/packages.sgml
@@ -127,7 +127,7 @@
          hand from the <literal>.a</literal> archive, it is possible
          to use GNU <command>ld</command> as follows:</para>
 
          hand from the <literal>.a</literal> archive, it is possible
          to use GNU <command>ld</command> as follows:</para>
 

-<screen>ld -r --whole-archive -o HSfoo.o libHSfoo.a</screen>
+<screen>ld -r &ndash;&ndash;whole-archive -o HSfoo.o libHSfoo.a</screen>

        </listitem>
 
        <listitem>
        </listitem>
 
        <listitem>

@@ -178,7 +178,7 @@
       added or removed from a package configuration file.  By default,
       the system-wide configuration file is used, but alternatively
       packages can be added or removed from a user-specified
       added or removed from a package configuration file.  By default,
       the system-wide configuration file is used, but alternatively
       packages can be added or removed from a user-specified

-      configuration file using the <option>--config-file</option>
+      configuration file using the <option>&ndash;&ndash;config-file</option>

       option.  An empty package configuration file consists of the
       string <quote><literal>[]</literal></quote>.</para>
 
       option.  An empty package configuration file consists of the
       string <quote><literal>[]</literal></quote>.</para>
 

@@ -187,9 +187,9 @@
 
       <variablelist>
        <varlistentry>
 
       <variablelist>
        <varlistentry>

-         <term><option>--add-package</option></term>
+         <term><option>&ndash;&ndash;add-package</option></term>

          <term><option>-a</option></term>
          <term><option>-a</option></term>

-         <indexterm><primary><option>--add-package</option></primary></indexterm>
+         <indexterm><primary><option>&ndash;&ndash;add-package</option></primary></indexterm>

          <listitem>
            <para>Reads package specification from the input (see below),
            and adds it to the database of installed packages.  The
          <listitem>
            <para>Reads package specification from the input (see below),
            and adds it to the database of installed packages.  The

@@ -199,9 +199,9 @@
        </varlistentry>
 
        <varlistentry>
        </varlistentry>
 
        <varlistentry>

-         <term><option>--input-file=<replaceable>file</replaceable></option></term>
+         <term><option>&ndash;&ndash;input-file=<replaceable>file</replaceable></option></term>

          <term><option>-i <replaceable>file</replaceable></option></term>
          <term><option>-i <replaceable>file</replaceable></option></term>

-         <indexterm><primary><option>--input-file</option></primary></indexterm>
+         <indexterm><primary><option>&ndash;&ndash;input-file</option></primary></indexterm>

          <listitem>
            <para>Read new package specifications from file
            <replaceable>file</replaceable>. If a value of
          <listitem>
            <para>Read new package specifications from file
            <replaceable>file</replaceable>. If a value of

@@ -213,9 +213,9 @@
        </varlistentry>
 
        <varlistentry>
        </varlistentry>
 
        <varlistentry>

-         <term><option>--auto-ghci-libs</option></term>
+         <term><option>&ndash;&ndash;auto-ghci-libs</option></term>

          <term><option>-g</option></term>
          <term><option>-g</option></term>

-         <indexterm><primary><option>--auto-ghci-libs</option></primary>
+         <indexterm><primary><option>&ndash;&ndash;auto-ghci-libs</option></primary>

              </indexterm>
          <listitem>
            <para>Automatically generate the GHCi
              </indexterm>
          <listitem>
            <para>Automatically generate the GHCi

@@ -235,9 +235,9 @@
        </varlistentry>
 
        <varlistentry>
        </varlistentry>
 
        <varlistentry>

-         <term><option>--config-file <replaceable>file</replaceable></option></term>
+         <term><option>&ndash;&ndash;config-file <replaceable>file</replaceable></option></term>

          <term><option>-f <replaceable>file</replaceable></option></term>
          <term><option>-f <replaceable>file</replaceable></option></term>

-         <indexterm><primary><option>--config-file</option></primary>
+         <indexterm><primary><option>&ndash;&ndash;config-file</option></primary>

              </indexterm>
          <listitem>
            <para>Use <replaceable>file</replaceable> instead of the
              </indexterm>
          <listitem>
            <para>Use <replaceable>file</replaceable> instead of the

@@ -249,15 +249,15 @@
        </varlistentry>
 
        <varlistentry>
        </varlistentry>
 
        <varlistentry>

-         <term><option>--list-packages</option></term>
+         <term><option>&ndash;&ndash;list-packages</option></term>

          <term><option>-l</option></term>
          <term><option>-l</option></term>

-         <indexterm><primary><option>--list-packages</option></primary></indexterm>
+         <indexterm><primary><option>&ndash;&ndash;list-packages</option></primary></indexterm>

          <listitem>
            <para>This option displays the list of currently installed
            packages.</para>
 
 <screen>
          <listitem>
            <para>This option displays the list of currently installed
            packages.</para>
 
 <screen>

-  $ ghc-pkg --list-packages
+  $ ghc-pkg &ndash;&ndash;list-packages

   gmp, rts, std, lang, concurrent, data, net, posix, text, util
 </screen>
 
   gmp, rts, std, lang, concurrent, data, net, posix, text, util
 </screen>
 

@@ -275,9 +275,9 @@
        </varlistentry>
 
        <varlistentry>
        </varlistentry>
 
        <varlistentry>

-         <term><option>--remove-package <replaceable>foo</replaceable></option></term>
+         <term><option>&ndash;&ndash;remove-package <replaceable>foo</replaceable></option></term>

          <term><option>-r <replaceable>foo</replaceable></option></term>
          <term><option>-r <replaceable>foo</replaceable></option></term>

-         <indexterm><primary><option>--delete-package</option></primary>
+         <indexterm><primary><option>&ndash;&ndash;delete-package</option></primary>

              </indexterm>
          <listitem>
            <para>Removes the specified package from the installed
              </indexterm>
          <listitem>
            <para>Removes the specified package from the installed

@@ -285,9 +285,9 @@
          </listitem>
        </varlistentry>
        <varlistentry>
          </listitem>
        </varlistentry>
        <varlistentry>

-         <term><option>--update-package</option></term>
+         <term><option>&ndash;&ndash;update-package</option></term>

          <term><option>-u</option></term>
          <term><option>-u</option></term>

-         <indexterm><primary><option>--update-package</option></primary></indexterm>
+         <indexterm><primary><option>&ndash;&ndash;update-package</option></primary></indexterm>

          <listitem>
            <para>Reads package specification from the input, and
            adds it to the database of installed packages. If a package
          <listitem>
            <para>Reads package specification from the input, and
            adds it to the database of installed packages. If a package

@@ -335,7 +335,7 @@
          <listitem>
             <para>The package's name, for use with
             the <literal>-package</literal> flag and as listed in the
          <listitem>
             <para>The package's name, for use with
             the <literal>-package</literal> flag and as listed in the

-            <literal>--list-packages</literal> list. 
+            <literal>&ndash;&ndash;list-packages</literal> list. 

             </para>
          </listitem>
        </varlistentry>
             </para>
          </listitem>
        </varlistentry>

diff --git a/ghc/docs/users_guide/profiling.sgml b/ghc/docs/users_guide/profiling.sgml
index b7e3fd3..4bb22a1 100644 (file)
--- a/ghc/docs/users_guide/profiling.sgml
+++ b/ghc/docs/users_guide/profiling.sgml
@@ -885,7 +885,7 @@ $ ghcprof <prog>.prof
   </sect1>
 
   <sect1 id="hp2ps">
   </sect1>
 
   <sect1 id="hp2ps">

-    <title><command>hp2ps</command>--heap profile to PostScript</title>
+    <title><command>hp2ps</command>&ndash;&ndash;heap profile to PostScript</title>

 
     <indexterm><primary><command>hp2ps</command></primary></indexterm>
     <indexterm><primary>heap profiles</primary></indexterm>
 
     <indexterm><primary><command>hp2ps</command></primary></indexterm>
     <indexterm><primary>heap profiles</primary></indexterm>

diff --git a/ghc/docs/users_guide/runtime_control.sgml b/ghc/docs/users_guide/runtime_control.sgml
index bbf4dc3..f8e43d9 100644 (file)
--- a/ghc/docs/users_guide/runtime_control.sgml
+++ b/ghc/docs/users_guide/runtime_control.sgml
@@ -38,7 +38,7 @@
 
   <para>If you absolutely positively want all the rest of the options
   in a command line to go to the program (and not the RTS), use a
 
   <para>If you absolutely positively want all the rest of the options
   in a command line to go to the program (and not the RTS), use a

-  <option>--RTS</option><indexterm><primary><option>--RTS</option></primary></indexterm>.</para>
+  <option>&ndash;&ndash;RTS</option><indexterm><primary><option>--RTS</option></primary></indexterm>.</para>

 
   <para>As always, for RTS options that take
   <replaceable>size</replaceable>s: If the last character of
 
   <para>As always, for RTS options that take
   <replaceable>size</replaceable>s: If the last character of

diff --git a/ghc/docs/users_guide/separate_compilation.sgml b/ghc/docs/users_guide/separate_compilation.sgml
index caa2382..45e6c9c 100644 (file)
--- a/ghc/docs/users_guide/separate_compilation.sgml
+++ b/ghc/docs/users_guide/separate_compilation.sgml
@@ -370,7 +370,7 @@ A.o : B.hi-boot
        locate any imported modules that come from packages.  The
        package modules won't be included in the dependencies
        generated, though (but see the
        locate any imported modules that come from packages.  The
        package modules won't be included in the dependencies
        generated, though (but see the

-       <option>--include-prelude</option> option below).</para>
+       <option>&ndash;&ndash;include-prelude</option> option below).</para>

 
        <para>The dependency generation phase of GHC can take some
         additional options, which you may find useful.  For historical
 
        <para>The dependency generation phase of GHC can take some
         additional options, which you may find useful.  For historical

@@ -444,7 +444,7 @@ ghc -M -optdep-f -optdep.depend ...
          </varlistentry>
 
          <varlistentry>
          </varlistentry>
 
          <varlistentry>

-           <term><option>--exclude-module=&lt;file&gt;</option></term>
+           <term><option>&ndash;&ndash;exclude-module=&lt;file&gt;</option></term>

            <listitem>
              <para>Regard <filename>&lt;file&gt;</filename> as
               "stable"; i.e., exclude it from having dependencies on
            <listitem>
              <para>Regard <filename>&lt;file&gt;</filename> as
               "stable"; i.e., exclude it from having dependencies on

@@ -455,12 +455,12 @@ ghc -M -optdep-f -optdep.depend ...
          <varlistentry>
            <term><option>-x</option></term>
            <listitem>
          <varlistentry>
            <term><option>-x</option></term>
            <listitem>

-             <para>same as <option>--exclude-module</option></para>
+             <para>same as <option>&ndash;&ndash;exclude-module</option></para>

            </listitem>
          </varlistentry>
 
          <varlistentry>
            </listitem>
          </varlistentry>
 
          <varlistentry>

-           <term><option>--exclude-directory=&lt;dirs&gt;</option></term>
+           <term><option>&ndash;&ndash;exclude-directory=&lt;dirs&gt;</option></term>

            <listitem>
              <para>Regard the colon-separated list of directories
               <filename>&lt;dirs&gt;</filename> as containing stable,
            <listitem>
              <para>Regard the colon-separated list of directories
               <filename>&lt;dirs&gt;</filename> as containing stable,

@@ -470,17 +470,17 @@ ghc -M -optdep-f -optdep.depend ...
          </varlistentry>
 
          <varlistentry>
          </varlistentry>
 
          <varlistentry>

-           <term><option>--include-module=&lt;file&gt;</option></term>
+           <term><option>&ndash;&ndash;include-module=&lt;file&gt;</option></term>

            <listitem>
              <para>Regard <filename>&lt;file&gt;</filename> as not
               "stable"; i.e., generate dependencies on it (if
               any). This option is normally used in conjunction with
            <listitem>
              <para>Regard <filename>&lt;file&gt;</filename> as not
               "stable"; i.e., generate dependencies on it (if
               any). This option is normally used in conjunction with

-              the <option>--exclude-directory</option> option.</para>
+              the <option>&ndash;&ndash;exclude-directory</option> option.</para>

            </listitem>
          </varlistentry>
 
          <varlistentry>
            </listitem>
          </varlistentry>
 
          <varlistentry>

-           <term><option>--include-prelude</option></term>
+           <term><option>&ndash;&ndash;include-prelude</option></term>

            <listitem>
              <para>Regard modules imported from packages as unstable,
               i.e., generate dependencies on the package modules used
            <listitem>
              <para>Regard modules imported from packages as unstable,
               i.e., generate dependencies on the package modules used

diff --git a/ghc/docs/users_guide/using.sgml b/ghc/docs/users_guide/using.sgml
index 015522f..2eaa640 100644 (file)
--- a/ghc/docs/users_guide/using.sgml
+++ b/ghc/docs/users_guide/using.sgml
@@ -9,7 +9,7 @@
   <variablelist>
     <varlistentry>
       <term><cmdsynopsis><command>ghc</command>
   <variablelist>
     <varlistentry>
       <term><cmdsynopsis><command>ghc</command>

-         <arg choice=plain>--interactive</arg>
+         <arg choice=plain>&ndash;&ndash;interactive</arg>

        </cmdsynopsis></term>
       <indexterm><primary>interactive mode</primary>
       </indexterm>
        </cmdsynopsis></term>
       <indexterm><primary>interactive mode</primary>
       </indexterm>

@@ -24,11 +24,11 @@
 
     <varlistentry>
       <term><cmdsynopsis><command>ghc</command>
 
     <varlistentry>
       <term><cmdsynopsis><command>ghc</command>

-         <arg choice=plain>--make</arg>
+         <arg choice=plain>&ndash;&ndash;make</arg>

        </cmdsynopsis></term>
       <indexterm><primary>make mode</primary>
       </indexterm>
        </cmdsynopsis></term>
       <indexterm><primary>make mode</primary>
       </indexterm>

-      <indexterm><primary><option>--make</option></primary>
+      <indexterm><primary><option>&ndash;&ndash;make</option></primary>

       </indexterm>
       <listitem>
        <para>In this mode, GHC will build a multi-module Haskell
       </indexterm>
       <listitem>
        <para>In this mode, GHC will build a multi-module Haskell

@@ -252,10 +252,10 @@ module X where
 
     <variablelist>
       <varlistentry>
 
     <variablelist>
       <varlistentry>

-       <term><option>--help</option></term>
+       <term><option>&ndash;&ndash;help</option></term>

        <term><option>-?</option></term>
        <indexterm><primary><option>-?</option></primary></indexterm>
        <term><option>-?</option></term>
        <indexterm><primary><option>-?</option></primary></indexterm>

-       <indexterm><primary><option>--help</option></primary></indexterm>
+       <indexterm><primary><option>&ndash;&ndash;help</option></primary></indexterm>

        <listitem>
          <para>Cause GHC to spew a long usage message to standard
           output and then exit.</para>
        <listitem>
          <para>Cause GHC to spew a long usage message to standard
           output and then exit.</para>

@@ -304,8 +304,8 @@ module X where
              <listitem>
                <para>Minimal verbosity: print one line per
                compilation (this is the default when
              <listitem>
                <para>Minimal verbosity: print one line per
                compilation (this is the default when

-               <option>--make</option> or
-               <option>--interactive</option> is on).</para>
+               <option>&ndash;&ndash;make</option> or
+               <option>&ndash;&ndash;interactive</option> is on).</para>

              </listitem>
            </varlistentry>
 
              </listitem>
            </varlistentry>
 

@@ -341,24 +341,24 @@ module X where
       </varlistentry>
       
       <varlistentry>
       </varlistentry>
       
       <varlistentry>

-       <term><option>--version</option></term>
-       <indexterm><primary><option>--version</option></primary></indexterm>
+       <term><option>&ndash;&ndash;version</option></term>
+       <indexterm><primary><option>&ndash;&ndash;version</option></primary></indexterm>

        <listitem>
          <para>Print a one-line string including GHC's version number.</para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
        <listitem>
          <para>Print a one-line string including GHC's version number.</para>
        </listitem>
       </varlistentry>
 
       <varlistentry>

-       <term><option>--numeric-version</option></term>
-       <indexterm><primary><option>--numeric-version</option></primary></indexterm>
+       <term><option>&ndash;&ndash;numeric-version</option></term>
+       <indexterm><primary><option>&ndash;&ndash;numeric-version</option></primary></indexterm>

        <listitem>
          <para>Print GHC's numeric version number only.</para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
        <listitem>
          <para>Print GHC's numeric version number only.</para>
        </listitem>
       </varlistentry>
 
       <varlistentry>

-       <term><option>--print-libdir</option></term>
-       <indexterm><primary><option>--print-libdir</option></primary></indexterm>
+       <term><option>&ndash;&ndash;print-libdir</option></term>
+       <indexterm><primary><option>&ndash;&ndash;print-libdir</option></primary></indexterm>

        <listitem>
          <para>Print the path to GHC's library directory.  This is
          the top of the directory tree containing GHC's libraries,
        <listitem>
          <para>Print the path to GHC's library directory.  This is
          the top of the directory tree containing GHC's libraries,

@@ -375,14 +375,14 @@ module X where
   </sect1>
 
   <sect1 id="make-mode">
   </sect1>
 
   <sect1 id="make-mode">

-    <title>Using <command>ghc</command> <option>--make</option></title>
+    <title>Using <command>ghc</command> <option>&ndash;&ndash;make</option></title>

 
 

-    <indexterm><primary><option>--make</option></primary>
+    <indexterm><primary><option>&ndash;&ndash;make</option></primary>

     </indexterm>
     <indexterm><primary>separate compilation</primary>
     </indexterm>
     
     </indexterm>
     <indexterm><primary>separate compilation</primary>
     </indexterm>
     

-    <para>When given the <option>--make</option> option, GHC will
+    <para>When given the <option>&ndash;&ndash;make</option> option, GHC will

     build a multi-module Haskell program by following dependencies
     from a single root module (usually <literal>Main</literal>).  For
     example, if your <literal>Main</literal> module is in a file
     build a multi-module Haskell program by following dependencies
     from a single root module (usually <literal>Main</literal>).  For
     example, if your <literal>Main</literal> module is in a file

@@ -390,7 +390,7 @@ module X where
     the program like this:</para>
 
 <screen>
     the program like this:</para>
 
 <screen>

-ghc --make Main.hs
+ghc &ndash;&ndash;make Main.hs

 </screen>
 
     <para>The command line must contain one source file or module
 </screen>
 
     <para>The command line must contain one source file or module

@@ -400,7 +400,7 @@ ghc --make Main.hs
     if the top module is <literal>Main</literal>, the program
     will also be linked into an executable.</para>
 
     if the top module is <literal>Main</literal>, the program
     will also be linked into an executable.</para>
 

-    <para>The main advantages to using <literal>ghc --make</literal>
+    <para>The main advantages to using <literal>ghc &ndash;&ndash;make</literal>

     over traditional <literal>Makefile</literal>s are:</para>
 
     <itemizedlist>
     over traditional <literal>Makefile</literal>s are:</para>
 
     <itemizedlist>

@@ -408,7 +408,7 @@ ghc --make Main.hs
        <para>GHC doesn't have to be restarted for each compilation,
        which means it can cache information between compilations.
        Compiling a muli-module program with <literal>ghc
        <para>GHC doesn't have to be restarted for each compilation,
        which means it can cache information between compilations.
        Compiling a muli-module program with <literal>ghc

-       --make</literal> can be up to twice as fast as running
+       &ndash;&ndash;make</literal> can be up to twice as fast as running

        <literal>ghc</literal> individually on each source
        file.</para>
       </listitem>
        <literal>ghc</literal> individually on each source
        file.</para>
       </listitem>

@@ -426,7 +426,7 @@ ghc --make Main.hs
     </itemizedlist>
 
     <para>Any of the command-line options described in the rest of
     </itemizedlist>
 
     <para>Any of the command-line options described in the rest of

-    this chapter can be used with <option>--make</option>, but note
+    this chapter can be used with <option>&ndash;&ndash;make</option>, but note

     that any options you give on the command line will apply to all
     the source files compiled, so if you want any options to apply to
     a single source file only, you'll need to use an
     that any options you give on the command line will apply to all
     the source files compiled, so if you want any options to apply to
     a single source file only, you'll need to use an

@@ -446,9 +446,9 @@ ghc --make Main.hs
   </sect1>
   
   <Sect1 id="options-order">
   </sect1>
   
   <Sect1 id="options-order">

-    <title>GHC without <option>--make</option></title>
+    <title>GHC without <option>&ndash;&ndash;make</option></title>

 
 

-    <para>Without <option>--make</option>, GHC will compile one or
+    <para>Without <option>&ndash;&ndash;make</option>, GHC will compile one or

     more source files given on the command line.</para>
 
     <para>The first phase to run is determined by each input-file
     more source files given on the command line.</para>
 
     <para>The first phase to run is determined by each input-file

diff --git a/ghc/docs/users_guide/utils.sgml b/ghc/docs/users_guide/utils.sgml
index b9a0c2a..d58752e 100644 (file)
--- a/ghc/docs/users_guide/utils.sgml
+++ b/ghc/docs/users_guide/utils.sgml
@@ -185,7 +185,7 @@ tags:
       <variablelist>
        <varlistentry>
          <term><literal>-t FILE</literal> or
       <variablelist>
        <varlistentry>
          <term><literal>-t FILE</literal> or

-         <literal>--template=FILE</literal></term>
+         <literal>&ndash;&ndash;template=FILE</literal></term>

          <listitem>
            <para>The template file (see below).</para>
          </listitem>
          <listitem>
            <para>The template file (see below).</para>
          </listitem>

@@ -193,7 +193,7 @@ tags:
 
        <varlistentry>
          <term><literal>-c PROG</literal> or
 
        <varlistentry>
          <term><literal>-c PROG</literal> or

-         <literal>--cc=PROG</literal></term>
+         <literal>&ndash;&ndash;cc=PROG</literal></term>

          <listitem>
            <para>The C compiler to use (default:
            <command>ghc</command>)</para>
          <listitem>
            <para>The C compiler to use (default:
            <command>ghc</command>)</para>

@@ -202,7 +202,7 @@ tags:
 
        <varlistentry>
          <term><literal>-l PROG</literal> or
 
        <varlistentry>
          <term><literal>-l PROG</literal> or

-         <literal>--ld=PROG</literal></term>
+         <literal>&ndash;&ndash;ld=PROG</literal></term>

          <listitem>
            <para>The linker to use (default:
            <command>gcc</command>).</para>
          <listitem>
            <para>The linker to use (default:
            <command>gcc</command>).</para>

@@ -211,7 +211,7 @@ tags:
 
        <varlistentry>
          <term><literal>-C FLAG</literal> or
 
        <varlistentry>
          <term><literal>-C FLAG</literal> or

-         <literal>--cflag=FLAG</literal></term>
+         <literal>&ndash;&ndash;cflag=FLAG</literal></term>

          <listitem>
            <para>An extra flag to pass to the C compiler.</para>
          </listitem>
          <listitem>
            <para>An extra flag to pass to the C compiler.</para>
          </listitem>

@@ -226,7 +226,7 @@ tags:
 
        <varlistentry>
          <term><literal>-L FLAG</literal> or
 
        <varlistentry>
          <term><literal>-L FLAG</literal> or

-         <literal>--lflag=FLAG</literal></term>
+         <literal>&ndash;&ndash;lflag=FLAG</literal></term>

          <listitem>
            <para>An extra flag to pass to the linker.</para>
          </listitem>
          <listitem>
            <para>An extra flag to pass to the linker.</para>
          </listitem>

@@ -234,7 +234,7 @@ tags:
 
        <varlistentry>
          <term><literal>-i FILE</literal> or
 
        <varlistentry>
          <term><literal>-i FILE</literal> or

-         <literal>--include=FILE</literal></term>
+         <literal>&ndash;&ndash;include=FILE</literal></term>

          <listitem>
            <para>As if the appropriate <literal>#include</literal>
             directive was placed in the source.</para>
          <listitem>
            <para>As if the appropriate <literal>#include</literal>
             directive was placed in the source.</para>

@@ -243,7 +243,7 @@ tags:
 
        <varlistentry>
          <term><literal>-D NAME[=VALUE]</literal> or
 
        <varlistentry>
          <term><literal>-D NAME[=VALUE]</literal> or

-         <literal>--define=NAME[=VALUE]</literal></term>
+         <literal>&ndash;&ndash;define=NAME[=VALUE]</literal></term>

          <listitem>
            <para>As if the appropriate <literal>#define</literal>
             directive was placed in the source.</para>
          <listitem>
            <para>As if the appropriate <literal>#define</literal>
             directive was placed in the source.</para>

@@ -252,28 +252,28 @@ tags:
 
        <varlistentry>
          <term><literal>-o FILE</literal> or
 
        <varlistentry>
          <term><literal>-o FILE</literal> or

-         <literal>--output=FILE</literal></term>
+         <literal>&ndash;&ndash;output=FILE</literal></term>

          <listitem>
            <para>Name of the Haskell file.</para>
          </listitem>
        </varlistentry>
 
        <varlistentry>
          <listitem>
            <para>Name of the Haskell file.</para>
          </listitem>
        </varlistentry>
 
        <varlistentry>

-         <term><literal>--help</literal></term>
+         <term><literal>&ndash;&ndash;help</literal></term>

          <listitem>
            <para>Display a summary of the available flags.</para>
          </listitem>
        </varlistentry>
 
        <varlistentry>
          <listitem>
            <para>Display a summary of the available flags.</para>
          </listitem>
        </varlistentry>
 
        <varlistentry>

-         <term><literal>--version</literal></term>
+         <term><literal>&ndash;&ndash;version</literal></term>

          <listitem>
            <para>Output version information.</para>
          </listitem>
        </varlistentry>
 
        <varlistentry>
          <listitem>
            <para>Output version information.</para>
          </listitem>
        </varlistentry>
 
        <varlistentry>

-         <term><literal>--no-compile</literal></term>
+         <term><literal>&ndash;&ndash;no-compile</literal></term>

          <listitem>
            <para>Stop after writing out the intermediate C program to disk.
            The file name for the intermediate C program is the input file name
          <listitem>
            <para>Stop after writing out the intermediate C program to disk.
            The file name for the intermediate C program is the input file name

diff --git a/ghc/docs/users_guide/win32-dlls.sgml b/ghc/docs/users_guide/win32-dlls.sgml
index 7d856a2..48ab0e6 100644 (file)
--- a/ghc/docs/users_guide/win32-dlls.sgml
+++ b/ghc/docs/users_guide/win32-dlls.sgml
@@ -86,7 +86,7 @@ still there. If you're interested, contact the GHC team. Note that
 building an entire Haskell application as a DLL is still supported
 (it's just inter-DLL Haskell calls that don't work).</emphasis>
 <IndexTerm><Primary>Creating a Win32 DLL</Primary></IndexTerm>
 building an entire Haskell application as a DLL is still supported
 (it's just inter-DLL Haskell calls that don't work).</emphasis>
 <IndexTerm><Primary>Creating a Win32 DLL</Primary></IndexTerm>

-<IndexTerm><Primary>--mk-dll</Primary></IndexTerm>
+<IndexTerm><Primary>&ndash;&ndash;mk-dll</Primary></IndexTerm>

 Sealing up your Haskell library inside a DLL is straightforward;
 compile up the object files that make up the library, and then build
 the DLL by issuing a command of the form:
 Sealing up your Haskell library inside a DLL is straightforward;
 compile up the object files that make up the library, and then build
 the DLL by issuing a command of the form:

@@ -94,12 +94,12 @@ the DLL by issuing a command of the form:
 
 <Para>
 <Screen>
 
 <Para>
 <Screen>

-ghc --mk-dll -o foo.dll bar.o baz.o wibble.a -lfooble
+ghc &ndash;&ndash;mk-dll -o foo.dll bar.o baz.o wibble.a -lfooble

 </Screen>
 </Para>
 
 <Para>
 </Screen>
 </Para>
 
 <Para>

-By feeding the ghc compiler driver the option <Option>--mk-dll</Option>, it
+By feeding the ghc compiler driver the option <Option>&ndash;&ndash;mk-dll</Option>, it

 will build a DLL rather than produce an executable. The DLL will
 consist of all the object files and archives given on the command
 line.
 will build a DLL rather than produce an executable. The DLL will
 consist of all the object files and archives given on the command
 line.

@@ -135,12 +135,12 @@ you compile into a DLL must have a common root.
 <ListItem>
 <Para>
 By default, the entry points of all the object files will be exported from
 <ListItem>
 <Para>
 By default, the entry points of all the object files will be exported from

-the DLL when using <Option>--mk-dll</Option>. Should you want to constrain
+the DLL when using <Option>&ndash;&ndash;mk-dll</Option>. Should you want to constrain

 this, you can specify the <Emphasis>module definition file</Emphasis> to use
 on the command line as follows:
 
 <Screen>
 this, you can specify the <Emphasis>module definition file</Emphasis> to use
 on the command line as follows:
 
 <Screen>

-ghc --mk-dll -o .... -optdll--def -optdllMyDef.def
+ghc &ndash;&ndash;mk-dll -o .... -optdll--def -optdllMyDef.def

 </Screen>
 
 See Microsoft documentation for details, but a module definition file
 </Screen>
 
 See Microsoft documentation for details, but a module definition file

@@ -159,7 +159,7 @@ EXPORTS
 
 <ListItem>
 <Para>
 
 <ListItem>
 <Para>

-In addition to creating a DLL, the <Option>--mk-dll</Option> option also
+In addition to creating a DLL, the <Option>&ndash;&ndash;mk-dll</Option> option also

 creates an import library. The import library name is derived from the
 name of the DLL, as follows:
 
 creates an import library. The import library name is derived from the
 name of the DLL, as follows:
 

@@ -232,7 +232,7 @@ This will produce two files, adder.o and adder_stub.o
 <ListItem>
 <Para>
 compile up a <Function>DllMain()</Function> that starts up the Haskell
 <ListItem>
 <Para>
 compile up a <Function>DllMain()</Function> that starts up the Haskell

-RTS---a possible implementation is:
+RTS-&ndash;&ndash;a possible implementation is:

 
 <ProgramListing>
 #include &lt;windows.h&gt;
 
 <ProgramListing>
 #include &lt;windows.h&gt;

@@ -276,7 +276,7 @@ gcc -c dllMain.c
 Construct the DLL:
 
 <Screen>
 Construct the DLL:
 
 <Screen>

-ghc --mk-dll -o adder.dll adder.o adder_stub.o dllMain.o
+ghc &ndash;&ndash;mk-dll -o adder.dll adder.o adder_stub.o dllMain.o

 </Screen>
 
 </Para>
 </Screen>
 
 </Para>

@@ -284,7 +284,7 @@ ghc --mk-dll -o adder.dll adder.o adder_stub.o dllMain.o
 
 <ListItem>
 <Para>
 
 <ListItem>
 <Para>

-Start using <Function>adder</Function> from VBA---here's how I would
+Start using <Function>adder</Function> from VBA-&ndash;&ndash;here's how I would

 <Constant>Declare</Constant> it:
 
 <ProgramListing>
 <Constant>Declare</Constant> it:
 
 <ProgramListing>