From 65f95287d42869952e3bc0ae9ffefa94221f7faa Mon Sep 17 00:00:00 2001
From: Christian Zangl <laktak@cdak.net>
Date: Fri, 19 Jul 2019 23:21:30 +0200
Subject: fix docs

---
 doc/ranger.pod | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ranger.pod b/doc/ranger.pod
index 3a98df86..55944cdd 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -527,8 +527,9 @@ also "da", "dr" and "dt" shortcuts equivalent to "ya", "yr" and "yt".)
 Paste the files which were previously copied or cut, like pressing Ctrl+V in
 modern GUI programs.
 
-Conflicts will be renamed by appending an _ to the full file name. To change
-this and insert a _ before the file extension see commands.py.
+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>.
 
 =item po
 
-- 
cgit 1.4.1-2-gfad0


</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Soul of a tiny new machine. More thorough tests → More comprehensible and rewrite-friendly software → More resilient society.</td><td class='sub right'>Kartik K. Agaram &lt;vc@akkartik.com&gt;</td></tr></table>
<table class='tabs'><tr><td>
<a href='/akkartik/mu/about/?h=hlt'>about</a> <a href='/akkartik/mu/?h=hlt'>summary</a> <a href='/akkartik/mu/refs/?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>refs</a> <a href='/akkartik/mu/log/clean?h=hlt'>log</a> <a class='active' href='/akkartik/mu/tree/clean?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>tree</a> <a href='/akkartik/mu/commit/clean?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>commit</a> <a href='/akkartik/mu/diff/clean?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>diff</a> <a href='/akkartik/mu/stats/clean?h=hlt'>stats</a></td><td class='form'><form class='right' method='get' action='/akkartik/mu/log/clean'>
<input type='hidden' name='h' value='hlt'/><input type='hidden' name='id' value='d796318101775f9150af5d5f3bca61cdf31c41fa'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/akkartik/mu/tree/?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>root</a>/<a href='/akkartik/mu/tree/clean?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>clean</a></div><div class='content'>blob: 7a0eda83b831b60b254b07b46b96b866fd3ad7c9 (<a href='/akkartik/mu/plain/clean?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>plain</a>) (<a href='/akkartik/mu/blame/clean?h=hlt&amp;id=d796318101775f9150af5d5f3bca61cdf31c41fa'>blame</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
</pre></td>
<td class='lines'><pre><code>