From 74498d616eaae30605d7323254c46f5af4ae253c Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 10 Feb 2012 00:50:19 +0100
Subject: fixes tests for 'system.shallow'

---
 doc/nimrodc.txt       |  2 +-
 doc/theindex.txt      | 42 +++++++++++++++++++++++-------------------
 lib/system/mmdisp.nim |  4 ++--
 web/question.txt      |  2 +-
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/doc/nimrodc.txt b/doc/nimrodc.txt
index fd7d9d226..58cfa22f6 100755
--- a/doc/nimrodc.txt
+++ b/doc/nimrodc.txt
@@ -87,7 +87,7 @@ generated; use the ``--symbolFiles:on`` command line switch to activate them.
 
 Unfortunately due to technical reasons the ``--symbolFiles:on`` needs 
 to *aggregate* some generated C code. This means that the resulting executable
-might contain some cruft even in when dead code elimination is turned on. So
+might contain some cruft even when dead code elimination is turned on. So
 the final release build should be done with ``--symbolFiles:off``.
 
 Due to the aggregation of C code it is also recommended that each project
diff --git a/doc/theindex.txt b/doc/theindex.txt
index 3a9dabf3f..a59b5c72f 100755
--- a/doc/theindex.txt
+++ b/doc/theindex.txt
@@ -1020,12 +1020,6 @@ Index
    `clonglong`:idx:
      `system.html#427 <system.html#427>`_
 
-   `Close`:idx:
-     * `system.html#560 <system.html#560>`_
-     * `db_postgres.html#117 <db_postgres.html#117>`_
-     * `db_mysql.html#116 <db_mysql.html#116>`_
-     * `db_sqlite.html#117 <db_sqlite.html#117>`_
-
    `close`:idx:
      * `inboxes.html#110 <inboxes.html#110>`_
      * `sockets.html#123 <sockets.html#123>`_
@@ -1051,6 +1045,12 @@ Index
      * `memfiles.html#105 <memfiles.html#105>`_
      * `asyncio.html#109 <asyncio.html#109>`_
 
+   `Close`:idx:
+     * `system.html#560 <system.html#560>`_
+     * `db_postgres.html#117 <db_postgres.html#117>`_
+     * `db_mysql.html#116 <db_mysql.html#116>`_
+     * `db_sqlite.html#117 <db_sqlite.html#117>`_
+
    `closure`:idx:
      `manual.html#183 <manual.html#183>`_
 
@@ -3767,15 +3767,15 @@ Index
    `hSetNX`:idx:
      `redis.html#147 <redis.html#147>`_
 
+   `html`:idx:
+     * `xmlgen.html#139 <xmlgen.html#139>`_
+     * `htmlgen.html#139 <htmlgen.html#139>`_
+
    `HTML`:idx:
      * `xmlgen.html#102 <xmlgen.html#102>`_
      * `parsexml.html#102 <parsexml.html#102>`_
      * `htmlgen.html#102 <htmlgen.html#102>`_
 
-   `html`:idx:
-     * `xmlgen.html#139 <xmlgen.html#139>`_
-     * `htmlgen.html#139 <htmlgen.html#139>`_
-
    `htmlTag`:idx:
      * `htmlparser.html#105 <htmlparser.html#105>`_
      * `htmlparser.html#106 <htmlparser.html#106>`_
@@ -5529,14 +5529,6 @@ Index
    `ONLY_KILL_QUERY`:idx:
      `mysql.html#189 <mysql.html#189>`_
 
-   `Open`:idx:
-     * `system.html#556 <system.html#556>`_
-     * `system.html#557 <system.html#557>`_
-     * `system.html#558 <system.html#558>`_
-     * `db_postgres.html#118 <db_postgres.html#118>`_
-     * `db_mysql.html#117 <db_mysql.html#117>`_
-     * `db_sqlite.html#118 <db_sqlite.html#118>`_
-
    `open`:idx:
      * `inboxes.html#109 <inboxes.html#109>`_
      * `channels.html#105 <channels.html#105>`_
@@ -5555,6 +5547,14 @@ Index
      * `encodings.html#105 <encodings.html#105>`_
      * `memfiles.html#104 <memfiles.html#104>`_
 
+   `Open`:idx:
+     * `system.html#556 <system.html#556>`_
+     * `system.html#557 <system.html#557>`_
+     * `system.html#558 <system.html#558>`_
+     * `db_postgres.html#118 <db_postgres.html#118>`_
+     * `db_mysql.html#117 <db_mysql.html#117>`_
+     * `db_sqlite.html#118 <db_sqlite.html#118>`_
+
    `openarray`:idx:
      * `tut1.html#120 <tut1.html#120>`_
      * `system.html#136 <system.html#136>`_
@@ -7106,7 +7106,11 @@ Index
      `cgi.html#143 <cgi.html#143>`_
 
    `shallow`:idx:
-     `manual.html#258 <manual.html#258>`_
+     * `manual.html#258 <manual.html#258>`_
+     * `system.html#633 <system.html#633>`_
+     * `system.html#634 <system.html#634>`_
+     * `system.html#635 <system.html#635>`_
+     * `system.html#636 <system.html#636>`_
 
    `shallow copy`:idx:
      `system.html#413 <system.html#413>`_
diff --git a/lib/system/mmdisp.nim b/lib/system/mmdisp.nim
index 1561e1b27..e8ad23970 100755
--- a/lib/system/mmdisp.nim
+++ b/lib/system/mmdisp.nim
@@ -152,7 +152,7 @@ when defined(boehmgc):
   proc newSeq(typ: PNimType, len: int): pointer {.compilerproc.} =
     result = newObj(typ, addInt(mulInt(len, typ.base.size), GenericSeqSize))
     cast[PGenericSeq](result).len = len
-    cast[PGenericSeq](result).space = len
+    cast[PGenericSeq](result).reserved = len
 
   proc growObj(old: pointer, newsize: int): pointer =
     result = realloc(old, newsize)
@@ -208,7 +208,7 @@ elif defined(nogc):
   proc newSeq(typ: PNimType, len: int): pointer {.compilerproc.} =
     result = newObj(typ, addInt(mulInt(len, typ.base.size), GenericSeqSize))
     cast[PGenericSeq](result).len = len
-    cast[PGenericSeq](result).space = len
+    cast[PGenericSeq](result).reserved = len
   proc growObj(old: pointer, newsize: int): pointer =
     result = realloc(old, newsize)
 
diff --git a/web/question.txt b/web/question.txt
index 5be0df4b4..ffa26a364 100755
--- a/web/question.txt
+++ b/web/question.txt
@@ -35,7 +35,7 @@ Why yet another programming language?
 -------------------------------------
 
 Nimrod is one of the very few *programmable* statically typed languages, and 
-one of the even fewer that will produce native binaries that require no 
+one of the even fewer that produces native binaries that require no 
 runtime or interpreter.
 
 
-- 
cgit 1.4.1-2-gfad0