Merge branch 'master' of github.com:Araq/Nimrod

2 files changed, 11 insertions, 2 deletions

diff --git a/doc/advopt.txt b/doc/advopt.txt
index 1022a9136..c7dee653f 100755
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@@ -14,9 +14,10 @@ Advanced commands:
     --track:FILE,LINE,COL   track a file/cursor position
     --suggest               suggest all possible symbols at position
     --def                   list all possible symbols at position
-    --context               list possible invokation context  
+    --context               list possible invokation context
 
 Advanced options:
+  -m, --mainmodule:FILE     set the project main module
   -o, --out:FILE            set the output filename
   --stdout                  output to stdout
   -w, --warnings:on|off     turn all warnings on|off
@@ -25,6 +26,8 @@ Advanced options:
   --hint[X]:on|off          turn specific hint X on|off
   --recursivePath:PATH      add a path and all of its subdirectories
   --lib:PATH                set the system library path
+  --import:PATH             add an automatically imported module
+  --include:PATH            add an automatically included module
   --nimcache:PATH           set the path used for generated files
   -c, --compileOnly         compile only; do not assemble or link
   --noLinking               compile but do not link
@@ -37,6 +40,10 @@ Advanced options:
   --debugger:on|off         turn Embedded Nimrod Debugger on|off
   -t, --passc:OPTION        pass an option to the C compiler
   -l, --passl:OPTION        pass an option to the linker
+  --cincludes:DIR           modify the C compiler header search path
+  --clibdir:DIR             modify the linker library search path
+  --clib:LIBNAME            link an additional C library
+                            (you should omit platform-specific extensions)
   --genMapping              generate a mapping file containing
                             (Nimrod, mangled) identifier pairs
   --lineDir:on|off          generation of #line directive on|off
@@ -46,6 +53,7 @@ Advanced options:
   --symbolFiles:on|off      turn symbol files on|off (experimental)
   --skipCfg                 do not read the general configuration file
   --skipProjCfg             do not read the project's configuration file
+  --skipUserCfg             do not read the user's configuration file
   --gc:refc|boehm|none      use Nimrod's native GC|Boehm GC|no GC
   --index:FILE              use FILE to generate a documentation index file
   --putenv:key=value        set an environment variable
diff --git a/doc/basicopt.txt b/doc/basicopt.txt
index dd9e50ec2..b7bb77f75 100755
--- a/doc/basicopt.txt
+++ b/doc/basicopt.txt
@@ -28,7 +28,8 @@ Options:
   --infChecks:on|off        turn Inf checks on|off
   --deadCodeElim:on|off     whole program dead code elimination on|off
   --opt:none|speed|size     optimize not at all or for speed|size
-  --app:console|gui|lib     generate a console|GUI application|dynamic library
+  --app:console|gui|lib|staticlib
+                            generate a console app|GUI app|DLL|static library
   -r, --run                 run the compiled program with given arguments
   --advanced                show advanced command line switches
   -h, --help                show this help