[m-rev.] diff: improve --linkage documentation

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

compiler/options.m:
doc/user_guide.texi:
	Address Fergus's review comments about my previous change --
	be more explicit in the documentation about how shared libraries
	are linked.

Index: compiler/options.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/options.m,v
retrieving revision 1.399
diff -u -u -r1.399 options.m
--- compiler/options.m	23 Jan 2003 00:24:06 -0000	1.399
+++ compiler/options.m	24 Jan 2003 06:46:04 -0000
@@ -3779,10 +3779,13 @@
 
 		"--linkage {shared|static}",
 		"\tSpecify whether to use shared or static linking for",
-		"\texecutables.",
+		"\texecutables.  Shared libraries are always linked",
+		"\twith `--linkage shared'.",
 		"--mercury-linkage {shared|static}",
 		"\tSpecify whether to use shared or static linking when",
 		"\tlinking an executable with Mercury libraries.",
+		"\tShared libraries are always linked with",
+		"\t`--mercury-linkage shared'.",
 
 		"--init-file-directory <directory>",
 		"\tAppend <directory> to the list of directories to",
Index: doc/user_guide.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/user_guide.texi,v
retrieving revision 1.348
diff -u -u -r1.348 user_guide.texi
--- doc/user_guide.texi	23 Jan 2003 00:24:11 -0000	1.348
+++ doc/user_guide.texi	24 Jan 2003 06:44:22 -0000
@@ -6575,12 +6575,14 @@
 @item --linkage @{shared,static@}
 @findex --linkage
 Specify whether to use shared or static linking for executables.
+Shared libraries are always linked with @samp{--linkage shared}.
 
 @sp 1
 @item --mercury-linkage @{shared,static@}
 @findex --mercury-linkage
 Specify whether to use shared or static linking when
 linking an executable with Mercury libraries.
+Shared libraries are always linked with @samp{--mercury-linkage shared}.
 
 @end table
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------