[m-users.] diff: fix overlong lines in usage message

[Julien Fischer]

Branches: master, 13.05

Fix overlong lines in the usage message.

compiler/options.m:
 	As above.

library/type_desc.m:
 	Delete a stray '%' in a comment.

Julien.

diff --git a/compiler/options.m b/compiler/options.m
index 234c112..281f2b0 100644
--- a/compiler/options.m
+++ b/compiler/options.m
@@ -3556,11 +3556,11 @@ options_help_warning -->
          "\t`.trans_opt' files has been lost.  The information can be",
          "\trecreated by running `mmake <mainmodule>.depend'",
          "--no-warn-non-contiguous-clauses",
-        "\tDo not generate a warning if the clauses of a predicate or function",
-        "\tare not contiguous.",
+        "\tDo not generate a warning if the clauses of a predicate or",
+        "\tfunction are not contiguous.",
          "--warn-non-contiguous-foreign-procs",
-        "\tGenerate a warning if the clauses and foreign_procs of a predicate",
-        "\tor function are not contiguous.",
+        "\tGenerate a warning if the clauses and foreign_procs of a",
+        "\tpredicate or function are not contiguous.",
          "--warn-non-stratification",
          "\tWarn about possible non-stratification of the predicates and/or",
          "\tfunctions in the module.",
@@ -3680,8 +3680,9 @@ options_help_verbosity -->
  %       "\tOutput more detailed messages about the compiler's",
  %       "\ttime/space usage.",
          "--proc-size-statistics <filename>",
-        "\tAppend information about the size of each procedure in the module",
-        "\tin terms of goals and variables to the end of the named file.",
+        "\tAppend information about the size of each procedure in the",
+        "\tmodule in terms of goals and variables to the end of the",
+        "\tnamed file.",
  % --debug-types works only if the compiler was compiled with
  % "--trace-flag type_checkpoint".
  %       "-T, --debug-types",
@@ -4480,7 +4481,8 @@ options_help_compilation_model -->
          "\tEnable use of a trail.",
          "\tThis is necessary for interfacing with constraint solvers,",
          "\tor for backtrackable destructive update.",
-        "\tThis option is not yet supported for the IL, C# or Java back-ends.",
+        "\tThis option is not yet supported for the IL, C# or Java",
+        "\tJava back-ends.",
          "--trail-segments\t\t\t(grade modifier: `.trseg')",
          "\tAs above, but use a dynamically sized trail that is composed",
          "\tof small segments.  This can help to avoid trail exhaustion",
@@ -5035,7 +5037,8 @@ options_help_hlds_hlds_optimization -->
  %       "\tsuperhomogeneous form of a ground term that involves at least.",
  %       "\tthe given number of function symbols.",
          "--no-const-struct",
-        "\tDisable the gathering of constant structures in a separate table.",
+        "\tDisable the gathering of constant structures in a separate",
+        "\ttable.",
          "--no-common-struct",
          "\tDisable optimization of common term structures.",
  %       "--common-struct-preds <predids>",
@@ -5317,7 +5320,8 @@ options_help_llds_llds_optimization -->
          "--no-common-data",
          "\tDisable optimization of common data structures.",
          "--no-common-layout-data",
-        "\tDisable optimization of common subsequences in layout structures.",
+        "\tDisable optimization of common subsequences in layout",
+        "\tstructures.",
          "--no-llds-optimize",
          "\tDisable the low-level optimization passes.",
          "--optimize-dead-procs",
@@ -5684,12 +5688,12 @@ options_help_link -->
          "--sign-assembly <keyfile>",
          "\tSign the current assembly with the strong name contained",
          "\tin the specified key file.",
-        "\t(This option is only meaningful when generating library assemblies",
-        "\twith the C# backend.)",
+        "\t(This option is only meaningful when generating library",
+        "\tassemblies with the C# backend.)",

          "--cstack-reserve-size <size>",
-        "\tSet the total size of the C stack in virtual memory for excutables.",
-        "\tThe stack size is given in bytes.",
+        "\tSet the total size of the C stack in virtual memory for",
+        "\texecutables.  The stack size is given in bytes.",
          "\t(Microsoft Windows only.)"

          % The --shared-library-extension,
@@ -5864,7 +5868,8 @@ options_help_build_system -->
          "--env-type <type>",
          "\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'.",
+        "\tThe <type> should be one of `posix', `cygwin', `msys', or",
+        "\t`windows'.",
          "\tThis option is equivalent to setting both --host-env-type and",
          "\t--target-env-type to <type>.",
          "--host-env-type <type>",
diff --git a/library/type_desc.m b/library/type_desc.m
index 7b5da12..195b49f 100644
--- a/library/type_desc.m
+++ b/library/type_desc.m
@@ -116,7 +116,7 @@
      % if you have a declaration `:- type foo == bar.', then
      % type_ctor_and_args/3 will always return a representation of type
      % constructor `bar/0', not `foo/0'. (If you don't want them expanded,
-    %% you can use the reverse mode of make_type/2 instead.)
+    % you can use the reverse mode of make_type/2 instead.)
      %
  :- pred type_ctor_and_args(type_desc::in,
      type_ctor_desc::out, list(type_desc)::out) is det.