From: simonmar <unknown>
Date: Fri, 8 Aug 2003 08:08:47 +0000 (+0000)
Subject: [project @ 2003-08-08 08:08:47 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~592
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=2c5525a9fae00927d8068dc5294421868350daf9;p=ghc-hetmet.git

[project @ 2003-08-08 08:08:47 by simonmar]
- Add -main-is to the flag table
- Sort entries in the linker section alphabetically
---

diff --git a/ghc/docs/users_guide/flags.sgml b/ghc/docs/users_guide/flags.sgml
index 8dc22af..40e46a2 100644
--- a/ghc/docs/users_guide/flags.sgml
+++ b/ghc/docs/users_guide/flags.sgml
@@ -1100,6 +1100,21 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
+	      <entry><option>-framework</option> <replaceable>name</replaceable></entry>
+	      <entry>On Darwin/MacOS X only, link in the framework <replaceable>name</replaceable>.
+		This option corresponds to the <option>-framework</option> option for Apple's Linker.</entry>
+	      <entry>static</entry>
+	      <entry>-</entry>
+	    </row>
+	    <row>
+	      <entry><option>-framework-path</option> <replaceable>name</replaceable></entry>
+	      <entry>On Darwin/MacOS X only, add <replaceable>dir</replaceable> to the list of
+	        directories searched for frameworks.
+		This option corresponds to the <option>-F</option> option for Apple's Linker.</entry>
+	      <entry>static</entry>
+	      <entry>-</entry>
+	    </row>
+	    <row>
 	      <entry><option>-l</option><replaceable>lib</replaceable></entry>
 	      <entry>Link in library <replaceable>lib</replaceable></entry>
 	      <entry>static</entry>
@@ -1113,29 +1128,26 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-no-link</option></entry>
-	      <entry>Omit linking</entry>
+	      <entry><option>-main-is</option></entry>
+	      <entry>Set main function</entry>
 	      <entry>static</entry>
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-package</option> <replaceable>name</replaceable></entry>
-	      <entry>Link in package <replaceable>name</replaceable></entry>
+	      <entry><option>-no-hs-main</option></entry>
+	      <entry>Don't asssume this program contains <literal>main</literal></entry>
 	      <entry>static</entry>
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-framework</option> <replaceable>name</replaceable></entry>
-	      <entry>On Darwin/MacOS X only, link in the framework <replaceable>name</replaceable>.
-		This option corresponds to the <option>-framework</option> option for Apple's Linker.</entry>
+	      <entry><option>-no-link</option></entry>
+	      <entry>Omit linking</entry>
 	      <entry>static</entry>
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-framework-path</option> <replaceable>name</replaceable></entry>
-	      <entry>On Darwin/MacOS X only, add <replaceable>dir</replaceable> to the list of
-	        directories searched for frameworks.
-		This option corresponds to the <option>-F</option> option for Apple's Linker.</entry>
+	      <entry><option>-package</option> <replaceable>name</replaceable></entry>
+	      <entry>Link in package <replaceable>name</replaceable></entry>
 	      <entry>static</entry>
 	      <entry>-</entry>
 	    </row>
@@ -1151,12 +1163,6 @@
 	      <entry>static</entry>
 	      <entry>-</entry>
 	    </row>
-	    <row>
-	      <entry><option>-no-hs-main</option></entry>
-	      <entry>Don't asssume this program contains <literal>main</literal></entry>
-	      <entry>static</entry>
-	      <entry>-</entry>
-	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>