Merge remote-tracking branch 'OFFICIAL/trunk' into morefresh

3 files changed, 74 insertions, 42 deletions

diff --git a/man/coqdep.1 b/man/coqdep.1
index 5a6cd609e6..81f7e1e0df 100644
--- a/man/coqdep.1
+++ b/man/coqdep.1
@@ -46,7 +46,9 @@ commands (Require, Require Export, Require Import),
 commands and
 .IR Load \&
 commands. Dependencies relative to modules from the Coq library are not
-printed.
+printed except if 
+.BR \-boot \&
+is given.
 
 Dependencies of Caml modules are computed by looking at
 .IR open \&
@@ -59,35 +61,50 @@ directives and the dot notation
 .BI \-c
 Prints the dependencies of Caml modules.
 (On Caml modules, the behaviour is exactly the same as ocamldep).
-.TP
-.BI \-w
-Prints a warning if a Coq command
-.IR Declare \& 
-.IR ML \& 
-.IR Module \&
-is incorrect. (For instance, you wrote `Declare ML Module "A".',
-but the module A contains #open "B"). The correct command is printed
-(see option \-D). The warning is printed on standard error.
-.TP
-.BI \-D
-This commands looks for every command
-.IR Declare \& 
-.IR ML \& 
-.IR Module \&
-of each Coq file given as argument and complete (if needed)
-the list of Caml modules. The new command is printed on
-the standard output. No dependency is computed with this option.
+\" THESE OPTIONS ARE BROKEN CURRENTLY
+\" .TP
+\" .BI \-w
+\" Prints a warning if a Coq command
+\" .IR Declare \& 
+\" .IR ML \& 
+\" .IR Module \&
+\" is incorrect. (For instance, you wrote `Declare ML Module "A".',
+\" but the module A contains #open "B"). The correct command is printed
+\" (see option \-D). The warning is printed on standard error.
+\" .TP
+\" .BI \-D
+\" This commands looks for every command
+\" .IR Declare \& 
+\" .IR ML \& 
+\" .IR Module \&
+\" of each Coq file given as argument and complete (if needed)
+\" the list of Caml modules. The new command is printed on
+\" the standard output. No dependency is computed with this option.
 .TP 
-.BI \-I \ directory
-The files .v .ml .mli of the directory
-.IR directory \&
-are taken into account during the calculus of dependencies,
-but their own dependencies are not printed.
+.BI \-I/\-Q/\-R \ options
+Have the same effects on load path and modules names than for other
+coq commands (coqtop, coqc).
 .TP 
 .BI \-coqlib \ directory
 Indicates where is the Coq library. The default value has been
 determined at installation time, and therefore this option should not
 be used under normal circumstances.
+.TP 
+.BI \-dumpgraph[box] \ file
+Dumps a dot dependency graph in file
+.IR file \&.
+.TP 
+.BI \-exclude-dir \ dir
+Skips subdirectory
+.IR dir \ during
+.BR -R/-Q \ search.
+.TP 
+.B \-sort
+Output the given file name ordered by dependencies.
+.TP 
+.B \-boot
+For coq developpers, prints dependencies over coq library files
+(omitted by default).
 
 
 .SH SEE ALSO
diff --git a/man/coqide.1 b/man/coqide.1
index 3fa7f0e418..f82bf2ad40 100644
--- a/man/coqide.1
+++ b/man/coqide.1
@@ -63,15 +63,17 @@ Load Coq file
 (Load Verbose
 .IR f .).
 .TP
-.BI \-load\-vernac\-object\  f
-Load Coq object file
-.IR f .vo.
-.TP
-.BI \-require\  f
-Load Coq object file
-.IR f .vo
-and import it (Require
-.IR f .).
+.BI \-load\-vernac\-object\  path
+Load Coq library
+.IR path
+(Require
+.IR path .).
+.TP
+.BI \-require\  path
+Load Coq library
+.IR path
+and import it (Require Import
+.IR path .).
 .TP
 .BI \-compile\  f
 Compile Coq file
@@ -121,6 +123,12 @@ Set sort Set impredicative.
 .TP
 .B \-dont\-load\-proofs
 Don't load opaque proofs in memory.
+.TP
+.B \-xml
+Export XML files either to the hierarchy rooted in
+the directory
+.B COQ_XML_LIBRARY_ROOT
+(if set) or to stdout (if unset).
 
 
 .SH SEE ALSO
diff --git a/man/coqtop.1 b/man/coqtop.1
index 1bc4629d0f..feee7fd8b5 100644
--- a/man/coqtop.1
+++ b/man/coqtop.1
@@ -73,18 +73,19 @@ load verbosely Coq file
 (Load Verbose filename.)
 
 .TP
-.BI \-load\-vernac\-object \ filename
-load Coq object file
-.I filename.vo
+.BI \-load\-vernac\-object \ path
+load Coq library
+.I path
+(Require path.)
 
 .TP
-.BI \-require \ filename
-load Coq object file
-.I filename.vo
-and import it (Require Import filename.)
+.BI \-require \ path
+load Coq library
+.I path
+and import it (Require Import path.)
 
 .TP
-.BI \-compile \ filename
+.BI \-compile \ filename.v
 compile Coq file
 .I filename.v 
 (implies 
@@ -92,7 +93,7 @@ compile Coq file
 )
 
 .TP
-.BI \-compile\-verbose \ filename
+.BI \-compile\-verbose \ filename.v
 verbosely compile Coq file
 .I filename.v
 (implies 
@@ -152,6 +153,12 @@ set sort Set impredicative
 .B \-dont\-load\-proofs
 don't load opaque proofs in memory
 
+.TP
+.B \-xml
+export XML files either to the hierarchy rooted in
+the directory $COQ_XML_LIBRARY_ROOT (if set) or to
+stdout (if unset)
+
 .SH SEE ALSO
 
 .BR coqc (1),