resolved system.nim conflicts

1 files changed, 38 insertions, 38 deletions

diff --git a/doc/lib.txt b/doc/lib.txt
index 227a73405..fa29ff6ff 100755
--- a/doc/lib.txt
+++ b/doc/lib.txt
@@ -12,7 +12,7 @@ Nimrod Standard Library
 Though the Nimrod Standard Library is still evolving, it is already quite
 usable. It is divided into *pure libraries*, *impure libraries* and *wrappers*.
 
-Pure libraries do not depend on any external ``*.dll`` or ``lib*.so`` binary 
+Pure libraries do not depend on any external ``*.dll`` or ``lib*.so`` binary
 while impure libraries do. A wrapper is an impure library that is a very
 low-level interface to a C library.
 
@@ -31,7 +31,7 @@ Core
   implicitly by the compiler. Do not import it directly. It relies on compiler
   magic to work.
 
-* `macros <macros.html>`_ 
+* `macros <macros.html>`_
   Contains the AST API and documentation of Nimrod for writing macros.
 
 
@@ -39,8 +39,8 @@ String handling
 ---------------
 
 * `strutils <strutils.html>`_
-  This module contains common string handling operations like converting a
-  string into uppercase, splitting a string into substrings, searching for
+  This module contains common string handling operations like changing
+  case of a string, splitting a string into substrings, searching for
   substrings, replacing substrings.
 
 * `parseutils <parseutils.html>`_
@@ -52,7 +52,7 @@ String handling
   style-insensitive mode. An efficient string substitution operator ``%``
   for the string table is also provided.
 
-* `unicode <unicode.html>`_ 
+* `unicode <unicode.html>`_
   This module provides support to handle the Unicode UTF-8 encoding.
 
 * `re <re.html>`_
@@ -67,11 +67,11 @@ String handling
   Ropes can represent very long strings efficiently; especially concatenation
   is done in O(1) instead of O(n).
 
-* `unidecode <unidecode.html>`_ 
+* `unidecode <unidecode.html>`_
   This module provides Unicode to ASCII transliterations:
   It finds the sequence of ASCII characters that is the closest approximation
   to the Unicode string.
-  
+
 
 Generic Operating System Services
 ---------------------------------
@@ -97,8 +97,8 @@ Generic Operating System Services
   may provide other implementations for this standard stream interface.
 
 * `terminal <terminal.html>`_
-  This module contains a few procedures to control the *terminal* 
-  (also called *console*). The implementation simply uses ANSI escape 
+  This module contains a few procedures to control the *terminal*
+  (also called *console*). The implementation simply uses ANSI escape
   sequences and does not depend on any other module.
 
 
@@ -117,20 +117,20 @@ Internet Protocols and Support
 ------------------------------
 
 * `cgi <cgi.html>`_
-  This module implements helpers for CGI applictions. 
+  This module implements helpers for CGI applictions.
 
 * `sockets <sockets.html>`_
   This module implements a simple portable type-safe sockets layer.
 
 * `browsers <browsers.html>`_
-  This module implements procs for opening URLs with the user's default 
+  This module implements procs for opening URLs with the user's default
   browser.
-  
+
 * `httpserver <httpserver.html>`_
   This module implements a simple HTTP server.
-  
+
 * `httpclient <httpclient.html>`_
-  This module implements a simple HTTP client. 
+  This module implements a simple HTTP client.
 
 
 Parsers
@@ -149,14 +149,14 @@ Parsers
   as in the Nimrod programming language.
 
 * `parsexml <parsexml.html>`_
-  The ``parsexml`` module implements a simple high performance XML/HTML parser. 
+  The ``parsexml`` module implements a simple high performance XML/HTML parser.
   The only encoding that is supported is UTF-8. The parser has been designed
-  to be somewhat error correcting, so that even some "wild HTML" found on the 
-  web can be parsed with it.
+  to be somewhat error correcting, so that even some "wild HTML" found on the
+  Web can be parsed with it.
 
-* `parsecsv <parsecsv.html>`_ 
+* `parsecsv <parsecsv.html>`_
   The ``parsecsv`` module implements a simple high performance CSV parser.
-  
+
 * `parsesql <parsesql.html>`_
   The ``parsesql`` module implements a simple high performance SQL parser.
 
