diff options
author | Dominik Picheta <dominikpicheta@gmail.com> | 2016-06-07 09:47:06 +0100 |
---|---|---|
committer | Dominik Picheta <dominikpicheta@gmail.com> | 2016-06-07 09:47:06 +0100 |
commit | e728057a62850f649132e5a07b4dddd48a34472e (patch) | |
tree | 12a4df0a96caa96de35bb90ff8220827183b2bca /web | |
parent | a66dea4c754cae0ce8617c569d1b82448eb6dc5d (diff) | |
parent | e5ac785f7b1df17ae01c6af547b58afe56c352ed (diff) | |
download | Nim-e728057a62850f649132e5a07b4dddd48a34472e.tar.gz |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'web')
-rw-r--r-- | web/download.rst | 18 | ||||
-rw-r--r-- | web/news/2016_06_07_version_0_14_0_released.rst | 4 | ||||
-rw-r--r-- | web/website.ini | 8 |
3 files changed, 15 insertions, 15 deletions
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" |