Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
PhilipWitte
2015-02-13 11:39:28 -08:00
105 changed files with 1902 additions and 1535 deletions

View File

@@ -319,7 +319,7 @@ proc buildAddDoc(c: var TConfigData, destPath: string) =
# build additional documentation (without the index):
var commands = newSeq[string](c.webdoc.len)
for i, doc in pairs(c.webdoc):
commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# $#" %
commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$#/$# -o:$# $#" %
[c.nimArgs, c.gitRepo, c.gitCommit, doc.pathPart,
destPath / changeFileExt(splitFile(doc).name, "html"), doc]
mexec(commands, c.numProcessors)