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

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 $#" %
+    commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
-      [c.nimArgs, c.gitRepo, c.gitCommit,
+      [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 $#" %
+    commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
-      [c.nimArgs, c.gitRepo, c.gitCommit,
+      [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 $#" %
+    commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" %
-      [c.nimArgs, c.gitRepo, c.gitCommit,
+      [c.nimArgs, c.gitRepo, c.gitCommit, d.pathPart,
       destPath / changeFileExt(splitFile(d).name, "html"), d]
     i.inc
 

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
+Binaries
-  an installer for both 32 bit and 64 bit versions of Windows below.
+--------
 
-  * 32 bit: `nim-0.14.0_x32.exe <download/nim-0.14.0_x32.exe>`_
+Unfortunately, right now we only provide binaries for Windows. You can download
-  * 64 bit: `nim-0.14.0_x64.exe <download/nim-0.14.0_x64.exe>`_
+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
+* 32 bit: `nim-0.14.0_x32.exe <download/nim-0.14.0_x32.exe>`_
-  you started with Nim development!
+* 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
 --------------------------------------

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.
 
 ..

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: "endb;intern;apis;lib;manual.rst;tut1.rst;tut2.rst;nimc;overview;filters"
-doc: "tools;niminst;nimgrep;gc;estp;idetools;docgen;koch;backends.txt"
+doc: "tools;niminst;nimgrep;gc;estp;idetools;docgen;koch;backends.rst"
-doc: "nimfix.txt;nimsuggest.txt;nep1.txt;nims.txt"
+doc: "nimfix.rst;nimsuggest.rst;nep1.rst;nims.rst"
-pdf: "manual.txt;lib;tut1;tut2;nimc;niminst;gc"
+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"