@@ -168,20 +168,20 @@ Parsers
 XML Processing
 --------------
 
-* `xmldom <xmldom.html>`_ 
+* `xmldom <xmldom.html>`_
   This module implements the XML DOM Level 2.
 
 * `xmldomparser <xmldomparser.html>`_
   This module parses an XML Document into a XML DOM Document representation.
 
 * `xmltree <xmltree.html>`_
-  A simple XML tree. More efficient and simpler than the DOM. It also 
+  A simple XML tree. More efficient and simpler than the DOM. It also
   contains a macro for XML/HTML code generation.
 
-* `xmlparser <xmlparser.html>`_ 
+* `xmlparser <xmlparser.html>`_
   This module parses an XML document and creates its XML tree representation.
-  
-* `htmlparser <htmlparser.html>`_ 
+
+* `htmlparser <htmlparser.html>`_
   This module parses an HTML document and creates its XML tree representation.
 
 
@@ -199,8 +199,8 @@ Cryptography and Hashing
 Multimedia support
 ------------------
 
-* `colors <colors.html>`_ 
-  This module implements color handling for Nimrod. It is used by 
+* `colors <colors.html>`_
+  This module implements color handling for Nimrod. It is used by
   the ``graphics`` module.
 
 
@@ -211,7 +211,7 @@ Impure libraries
 * `graphics <graphics.html>`_
   This module implements graphical output for Nimrod; the current
   implementation uses SDL but the interface is meant to support multiple
-  backends some day. 
+  backends some day.
 
 * `dialogs <dialogs.html>`_
   This module implements portable dialogs for Nimrod; the implementation
@@ -220,10 +220,10 @@ Impure libraries
 
 * `zipfiles <zipfiles.html>`_
   This module implements a zip archive creator/reader/modifier.
-  
+
 * `web <web.html>`_
   This module contains simple high-level procedures for dealing with the
-  web like loading the contents of a web page from an URL.
+  Web like loading the contents of a Web page from an URL.
 
 
 Database support
@@ -232,11 +232,11 @@ Database support
 * `db_postgres <db_postgres.html>`_
   A higher level PostgreSQL database wrapper. The same interface is implemented
   for other databases too.
- 
+
 * `db_mysql <db_mysql.html>`_
-  A higher level mySQL database wrapper. The same interface is implemented
+  A higher level MySQL database wrapper. The same interface is implemented
   for other databases too.
- 
+
 * `db_sqlite <db_sqlite.html>`_
   A higher level SQLite database wrapper. The same interface is implemented
   for other databases too.
@@ -255,7 +255,7 @@ not contained in the distribution. You can then find them on the website.
   Contains a wrapper for the Win32 API.
 * `mysql <mysql.html>`_
   Contains a wrapper for the mySQL API.
-* `sqlite3 <sqlite3.html>`_ 
+* `sqlite3 <sqlite3.html>`_
   Contains a wrapper for SQLite 3 API.
 * `libcurl <libcurl.html>`_
   Contains a wrapper for the libcurl library.
@@ -317,14 +317,14 @@ not contained in the distribution. You can then find them on the website.
   Part of the wrapper for Lua.
 * `lauxlib <lauxlib.html>`_
   Part of the wrapper for Lua.
-* `tcl <tcl.html>`_ 
+* `tcl <tcl.html>`_
   Wrapper for the TCL programming language.
 * `python <python.html>`_
   Wrapper for the Python programming language.
 * `odbcsql <odbcsql.html>`_
   interface to the ODBC driver.
 * `zlib <zlib.html>`_
-  Wrapper for the zlib library. 
+  Wrapper for the zlib library.
 * `sdl <sdl.html>`_
   Part of the wrapper for SDL.
 * `sdl_gfx <sdl_gfx.html>`_
@@ -379,7 +379,7 @@ not contained in the distribution. You can then find them on the website.
   Part of the wrapper for X11.
 * `libzip <libzip.html>`_
   Interface to the `lib zip <http://www.nih.at/libzip/index.html>`_ library by
-  Dieter Baron and Thomas Klausner. 
-* `iup <iup.html>`_ 
+  Dieter Baron and Thomas Klausner.
+* `iup <iup.html>`_
   Wrapper of the IUP GUI library.
-  
+