Merge branch 'devel' of https://github.com/Araq/Nim into devel

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

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!
 ==============================