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

22 files changed, 21 insertions, 21 deletions

diff --git a/doc/docgen.txt b/doc/docgen.rst
index 40c464ebd..40c464ebd 100644
--- a/doc/docgen.txt
+++ b/doc/docgen.rst
diff --git a/doc/endb.txt b/doc/endb.rst
index 6757d98e3..6757d98e3 100644
--- a/doc/endb.txt
+++ b/doc/endb.rst
diff --git a/doc/estp.txt b/doc/estp.rst
index 805a84eb7..805a84eb7 100644
--- a/doc/estp.txt
+++ b/doc/estp.rst
diff --git a/doc/filters.txt b/doc/filters.rst
index 1937b187c..1937b187c 100644
--- a/doc/filters.txt
+++ b/doc/filters.rst
diff --git a/doc/gc.txt b/doc/gc.rst
index 1c8cb9122..1c8cb9122 100644
--- a/doc/gc.txt
+++ b/doc/gc.rst
diff --git a/doc/idetools.txt b/doc/idetools.rst
index 2ffe46d4b..2ffe46d4b 100644
--- a/doc/idetools.txt
+++ b/doc/idetools.rst
diff --git a/doc/koch.txt b/doc/koch.rst
index a58d386ea..a58d386ea 100644
--- a/doc/koch.txt
+++ b/doc/koch.rst
diff --git a/doc/lib.txt b/doc/lib.rst
index f749763a5..f749763a5 100644
--- a/doc/lib.txt
+++ b/doc/lib.rst
diff --git a/doc/manual.txt b/doc/manual.rst
index 2dbbf0447..2dbbf0447 100644
--- a/doc/manual.txt
+++ b/doc/manual.rst
diff --git a/doc/nep1.txt b/doc/nep1.rst
index b4bd6309c..b4bd6309c 100644
--- a/doc/nep1.txt
+++ b/doc/nep1.rst
diff --git a/doc/nimc.txt b/doc/nimc.rst
index 48dbaeb21..48dbaeb21 100644
--- a/doc/nimc.txt
+++ b/doc/nimc.rst
diff --git a/doc/nimfix.txt b/doc/nimfix.rst
index 62064fe69..62064fe69 100644
--- a/doc/nimfix.txt
+++ b/doc/nimfix.rst
diff --git a/doc/nimgrep.txt b/doc/nimgrep.rst
index 791ead162..791ead162 100644
--- a/doc/nimgrep.txt
+++ b/doc/nimgrep.rst
diff --git a/doc/niminst.txt b/doc/niminst.rst
index bf5cb0f50..bf5cb0f50 100644
--- a/doc/niminst.txt
+++ b/doc/niminst.rst
diff --git a/doc/nims.txt b/doc/nims.rst
index 7c76efe42..7c76efe42 100644
--- a/doc/nims.txt
+++ b/doc/nims.rst
diff --git a/doc/nimsuggest.txt b/doc/nimsuggest.rst
index 2b52196b9..2b52196b9 100644
--- a/doc/nimsuggest.txt
+++ b/doc/nimsuggest.rst
diff --git a/doc/tut1.txt b/doc/tut1.rst
index d896a7044..d896a7044 100644
--- a/doc/tut1.txt
+++ b/doc/tut1.rst
diff --git a/doc/tut2.txt b/doc/tut2.rst
index 3f94325ff..3f94325ff 100644
--- a/doc/tut2.txt
+++ b/doc/tut2.rst
diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index ce2e5a502..fd69bebdd 100644
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
@@ -288,18 +288,18 @@ proc buildDoc(c: var TConfigData, destPath: string) =
     commands = newSeq[string](len(c.doc) + len(c.srcdoc) + len(c.srcdoc2))
     i = 0
   for d in items(c.doc):
