summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@googlemail.com>2015-02-24 17:57:18 +0000
committerDominik Picheta <dominikpicheta@googlemail.com>2015-02-24 17:57:18 +0000
commitfcce536ea0b45d274f928432c8d9542fb485fef0 (patch)
tree60d75faba6aef55ae162a7f49bd4c959320d1a1c
parentdeb3729cb7a6960b4a0a095d2a771df99e52d1a8 (diff)
parentd63e8e5d11d4bad01f2d3c3e823cf229da39d252 (diff)
downloadNim-fcce536ea0b45d274f928432c8d9542fb485fef0.tar.gz
Merge pull request #2209 from jochenvdv/fix-typo
Fix typos in docs
-rw-r--r--doc/gc.txt4
-rw-r--r--doc/manual/typedesc.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/gc.txt b/doc/gc.txt
index ac8d46cfa..f51421bcd 100644
--- a/doc/gc.txt
+++ b/doc/gc.txt
@@ -87,14 +87,14 @@ is triggered.
 Time measurement
 ----------------
 
-The GC's way of measing time uses (see ``lib/system/timers.nim`` for the 
+The GC's way of measuring time uses (see ``lib/system/timers.nim`` for the 
 implementation):
 
 1) ``QueryPerformanceCounter`` and ``QueryPerformanceFrequency`` on Windows.
 2) ``mach_absolute_time`` on Mac OS X.
 3) ``gettimeofday`` on Posix systems.
 
-As such it supports a resolution of nano seconds internally; however the API
+As such it supports a resolution of nanoseconds internally; however the API
 uses microseconds for convenience. 
 
 
diff --git a/doc/manual/typedesc.txt b/doc/manual/typedesc.txt
index 97ab18b56..5087c1204 100644
--- a/doc/manual/typedesc.txt
+++ b/doc/manual/typedesc.txt
@@ -25,7 +25,7 @@ For the purposes of code generation, all static params are treated as
 generic params - the proc will be compiled separately for each unique
 supplied value (or combination of values). 
 
-Furthermore, the system module defines a `semistatic[T]` type than can be
+Furthermore, the system module defines a `semistatic[T]` type that can be
 used to declare procs accepting both static and run-time values, which can
 optimize their body according to the supplied param using the `isStatic(p)`
 predicate: