[m-rev.] trivial diff: more documentation fixes

[Julien Fischer]

Branches: main, 11.07

extras/graphics/README:
 	Delete a reference to mtogl, which was removed several
 	releases ago.

compiler/options.m:
HISTORY:
samples/diff/diff_out.m:
samples/diff/options.m:
 	Fix spelling and doubled-up words.

Julien.

Index: HISTORY
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/HISTORY,v
retrieving revision 1.33
diff -u -r1.33 HISTORY
--- HISTORY	26 Jun 2011 14:12:49 -0000	1.33
+++ HISTORY	16 Jul 2011 11:48:01 -0000
@@ -745,7 +745,7 @@
    efficient representation of lists of tokens. The functionality is
    unchanged.

-* We have fixed a problem where io__call_system/4 was not returning the
+* We have fixed a problem where io__call_system/4 was not returning
    the exit code of the invoked command on some operating systems.

  * We have fixed a bug in relation__rtc/4.
@@ -1792,7 +1792,7 @@
  * Native code compiler.

    There's a new back-end for the Mercury compiler that compiles
-  directly to assembler, rather than than going via C.  This
+  directly to assembler, rather than going via C.  This
    back-end is enabled using the new `--target asm' option.

    This new back-end is implemented by linking the Mercury compiler
@@ -1933,7 +1933,7 @@
  * Predicate and function type and mode declarations can now be expressed
    in terms of higher-order predicate and function types and insts, rather
    than explicitly listing the argument types and modes.  This is useful
-  where several predicates or functions must have the the same type and
+  where several predicates or functions must have the same type and
    mode signature.

    For example:
@@ -2130,7 +2130,7 @@
    which on interrupt returns the number of the signal which interrupted
    the command rather than just an error message.

-* We've added added several new predicates for deconstructing terms to
+* We've added several new predicates for deconstructing terms to
    std_util.m. `named_argument' and `det_named_argument' are analogous
    to `argument' and `det_argument' respectively, but specify the desired
    argument by its name, not its position. We have also added committed choice
@@ -2391,7 +2391,7 @@
  * The native code Linux/x86 back-end is now "release quality".

    The native code back-end, which was first released in Mercury 0.10,
-  compiles directly to assembler, rather than than going via C.
+  compiles directly to assembler, rather than going via C.
    This back-end is enabled using the `--target asm' option.  It is
    implemented by linking the Mercury compiler with the (relatively)
    language independent GNU Compiler Collection back-end.  In other words,
@@ -4007,7 +4007,7 @@
    set_ctree234.non_empty/1.  We have add the function
    set_ctree234.from_list/1.

-* We have added the the predicate set_bbbtree.count/2 and the
+* We have added the predicate set_bbbtree.count/2 and the
    function set_bbbtree.count/1.  These replace the predicate
    set_bbbtree.size/2 which is now deprecated.

Index: compiler/options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.694
diff -u -r1.694 options.m
--- compiler/options.m	5 Jul 2011 03:34:33 -0000	1.694
+++ compiler/options.m	16 Jul 2011 11:43:07 -0000
@@ -5659,7 +5659,7 @@
          "\tThis option uses temporary files to pass arguments to sub-commands.",
          "\t(This option is only supported by `mmc --make'.)",
          "--env-type <type>",
-        "\tSpecify the the environment type in which the compiler and generated",
+        "\tSpecify the environment type in which the compiler and generated",
          "\tprograms will be invoked.",
          "\tThe <type> should be one of `posix', `cygwin', `msys', or `windows'.",
          "\tThis option is equivalent to setting both --host-env-type and",
Index: extras/graphics/README
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/graphics/README,v
retrieving revision 1.8
diff -u -r1.8 README
--- extras/graphics/README	19 Dec 2010 06:25:32 -0000	1.8
+++ extras/graphics/README	16 Jul 2011 11:59:11 -0000
@@ -13,10 +13,7 @@

  	mercury_tcltk/		A Mercury binding to Tcl/Tk.

-	mercury_opengl/		A Mercury binding to OpenGL.  This 
-                                directory also contains `mtogl' which
-                                is a Mercury binding to Togl, a Tk widget
-                                for OpenGL.
+	mercury_opengl/		A Mercury binding to OpenGL.

  	mercury_glut/		A Mercury binding to GLUT.

Index: samples/diff/diff_out.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/samples/diff/diff_out.m,v
retrieving revision 1.4
diff -u -r1.4 diff_out.m
--- samples/diff/diff_out.m	7 Jan 2011 16:35:36 -0000	1.4
+++ samples/diff/diff_out.m	16 Jul 2011 11:53:29 -0000
@@ -111,7 +111,7 @@
  %-----------------------------------------------------------------------------%

      % diff_out.show_file shows the segment of the file from Low to High, with
-    % each line preceeded by the Prefix characher and a space.  The diff(1)
+    % each line preceded by the Prefix character and a space.  The diff(1)
      % format specifies that the lines effected in the first file should be
      % flagged by '<' and the lines effected in the second file should be
      % flagged by '>'.
Index: samples/diff/options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/samples/diff/options.m,v
retrieving revision 1.6
diff -u -r1.6 options.m
--- samples/diff/options.m	3 May 2011 04:35:02 -0000	1.6
+++ samples/diff/options.m	16 Jul 2011 11:54:01 -0000
@@ -25,7 +25,7 @@
  :- pred options.get_option_ops(option_ops(option) :: out(option_ops)) is det.

      % Process the option table, perhaps returning an error message
-    % if there was some inconsistentcy or other error.
+    % if there was some inconsistency or other error.
      %
  :- pred postprocess_options(maybe_option_table::in, maybe(string)::out,
      io::di, io::uo) is det.

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------