summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/doc/ChangeLog4
-rw-r--r--winsup/doc/setup2.sgml15
2 files changed, 11 insertions, 8 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 76aeb84b4..aa8db5fc3 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-22 Christopher Faylor <me+cygwin@cgf.cx>
+
+ * setup2.sgml: Clarify heap allocation.
+
2008-08-13 Corinna Vinschen <corinna@vinschen.de>
* pathnames.sgml: Move description for (cyg,not)exec mount options
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index 5bdfef989..4ae4d4fd3 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -59,14 +59,13 @@ first starts. Most Cygwin applications do not make use of the
<sect1 id="setup-maxmem"><title>Changing Cygwin's Maximum Memory</title>
<para>
-By default no Cygwin program can allocate more than 384 MB of memory
-(program+data). You should not need to change this default in most
-circumstances. However, if you need to use more real or virtual memory in
-your machine you may add an entry in the either the
-<literal>HKEY_LOCAL_MACHINE</literal> (to change the limit for all users) or
-<literal>HKEY_CURRENT_USER</literal> (for just the current user) section of
-the registry.
-</para>
+Cygwin's heap is extensible. However, it does start out at a fixed size
+and attempts to extend it may run into memory which has been previously
+allocated by Windows. In some cases, this problem can be solved by
+adding an entry in the either the <literal>HKEY_LOCAL_MACHINE</literal>
+(to change the limit for all users) or
+<literal>HKEY_CURRENT_USER</literal> (for just the current user) section
+of the registry. </para>
<para>
Add the <literal>DWORD</literal> value <literal>heap_chunk_in_mb</literal>