[commit: ghc] ghc-7.8: Update documentation (b18bfda)

git at git.haskell.org git at git.haskell.org
Thu Jul 3 14:57:05 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/b18bfda27a5caa10e899712ac2a1a5af778a8d52/ghc

>---------------------------------------------------------------

commit b18bfda27a5caa10e899712ac2a1a5af778a8d52
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Thu Jul 3 08:16:28 2014 +0200

    Update documentation
    
      * fix links to the User's Guide in ghc and ghci --help messages
      * fix default stack size info in RTS help message
    
    (cherry picked from commit 311c55d132a65e657771e5f58b12a205e0a4af99)


>---------------------------------------------------------------

b18bfda27a5caa10e899712ac2a1a5af778a8d52
 driver/ghc-usage.txt  | 2 +-
 driver/ghci-usage.txt | 2 +-
 rts/RtsFlags.c        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/driver/ghc-usage.txt b/driver/ghc-usage.txt
index 9de4090..0b56db7 100644
--- a/driver/ghc-usage.txt
+++ b/driver/ghc-usage.txt
@@ -73,7 +73,7 @@ Given the above, here are some TYPICAL invocations of $$:
 The User's Guide has more information about GHC's *many* options.  An
 online copy can be found here:
 
-   http://haskell.org/haskellwiki/GHC
+   http://www.haskell.org/ghc/docs/latest/html/users_guide/
 
 If you *really* want to see every option, then you can pass
 '--show-options' to the compiler.
diff --git a/driver/ghci-usage.txt b/driver/ghci-usage.txt
index d9628b2..1a848fc 100644
--- a/driver/ghci-usage.txt
+++ b/driver/ghci-usage.txt
@@ -21,4 +21,4 @@ GHC does.  Some of the options that are commonly used are:
 Full details can be found in the User's Guide, an online copy of which
 can be found here:
 
-    http://haskell.org/haskellwiki/GHC
+    http://www.haskell.org/ghc/docs/latest/html/users_guide/
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index af1b204..44c05ce 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -241,7 +241,8 @@ usage_text[] = {
 "  -?       Prints this message and exits; the program is not executed",
 "  --info   Print information about the RTS used by this program",
 "",
-"  -K<size> Sets the maximum stack size (default 8M)  Egs: -K32k   -K512k",
+"  -K<size>  Sets the maximum stack size (default: 80% of the heap)",
+"            Egs: -K32k -K512k -K8M",
 "  -ki<size> Sets the initial thread stack size (default 1k)  Egs: -ki4k -ki2m",
 "  -kc<size> Sets the stack chunk size (default 32k)",
 "  -kb<size> Sets the stack chunk buffer size (default 1k)",



More information about the ghc-commits mailing list