jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Andreas Rumpf 2016-01-19 09:42:19 +01:00
commit 38da317e5d
4 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/lexing.txt
View file

@ -88,7 +88,7 @@ Multiline comments support nesting:
proc p[T](x: T) = discard proc p[T](x: T) = discard
]# ]#
Multiline documentation comments look like and support nesting too: Multiline documentation comments also exist and support nesting too:
.. code-block:: nim .. code-block:: nim
proc foo = proc foo =

5
web/download.txt
View file

@ -24,10 +24,9 @@ This installation method is the preferred way for Linux, Mac OS X, and other Uni
like systems. Binary packages may be provided later. like systems. Binary packages may be provided later.
Download one of these: Download this:
* `nim-0.13.0.zip (28 MB) <download/nim-0.13.0.zip>`_ * `nim-0.13.0.tar.xz (3.1MB) <download/nim-0.13.0.tar.xz>`_
* `nim-0.13.0.tar.xz (2.6MB) <download/nim-0.13.0.tar.xz>`_
Extract the file and follow these instructions: Extract the file and follow these instructions:

2
web/news.txt
View file

@ -70,7 +70,7 @@ code like ``0..kArraySize div 2 -1`` needs to be changed to
This release also adds multi-line comments to Nim. The syntax for them is: This release also adds multi-line comments to Nim. The syntax for them is:
``#[ comment here ]#``. For more details read the section of ``#[ comment here ]#``. For more details read the section of
the `manual <manual#multiline-comments>`_. the `manual <docs/manual.html#lexical-analysis-multiline-comments>`_.
Iterator changes Iterator changes
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~

5
web/ticker.txt
View file

@ -18,9 +18,4 @@
<p>First official Nim conference will be in Kyiv!</p> <p>First official Nim conference will be in Kyiv!</p>
</a> </a>
<a class="news" href="news.html#Z2015-05-04-version-0-11-2-released">
<h4>May 4, 2015</h4>
<p>Nim version 0.11.2 has been released!</p>
</a>
<a href="news.html" class="blue">See All News...</a> <a href="news.html" class="blue">See All News...</a>