summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2016-01-19 09:42:19 +0100
committerAndreas Rumpf <rumpf_a@web.de>2016-01-19 09:42:19 +0100
commit38da317e5d40ae2225a18945c5c4a3f3b617390b (patch)
tree2e912855328e25476dce263d40efa04f74baf626
parent2dfefc200b7ccf9fad4ff5dcc4dce3bf2efc7845 (diff)
parent91adc84cf3cebe9f14d84aea639e46bae4b3a5dc (diff)
downloadNim-38da317e5d40ae2225a18945c5c4a3f3b617390b.tar.gz
Merge branch 'devel' of https://github.com/nim-lang/Nim into devel
-rw-r--r--doc/manual/lexing.txt2
-rw-r--r--web/download.txt5
-rw-r--r--web/news.txt2
-rw-r--r--web/ticker.txt5
4 files changed, 4 insertions, 10 deletions
diff --git a/doc/manual/lexing.txt b/doc/manual/lexing.txt
index 5990dff07..4187a60a4 100644
--- a/doc/manual/lexing.txt
+++ b/doc/manual/lexing.txt
@@ -88,7 +88,7 @@ Multiline comments support nesting:
   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
   proc foo =
diff --git a/web/download.txt b/web/download.txt
index fdb9b768a..cffad4ac9 100644
--- a/web/download.txt
+++ b/web/download.txt
@@ -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.
 
 
-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 (2.6MB) <download/nim-0.13.0.tar.xz>`_
+* `nim-0.13.0.tar.xz (3.1MB) <download/nim-0.13.0.tar.xz>`_
 
 Extract the file and follow these instructions:
 
diff --git a/web/news.txt b/web/news.txt
index ba053689c..62c3cef24 100644
--- a/web/news.txt
+++ b/web/news.txt
@@ -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:
 ``#[ 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
 ~~~~~~~~~~~~~~~~
diff --git a/web/ticker.txt b/web/ticker.txt
index f4a3cac2a..1f9bd3e97 100644
--- a/web/ticker.txt
+++ b/web/ticker.txt
@@ -18,9 +18,4 @@
   <p>First official Nim conference will be in Kyiv!</p>
 </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>