aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2015-09-25 14:19:25 +0200
committerPierre-Marie Pédrot2015-09-25 14:19:25 +0200
commitccd23fa241ab11477b2fec48ba5262206a1134d5 (patch)
treed864a4ad99f869b03c2c08650029e03fa1400c32 /doc
parent8a031dc29abf1e16b2ee78322a7221b8b5c19a33 (diff)
parent8e25e107a8715728a7227934d7b11035863ee5f0 (diff)
Merge branch 'v8.5'
Diffstat (limited to 'doc')
-rw-r--r--doc/refman/RefMan-com.tex10
-rw-r--r--doc/tutorial/Tutorial.tex2
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/refman/RefMan-com.tex b/doc/refman/RefMan-com.tex
index 6335dfd324..0f1823a021 100644
--- a/doc/refman/RefMan-com.tex
+++ b/doc/refman/RefMan-com.tex
@@ -157,16 +157,16 @@ Add physical path {\em directory} to the {\ocaml} loadpath.
Load \Coq~compiled file {\em file}{\tt .vo}
-\item[{\tt -require} {\em file}]\
+\item[{\tt -require} {\em path}]\
- Load \Coq~compiled file {\em file}{\tt .vo} and import it ({\tt
- Require} {\em file}).
+ Load \Coq~compiled library {\em path} and import it (equivalent to {\tt
+ Require Import} {\em path}).
-\item[{\tt -compile} {\em file},{\tt -compile-verbose} {\em file}, {\tt -batch}]\
+\item[{\tt -compile} {\em file.v},{\tt -compile-verbose} {\em file.v}, {\tt -batch}]\
{\tt coqtop} options only used internally by {\tt coqc}.
- This compiles file {\em file}{\tt .v} into {\em file}{\tt .vo} without/with a
+ This compiles file {\em file.v} into {\em file}{\tt .vo} without/with a
copy of the contents of the file on standard input. This option implies options
{\tt -batch} (exit just after arguments parsing). It is only
available for {\tt coqtop}.
diff --git a/doc/tutorial/Tutorial.tex b/doc/tutorial/Tutorial.tex
index 836944ab1c..e09feeb8eb 100644
--- a/doc/tutorial/Tutorial.tex
+++ b/doc/tutorial/Tutorial.tex
@@ -208,7 +208,7 @@ Definition two : nat := S one.
Actually \Coq~ allows several possible syntaxes:
\begin{coq_example}
-Definition three : nat := S two.
+Definition three := S two : nat.
\end{coq_example}
Here is a way to define the doubling function, which expects an