Merge branch 'devel' of https://github.com/nim-lang/Nim into devel

10 files changed, 55 insertions, 10 deletions

diff --git a/doc/lib.txt b/doc/lib.txt
index 4fa49095c..90cf36240 100644
--- a/doc/lib.txt
+++ b/doc/lib.txt
@@ -84,7 +84,7 @@ Collections and algorithms
 * `sequtils <sequtils.html>`_
   This module implements operations for the built-in seq type
   which were inspired by functional programming languages.
-
+  
 
 String handling
 ---------------
@@ -165,6 +165,8 @@ Generic Operating System Services
   This module implements the ability to monitor a directory/file for changes
   using Posix's inotify API.
 
+  **Warning:** This module will likely be moved out to a Nimble package soon.
+
 * `asyncfile <asyncfile.html>`_
   This module implements asynchronous file reading and writing using
   ``asyncdispatch``.
@@ -191,6 +193,11 @@ Math libraries
 * `basic3d <basic3d.html>`_
   Basic 3d support with vectors, points, matrices and some basic utilities.
 
+* `mersenne <mersenne.html>`_
+  Mersenne twister random number generator.
+
+* `stats <stats.html>`_
+  Statistical analysis
 
 Internet Protocols and Support
 ------------------------------
@@ -209,7 +216,8 @@ Internet Protocols and Support
   This module implements a simple HTTP server.
 
 * `httpclient <httpclient.html>`_
-  This module implements a simple HTTP client.
+  This module implements a simple HTTP client which supports both synchronous
+  and asynchronous retrieval of web pages.
 
 * `smtp <smtp.html>`_
   This module implement a simple SMTP client.
@@ -226,19 +234,17 @@ Internet Protocols and Support
 * `asyncdispatch <asyncdispatch.html>`_
   This module implements an asynchronous dispatcher for IO operations.
 
-  **Note:** This module is still largely experimental.
-
 * `asyncnet <asyncnet.html>`_
   This module implements asynchronous sockets based on the ``asyncdispatch``
   module.
 
-  **Note:** This module is still largely experimental.
-
 * `asynchttpserver <asynchttpserver.html>`_
   This module implements an asynchronous HTTP server using the ``asyncnet``
   module.
 
-  **Note:** This module is still largely experimental.
+* `asyncftpclient <asyncftpclient.html>`_
+  This module implements an asynchronous FTP client using the ``asyncnet``
+  module.
 
 * `net <net.html>`_
   This module implements a high-level sockets API. It will replace the
@@ -346,6 +352,8 @@ Cryptography and Hashing
 * `base64 <base64.html>`_
   This module implements a base64 encoder and decoder.
 
+* `securehash <securehash.html>`_
+  This module implements a sha1 encoder and decoder.
 
 Multimedia support
 ------------------
@@ -381,6 +389,11 @@ Miscellaneous
   This module implements new experimental features. Currently the syntax
   sugar for anonymous procedures.
 
+* `coro <coro.html>`_
+  This module implements experimental coroutines in Nim.
+
+* `unittest <unittest.html>`_
+  Implements a Unit testing DSL.
 
 Modules for JS backend
 ---------------------------
diff --git a/lib/pure/fsmonitor.nim b/lib/pure/fsmonitor.nim
index 115c4739e..b22e84f44 100644
--- a/lib/pure/fsmonitor.nim
+++ b/lib/pure/fsmonitor.nim
@@ -10,6 +10,9 @@
 ## This module allows you to monitor files or directories for changes using
 ## asyncio.
 ##
+## **Warning**: This module will likely disappear soon and be moved into a
+## new Nimble package.
+##
 ## Windows support is not yet implemented.
 ##
 ## **Note:** This module uses ``inotify`` on Linux (Other Unixes are not yet
diff --git a/lib/pure/gentabs.nim b/lib/pure/gentabs.nim
index e6a05ec63..928ff8fe0 100644
--- a/lib/pure/gentabs.nim
+++ b/lib/pure/gentabs.nim
@@ -11,6 +11,8 @@
 ## key-value mapping. The keys are required to be strings, but the values
 ## may be any Nim or user defined type. This module supports matching
 ## of keys in case-sensitive, case-insensitive and style-insensitive modes.
+##
+## **Warning:** This module is deprecated, new code shouldn't use it!
 
 {.deprecated.}
 
