about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--doc/ranger.18
-rw-r--r--doc/ranger.pod4
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1
index 3521d762..d0ed2e7b 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.9.2" "2019-10-02" "ranger manual"
+.TH RANGER 1 "ranger-1.9.2" "2019-12-22" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -620,6 +620,10 @@ also \*(L"da\*(R", \*(L"dr\*(R" and \*(L"dt\*(R" shortcuts equivalent to \*(L"ya
 .IX Item "pp"
 Paste the files which were previously copied or cut, like pressing Ctrl+V in
 modern \s-1GUI\s0 programs.
+.Sp
+Conflicts will be renamed by appending an '_' (and a counter if necessary),
+resulting in \fIfile.ext_\fR, \fIfile.ext_0\fR, etc. If you prefer \fIfile_.ext\fR you
+can use the \f(CW\*(C`paste_ext\*(C'\fR command.
 .IP "po" 14
 .IX Item "po"
 Paste the copied/cut files, overwriting existing files.
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 260ab3e3..53f4933c 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -542,8 +542,8 @@ Paste the files which were previously copied or cut, like pressing Ctrl+V in
 modern GUI programs.
 
 Conflicts will be renamed by appending an '_' (and a counter if necessary),
-resulting in F<file.ext_>. If you prefer F<file_.ext> you can use the
-I<paste_ext> command from F<commands.py>.
+resulting in F<file.ext_>, F<file.ext_0>, etc. If you prefer F<file_.ext> you
+can use the C<paste_ext> command.
 
 =item po