From b18bfda27a5caa10e899712ac2a1a5af778a8d52 Mon Sep 17 00:00:00 2001
From: Jan Stolarek <jan.stolarek@p.lodz.pl>
Date: Thu, 3 Jul 2014 08:16:28 +0200
Subject: [PATCH] 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)
---
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 9de4090bc4a2..0b56db7419ae 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 d9628b2c4142..1a848fc9b5a4 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 af1b2049f61c..44c05cec3b57 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)",
--
GitLab