summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbcpierce00 <bcpierce00@users.noreply.github.com>2016-12-09 11:28:47 -0500
committerGitHub <noreply@github.com>2016-12-09 11:28:47 -0500
commit89914e4de5b621a6f808fdd9b33249e7cd893a7f (patch)
treedca8cba1531555cb3231711844a4ce67c7fa4940 /src
parentaf02bc9f417a9acbc972583f5e662f8485353632 (diff)
parent33eecdb525e3a386328bae4f419ab06abdff7191 (diff)
downloadunison-89914e4de5b621a6f808fdd9b33249e7cd893a7f.zip
unison-89914e4de5b621a6f808fdd9b33249e7cd893a7f.tar.gz
unison-89914e4de5b621a6f808fdd9b33249e7cd893a7f.tar.bz2
Merge pull request #50 from esiegerman/eks/doc-fixes
Eks/doc fixes
Diffstat (limited to 'src')
-rw-r--r--src/globals.ml2
-rw-r--r--src/update.ml4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/globals.ml b/src/globals.ml
index 231395c..eb5b057 100644
--- a/src/globals.ml
+++ b/src/globals.ml
@@ -282,7 +282,7 @@ let merge =
^ "The syntax of \\ARG{pathspec>cmd} is "
^ "described in \\sectionref{pathspec}{Path Specification}, and further "
^ "details on Merging functions are present in "
- ^ "\\sectionref{merge}{Merging files}.")
+ ^ "\\sectionref{merge}{Merging Conflicting Versions}.")
let shouldMerge p = Pred.test merge (Path.toString p)
diff --git a/src/update.ml b/src/update.ml
index c8f90e1..6b8f9cd 100644
--- a/src/update.ml
+++ b/src/update.ml
@@ -1063,7 +1063,7 @@ let mountpoints =
^ "double-check, at the end of update detection, that \\texttt{PATH} exists "
^ "and abort if it does not. This is useful when Unison is used to synchronize "
^ "removable media. This preference can be given more than once. "
- ^ "See \\sectionref{mountpoints}{Mount Points}.")
+ ^ "See \\sectionref{mountpoints}{Mount Points and Removable Media}.")
let abortIfAnyMountpointsAreMissing fspath =
Safelist.iter
@@ -1166,7 +1166,7 @@ let fastcheck =
For backward compatibility, \
\\verb|yes|, \\verb|no|, and \\verb|default| can be used in place \
of \\verb|true|, \\verb|false|, and \\verb|auto|. See \
- \\sectionref{fastcheck}{Fast Checking} for more information.")
+ \\sectionref{fastcheck}{Fast Update Detection} for more information.")
let useFastChecking () =
Prefs.read fastcheck = `True