diff --git a/lib/pure/httpserver.nim b/lib/pure/httpserver.nim
index 71ba04991..632eb198a 100644
--- a/lib/pure/httpserver.nim
+++ b/lib/pure/httpserver.nim
@@ -9,6 +9,9 @@
 
 ## This module implements a simple HTTP-Server.
 ##
+## **Warning**: This module will soon be deprecated in favour of
+## the ``asyncdispatch`` module, you should use it instead.
+##
 ## Example:
 ##
 ## .. code-block:: nim
diff --git a/lib/pure/numeric.nim b/lib/pure/numeric.nim
index 71adf19b3..ccda3a146 100644
--- a/lib/pure/numeric.nim
+++ b/lib/pure/numeric.nim
@@ -7,6 +7,9 @@
 #    distribution, for details about the copyright.
 #
 
+## **Warning:** This module will be moved out of the stdlib and into a
+## Nimble package, don't use it.
+
 type OneVarFunction* = proc (x: float): float
 
 {.deprecated: [TOneVarFunction: OneVarFunction].}
diff --git a/lib/pure/poly.nim b/lib/pure/poly.nim
index c52300400..b20e9f9d0 100644
--- a/lib/pure/poly.nim
+++ b/lib/pure/poly.nim
@@ -7,6 +7,9 @@
 #    distribution, for details about the copyright.
 #
 
+## **Warning:** This module will be moved out of the stdlib and into a
+## Nimble package, don't use it.
+
 import math
 import strutils
 import numeric
diff --git a/lib/pure/romans.nim b/lib/pure/romans.nim
index 18c04ef58..aa047d1cc 100644
--- a/lib/pure/romans.nim
+++ b/lib/pure/romans.nim
@@ -9,6 +9,9 @@
 
 ## Module for converting an integer to a Roman numeral.
 ## See http://en.wikipedia.org/wiki/Roman_numerals for reference.
+##
+## **Warning:** This module will be moved out of the stdlib and into a
+## Nimble package, don't use it.
 
 const
   RomanNumeralDigits* = {'I', 'i', 'V', 'v', 'X', 'x', 'L', 'l', 'C', 'c',
diff --git a/web/news.txt b/web/news.txt
index 491b0254a..aa772a415 100644
--- a/web/news.txt
+++ b/web/news.txt
@@ -185,6 +185,16 @@ via a commit, for a full list see
   (`#3730 <https://github.com/nim-lang/Nim/issues/3730>`_)
 
 
+2016-01-18 Andreas Rumpf's talk at OSCON Amsterdam
+==================================================
+
+In case you have missed it, here is Andreas' Nim: An Overview talk at
+OSCON Amsterdam.
+
+.. raw:: html
+
+  <iframe width="560" height="315" src="https://www.youtube.com/embed/4rJEBs_Nnaw" frameborder="0" allowfullscreen></iframe>
+
 2015-10-27 Version 0.12.0 released
 ==================================
 
diff --git a/web/ticker.txt b/web/ticker.txt
index a7ad73bc4..f4a3cac2a 100644
--- a/web/ticker.txt
+++ b/web/ticker.txt
@@ -1,8 +1,13 @@
 <a class="news" href="news.html#Z2016-01-18-version-0-13-0-released">
-  <h4>Jan 18, 2016</h4>
+  <h4>January 18, 2016</h4>
   <p>Nim version 0.13.0 has been released!</p>
 </a>
 
+<a class="news" href="news.html#Z2016-01-18-andreas-rumpf-s-talk-at-oscon-amsterdam">
+  <h4>January 18, 2016</h4>
+  <p>Andreas Rumpf's talk at OSCON Amsterdam</p>
+</a>
+
 <a class="news" href="news.html#Z2015-10-27-version-0-12-0-released">
   <h4>October 27, 2015</h4>
   <p>Nim version 0.12.0 has been released!</p>
diff --git a/web/website.ini b/web/website.ini
index 12955717f..46564d19f 100644
--- a/web/website.ini
+++ b/web/website.ini
@@ -63,8 +63,8 @@ srcdoc2: "deprecated/pure/ftpclient"
 srcdoc2: "pure/asyncfile;pure/asyncftpclient"
 srcdoc2: "pure/md5;pure/rationals"
 srcdoc2: "posix/posix"
-srcdoc2: "pure/fenv"
-srcdoc2: "pure/basic2d;pure/basic3d"
+srcdoc2: "pure/fenv;pure/securehash"
+srcdoc2: "pure/basic2d;pure/basic3d;pure/mersenne;pure/coro"
 
 ; Note: everything under 'webdoc' doesn't get listed in the index, so wrappers
 ; should live here