-    commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" %
-      [c.nimArgs, c.gitRepo, c.gitCommit,
+    commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
+      [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
       destPath / changeFileExt(splitFile(d).name, "html"), d]
     i.inc
   for d in items(c.srcdoc):
-    commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" %
-      [c.nimArgs, c.gitRepo, c.gitCommit,
+    commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
+      [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
       destPath / changeFileExt(splitFile(d).name, "html"), d]
     i.inc
   for d in items(c.srcdoc2):
-    commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" %
-      [c.nimArgs, c.gitRepo, c.gitCommit,
+    commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
+      [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
       destPath / changeFileExt(splitFile(d).name, "html"), d]
     i.inc
 
diff --git a/web/download.rst b/web/download.rst
index b7d4cbd02..5bebe66ab 100644
--- a/web/download.rst
+++ b/web/download.rst
@@ -8,18 +8,18 @@ Windows we recommend that you use
 `Mingw-w64 <http://mingw-w64.sourceforge.net/>`_. GCC is recommended on Linux
 and Clang on Mac.
 
-..
-  Binaries
-  --------
 
-  Unfortunately, right now we only provide binaries for Windows. You can download
-  an installer for both 32 bit and 64 bit versions of Windows below.
+Binaries
+--------
 
-  * 32 bit: `nim-0.14.0_x32.exe <download/nim-0.14.0_x32.exe>`_
-  * 64 bit: `nim-0.14.0_x64.exe <download/nim-0.14.0_x64.exe>`_
+Unfortunately, right now we only provide binaries for Windows. You can download
+an installer for both 32 bit and 64 bit versions of Windows below.
 
-  These installers also include Aporia, Nimble and other useful Nim tools to get
-  you started with Nim development!
+* 32 bit: `nim-0.14.0_x32.exe <download/nim-0.14.0_x32.exe>`_
+* 64 bit: `nim-0.14.0_x64.exe <download/nim-0.14.0_x64.exe>`_
+
+These installers also include Aporia, Nimble and other useful Nim tools to get
+you started with Nim development!
 
 Installation based on generated C code
 --------------------------------------
diff --git a/web/news/2016_06_07_version_0_14_0_released.rst b/web/news/2016_06_07_version_0_14_0_released.rst
index 32bf4d137..f705363a5 100644
--- a/web/news/2016_06_07_version_0_14_0_released.rst
+++ b/web/news/2016_06_07_version_0_14_0_released.rst
@@ -166,9 +166,9 @@ Language Additions
 ------------------
 
 - Nim now supports a ``.this`` pragma for more notational convenience.
-  See `manual.html#overloading-resolution-automatic-self-insertions`_ for more information.
+  See `automatic-self-insertions <../docs/manual.html#overloading-resolution-automatic-self-insertions>`_ for more information.
 - Nim now supports a different ``using`` statement for more convenience.
-  Consult `manual.html#statements-and-expressions-using-statement`_ for more information.
+  Consult `using-statement <../docs/manual.html#statements-and-expressions-using-statement>`_ for more information.
 - ``include`` statements are not restricted to top level statements anymore.
 
 ..
diff --git a/web/website.ini b/web/website.ini
index 38bf22e2c..6cf2bef94 100644
--- a/web/website.ini
+++ b/web/website.ini
@@ -29,10 +29,10 @@ news: news
 file: ticker.html
 
 [Documentation]
-doc: "endb;intern;apis;lib;manual.txt;tut1;tut2;nimc;overview;filters"
-doc: "tools;niminst;nimgrep;gc;estp;idetools;docgen;koch;backends.txt"
-doc: "nimfix.txt;nimsuggest.txt;nep1.txt;nims.txt"
-pdf: "manual.txt;lib;tut1;tut2;nimc;niminst;gc"
+doc: "endb;intern;apis;lib;manual.rst;tut1.rst;tut2.rst;nimc;overview;filters"
+doc: "tools;niminst;nimgrep;gc;estp;idetools;docgen;koch;backends.rst"
+doc: "nimfix.rst;nimsuggest.rst;nep1.rst;nims.rst"
+pdf: "manual.rst;lib.rst;tut1.rst;tut2.rst;nimc.rst;niminst.rst;gc.rst"
 srcdoc2: "system.nim;system/nimscript;pure/ospaths"
 srcdoc2: "core/macros;pure/marshal;core/typeinfo"
 srcdoc2: "impure/re;impure/nre;pure/typetraits"