added new OpenGL wrapper

3 files changed, 14 insertions, 13 deletions

diff --git a/doc/lib.txt b/doc/lib.txt
index 65f5d81ed..3916bf892 100755
--- a/doc/lib.txt
+++ b/doc/lib.txt
@@ -489,6 +489,9 @@ Graphics libraries
 * `wingl <wingl.html>`_
   Part of the wrapper for OpenGL.
 
+* `opengl <opengl.html>`_
+  New wrapper for OpenGL supporting up to version 4.2.
+  
 
 GUI libraries
 -------------
diff --git a/doc/manual.txt b/doc/manual.txt
index 9b5362324..7bd36bbdd 100755
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -2567,11 +2567,11 @@ Type constraints
 type parameter. Only the specified types are valid for instantiation:

 

 .. code-block:: nimrod

-  proc onlyIntOrString[T: int|string](x, y: T): T = nil

-  

-  onlyIntOrString(45, 66) # valid

-  onlyIntOrString(56.0, 0.0) # type mismatch

+  proc onlyIntOrString[T: int|string](x, y: T) = nil

   

+  onlyIntOrString(450, 616) # valid

+  onlyIntOrString(5.0, 0.0) # type mismatch

+  onlyIntOrString("xy", 50) # invalid as 'T' cannot be both at the same time

   

 Apart from ordinary types, type constraints can also be of the

 following *type classes*:

diff --git a/doc/tut1.txt b/doc/tut1.txt
index bbc4e1ee6..e7d389cf3 100755
--- a/doc/tut1.txt
+++ b/doc/tut1.txt
@@ -91,8 +91,9 @@ keywords, comments, operators, and other punctuation marks. Case is
 ``This_is_an_identifier`` and ``ThisIsAnIdentifier`` are the same identifier.
 This feature enables you to use other
 people's code without bothering about a naming convention that conflicts with
-yours. It also frees you from remembering the exact spelling of an identifier
-(was it ``parseURL`` or ``parseUrl`` or ``parse_URL``?).
+yours. A Nimrod-aware editor or IDE can show the identifiers as

+preferred. It also frees you from remembering the exact spelling of an 
+identifier (was it ``parseURL`` or ``parseUrl`` or ``parse_URL``?).
 
 
 String and character literals
@@ -117,16 +118,13 @@ Comments
 --------
 
 `Comments`:idx: start anywhere outside a string or character literal with the
-hash character ``#``. Documentation comments start with ``##``.
-Comments consist of a concatenation of `comment pieces`:idx:. A comment piece
-starts with ``#`` and runs until the end of the line. The end of line characters
-belong to the piece. If the next line only consists of a comment piece which is
-aligned to the preceding one, it does not start a new comment:
+hash character ``#``. Documentation comments start with ``##``. Multiline
+comments need to be aligned at the same column:
 
 .. code-block:: nimrod
 
   i = 0     # This is a single comment over multiple lines belonging to the
-            # assignment statement. The scanner merges these two pieces.
+            # assignment statement.
   # This is a new comment belonging to the current block, but to no particular
   # statement.
   i = i + 1 # This a new comment that is NOT
@@ -1206,7 +1204,7 @@ Traced references are declared with the **ref** keyword, untraced references
 are declared with the **ptr** keyword.
 
 The empty ``[]`` subscript notation can be used to *derefer* a reference, 
-meaning to retrieve the item the reference points to. The ``addr`` procedure 
+meaning to retrieve the item the reference points to. The ``addr`` operator 
 returns the address of an item. An address is always an untraced reference:
 ``addr`` is an *unsafe* feature.