[m-rev.] diff: fix TexInfo problems on taifun

Fergus Henderson fjh at cs.mu.OZ.AU
Thu Aug 8 09:06:46 AEST 2002


pmoulder's recent change to the doc formatting broke the build
on taifun.cs.mu.oz.au, due to that machine having an old version
of TexInfo installed.  Hence the following fix.

Branches: main
Estimated hours taken: 0.75

doc/reference_manual.texi:
doc/user_guide.texi:
	Use @samp rather than @command, and @samp rather than @option.
	This is partly for consistency, but mainly because earlier
	versions of TexInfo (e.g. 3.9) don't support @option or @command.

	(It might be a good idea to switch to using @option and @command
	later, but if so, we should do so consistently -- currently they
	were only used in a couple of places.  We should also add an
	autoconf check to ensure that the version of TexInfo which is
	installed is up-to-date.)

Workspace: /home/ceres/fjh/ws-ceres2/mercury
Index: doc/reference_manual.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/reference_manual.texi,v
retrieving revision 1.254
diff -u -d -r1.254 reference_manual.texi
--- doc/reference_manual.texi	5 Aug 2002 04:01:57 -0000	1.254
+++ doc/reference_manual.texi	7 Aug 2002 23:01:47 -0000
@@ -5368,9 +5368,9 @@
 Mercury variables whose type is a type variable will be passed as
 @code{System.Object}.
 Mercury array types are mapped to CLR array types.
-When compiling with @option{--no-high-level-data}, all other Mercury variables
+When compiling with @samp{--no-high-level-data}, all other Mercury variables
 are passed as @code{System.Object[]}.
-When compiling with @option{--high-level-data},
+When compiling with @samp{--high-level-data},
 Mercury variables whose type is a Mercury discriminated union type
 will be passed as a CLR type whose type name is determined from
 the Mercury type name (ignoring any type parameters) followed by
@@ -6841,7 +6841,7 @@
 where @var{reason} will be @samp{MR_undo} if the backtracking was due to
 a goal failing, @samp{MR_exception} if the backtracking was due to
 a goal throwing an exception, or @samp{MR_retry} if the backtracking
-was due to the use of the ``retry'' command in @command{mdb}, the Mercury debugger,
+was due to the use of the ``retry'' command in @samp{mdb}, the Mercury debugger,
 or any similar user request in a debugger.
 The Mercury implementation also ensures that if the current choice point is
 pruned because execution commits to never backtracking to it,
Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.317
diff -u -d -r1.317 user_guide.texi
--- doc/user_guide.texi	5 Aug 2002 04:02:00 -0000	1.317
+++ doc/user_guide.texi	7 Aug 2002 22:10:43 -0000
@@ -3483,7 +3483,7 @@
 
 On some operating systems,
 Mercury's profiling doesn't work properly with shared libraries.
-The symptom is errors (@samp{map__lookup failed}) or warnings from @command{mprof}.
+The symptom is errors (@samp{map__lookup failed}) or warnings from @samp{mprof}.
 On some systems, the problem occurs because the C implementation
 fails to conform to the semantics specified by the ISO C standard
 for programs that use shared libraries.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list