diff --git a/doc/docgen.txt b/doc/docgen.rst similarity index 100% rename from doc/docgen.txt rename to doc/docgen.rst diff --git a/doc/endb.txt b/doc/endb.rst similarity index 100% rename from doc/endb.txt rename to doc/endb.rst diff --git a/doc/estp.txt b/doc/estp.rst similarity index 100% rename from doc/estp.txt rename to doc/estp.rst diff --git a/doc/filters.txt b/doc/filters.rst similarity index 100% rename from doc/filters.txt rename to doc/filters.rst diff --git a/doc/gc.txt b/doc/gc.rst similarity index 100% rename from doc/gc.txt rename to doc/gc.rst diff --git a/doc/idetools.txt b/doc/idetools.rst similarity index 100% rename from doc/idetools.txt rename to doc/idetools.rst diff --git a/doc/koch.txt b/doc/koch.rst similarity index 100% rename from doc/koch.txt rename to doc/koch.rst diff --git a/doc/lib.txt b/doc/lib.rst similarity index 100% rename from doc/lib.txt rename to doc/lib.rst diff --git a/doc/manual.txt b/doc/manual.rst similarity index 100% rename from doc/manual.txt rename to doc/manual.rst diff --git a/doc/nep1.txt b/doc/nep1.rst similarity index 100% rename from doc/nep1.txt rename to doc/nep1.rst diff --git a/doc/nimc.txt b/doc/nimc.rst similarity index 100% rename from doc/nimc.txt rename to doc/nimc.rst diff --git a/doc/nimfix.txt b/doc/nimfix.rst similarity index 100% rename from doc/nimfix.txt rename to doc/nimfix.rst diff --git a/doc/nimgrep.txt b/doc/nimgrep.rst similarity index 100% rename from doc/nimgrep.txt rename to doc/nimgrep.rst diff --git a/doc/niminst.txt b/doc/niminst.rst similarity index 100% rename from doc/niminst.txt rename to doc/niminst.rst diff --git a/doc/nims.txt b/doc/nims.rst similarity index 100% rename from doc/nims.txt rename to doc/nims.rst diff --git a/doc/nimsuggest.txt b/doc/nimsuggest.rst similarity index 100% rename from doc/nimsuggest.txt rename to doc/nimsuggest.rst diff --git a/doc/tut1.txt b/doc/tut1.rst similarity index 100% rename from doc/tut1.txt rename to doc/tut1.rst diff --git a/doc/tut2.txt b/doc/tut2.rst similarity index 100% rename from doc/tut2.txt rename to doc/tut2.rst diff --git a/tools/nimweb.nim b/tools/nimweb.nim index ce2e5a5022..fd69bebdd6 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 b7d4cbd025..5bebe66abb 100644 --- a/web/download.rst +++ b/web/download.rst @@ -8,18 +8,18 @@ Windows we recommend that you use `Mingw-w64 `_. 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 `_ - * 64 bit: `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 `_ +* 64 bit: `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 32bf4d1374..f705363a55 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 38bf22e2c0..6cf2bef94b 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"