summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2014-12-29 23:34:15 +0100
committerAraq <rumpf_a@web.de>2014-12-29 23:34:15 +0100
commit4a6565f8c2d958f30c8504abf725eef2e69250c0 (patch)
treea232f6e440b0f066d0b275d809f67c4a7ab2385d
parentf380d2548aefc53b817385b874cee51e21950c3a (diff)
parent6d749aed291dbe27a42fef25550460cbd2fe6990 (diff)
downloadNim-4a6565f8c2d958f30c8504abf725eef2e69250c0.tar.gz
Merge branch 'devel' of https://github.com/Araq/Nim into devel
-rw-r--r--tools/niminst/niminst.nim4
-rw-r--r--web/news.txt3
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim
index 9ee3eb9b9..fe1b9a192 100644
--- a/tools/niminst/niminst.nim
+++ b/tools/niminst/niminst.nim
@@ -522,8 +522,8 @@ proc setupDist2(c: var TConfigData) =
 # ------------------ generate ZIP file ---------------------------------------
 when haveZipLib:
   proc zipDist(c: var TConfigData) =
-    var proj = toLower(c.name)
-    var n = "$#_$#.zip" % [proj, c.version]
+    var proj = toLower(c.name) & "-" & c.version
+    var n = "$#.zip" % proj
     if c.outdir.len == 0: n = "build" / n
     else: n = c.outdir / n
     var z: TZipArchive
diff --git a/web/news.txt b/web/news.txt
index ddeab0f9b..cca2aaeee 100644
--- a/web/news.txt
+++ b/web/news.txt
@@ -28,7 +28,7 @@ for lightweight threading through the use of ``spawn``.
 
 The unpopular "T" and "P" prefixes on types have been deprecated. Nim also
 became more expressive by weakening the distinction between statements and
-epxressions. We also added a new and searchable forum, a new website, and our
+expressions. We also added a new and searchable forum, a new website, and our
 documentation generator ``docgen`` has seen major improvements.
 
 What's left to be done
@@ -194,7 +194,6 @@ Bugfixes
 - Fixed queue exhaustion bug.
 - Many, many more.
 
-
 2014-12-09 New website design!
 ==============================