Merge branch 'devel' of https://github.com/Araq/Nimrod into devel

2 files changed, 27 insertions, 1 deletions

diff --git a/doc/manual.txt b/doc/manual.txt
index 89a417fb2..6aed72ce7 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -1421,7 +1421,7 @@ Examples:
   proc forEach(c: proc (x: int) {.cdecl.}) =
     ...
 
-  forEach(printItem)  # this will NOT work because calling conventions differ
+  forEach(printItem)  # this will NOT compile because calling conventions differ
 
   
 .. code-block:: nimrod
@@ -5039,6 +5039,27 @@ first implementation to play with a language feature before a nicer syntax
 to access the feature becomes available.
 
 
+deprecated pragma
+-----------------
+
+The deprecated pragma is used to mark a symbol as deprecated:
+
+.. code-block:: nimrod
+  proc p() {.deprecated.}
+  var x {.deprecated.}: char
+
+It can also be used as a statement. Then it takes a list of *renamings*. The
+upcoming ``nimfix`` tool can automatically update the code and perform these
+renamings:
+
+.. code-block:: nimrod
+  type
+    File = object
+    Stream = ref object
+  {.deprecated: [TFile: File, PStream: Stream].}
+
+
+
 noSideEffect pragma
 -------------------
 The ``noSideEffect`` pragma is used to mark a proc/iterator to have no side
diff --git a/doc/nimdoc.css b/doc/nimdoc.css
index 6154f0b2e..e3bab07de 100644
--- a/doc/nimdoc.css
+++ b/doc/nimdoc.css
@@ -16,6 +16,11 @@ customize this style sheet.
    Andreas Rumpf

 */

 

+body {

+  color: black;

+  background: white;

+}

+

 /* used to remove borders from tables and images */

 .borderless, table.borderless td, table.borderless th {

   border: 0 }