diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | compiler/docgen.nim | 2 | ||||
| -rw-r--r-- | doc/manual.rst | 18 |
3 files changed, 13 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index b4fa886b7..1e2022654 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,9 @@ script: - nim c -r nimdoc/tester before_deploy: + # Generate the dochack.js for the doc search to work. + - nim js ./tools/dochack/dochack.nim + - cp -f ./tools/dochack/nimcache/dochack.js ./doc/. # Make https://nim-lang.github.io/Nim work the same as https://nim-lang.github.io/Nim/overview.html - cp -f ./doc/html/overview.html ./doc/html/index.html deploy: diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 4e36b72e5..664f45c79 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -610,7 +610,7 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) = var seeSrcRope: Rope = nil let docItemSeeSrc = getConfigVar(d.conf, "doc.item.seesrc") if docItemSeeSrc.len > 0: - let path = relativeTo(AbsoluteFile toFullPath(d.conf, n.info), d.conf.projectPath, '/') + let path = relativeTo(AbsoluteFile toFullPath(d.conf, n.info), AbsoluteDir getCurrentDir(), '/') when false: let cwd = canonicalizePath(d.conf, getCurrentDir()) var path = toFullPath(d.conf, n.info) diff --git a/doc/manual.rst b/doc/manual.rst index 6afc10473..c898c6c55 100644 --- a/doc/manual.rst +++ b/doc/manual.rst @@ -724,7 +724,7 @@ intXX suffix ``'u`` is of this type. uintXX - additional signed integer types of XX bits use this naming scheme + additional unsigned integer types of XX bits use this naming scheme (example: uint16 is a 16 bit wide unsigned integer). The current implementation supports ``uint8``, ``uint16``, ``uint32``, ``uint64``. Literals of these types have the suffix 'uXX. @@ -5592,12 +5592,12 @@ via ``{.experimental: "caseStmtMacros".}``. ``match`` macros are subject to overload resolution. First the ``case``'s selector expression is used to determine which ``match`` -macro to call. To this macro is then the complete ``case`` statement -body is passed and the macro is evaluated. +macro to call. To this macro is then passed the complete ``case`` +statement body and the macro is evaluated. In other words, the macro needs to transform the full ``case`` statement but only the statement's selector expression is used to determine which -``macro`` to call. +macro to call. Special Types @@ -6442,12 +6442,12 @@ avoid ambiguity when there are multiple modules with the same path. There are two pseudo directories: 1. ``std``: The ``std`` pseudo directory is the abstract location of Nim's standard - library. For example, the syntax ``import std / strutils`` is used to unambiguously - refer to the standard library's ``strutils`` module. +library. For example, the syntax ``import std / strutils`` is used to unambiguously +refer to the standard library's ``strutils`` module. 2. ``pkg``: The ``pkg`` pseudo directory is used to unambiguously refer to a Nimble - package. However, for technical details that lie outside of the scope of this document - its semantics are: *Use the search path to look for module name but ignore the standard - library locations*. In other words, it is the opposite of ``std``. +package. However, for technical details that lie outside of the scope of this document +its semantics are: *Use the search path to look for module name but ignore the standard +library locations*. In other words, it is the opposite of ``std``. From import statement |