Merge branch 'master' into newkey

Conflicts:
	ranger/api/keys.py
	ranger/container/commandlist.py
	ranger/core/actions.py
	ranger/defaults/keys.py
	ranger/gui/ui.py
	ranger/gui/widgets/browserview.py

1 files changed, 27 insertions, 20 deletions

diff --git a/doc/pydoc/ranger.html b/doc/pydoc/ranger.html
index ba425b71..cba764cb 100644
--- a/doc/pydoc/ranger.html
+++ b/doc/pydoc/ranger.html
@@ -6,7 +6,7 @@
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
 <tr bgcolor="#7799ee">
 <td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>ranger</strong></big></big> (version 1.0.3)</font></td
+<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>ranger</strong></big></big> (version 1.0.4)</font></td
 ><td align=right valign=bottom
 ><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/hut/ranger/ranger/__init__.py">/home/hut/ranger/ranger/__init__.py</a></font></td></tr></table>
     <p><tt>Ranger&nbsp;-&nbsp;file&nbsp;browser&nbsp;for&nbsp;the&nbsp;unix&nbsp;terminal</tt></p>
@@ -18,51 +18,58 @@
     
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="ranger.__main__.html">__main__</a><br>
-<a href="ranger.actions.html">actions</a><br>
 <a href="ranger.api.html"><strong>api</strong>&nbsp;(package)</a><br>
-<a href="ranger.applications.html">applications</a><br>
-</td><td width="25%" valign=top><a href="ranger.colorschemes.html"><strong>colorschemes</strong>&nbsp;(package)</a><br>
-<a href="ranger.commands.html">commands</a><br>
-<a href="ranger.container.html"><strong>container</strong>&nbsp;(package)</a><br>
+<a href="ranger.colorschemes.html"><strong>colorschemes</strong>&nbsp;(package)</a><br>
+</td><td width="25%" valign=top><a href="ranger.container.html"><strong>container</strong>&nbsp;(package)</a><br>
+<a href="ranger.core.html"><strong>core</strong>&nbsp;(package)</a><br>
 <a href="ranger.defaults.html"><strong>defaults</strong>&nbsp;(package)</a><br>
 </td><td width="25%" valign=top><a href="ranger.ext.html"><strong>ext</strong>&nbsp;(package)</a><br>
-<a href="ranger.fm.html">fm</a><br>
 <a href="ranger.fsobject.html"><strong>fsobject</strong>&nbsp;(package)</a><br>
 <a href="ranger.gui.html"><strong>gui</strong>&nbsp;(package)</a><br>
 </td><td width="25%" valign=top><a href="ranger.help.html"><strong>help</strong>&nbsp;(package)</a><br>
-<a href="ranger.keyapi.html">keyapi</a><br>
-<a href="ranger.runner.html">runner</a><br>
 <a href="ranger.shared.html"><strong>shared</strong>&nbsp;(package)</a><br>
 </td></tr></table></td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#eeaa77">
+<td colspan=3 valign=bottom>&nbsp;<br>
+<font color="#ffffff" face="helvetica, arial"><big><strong>Functions</strong></big></font></td></tr>
+    
+<tr><td bgcolor="#eeaa77"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
+<td width="100%"><dl><dt><a name="-log"><strong>log</strong></a>(*objects, **keywords)</dt><dd><tt>Writes&nbsp;objects&nbsp;to&nbsp;a&nbsp;logfile&nbsp;(for&nbsp;the&nbsp;purpose&nbsp;of&nbsp;debugging&nbsp;only.)<br>
+Has&nbsp;the&nbsp;same&nbsp;arguments&nbsp;as&nbsp;print()&nbsp;in&nbsp;python3.</tt></dd></dl>
+ <dl><dt><a name="-relpath"><strong>relpath</strong></a>(*paths)</dt><dd><tt>returns&nbsp;the&nbsp;path&nbsp;relative&nbsp;to&nbsp;rangers&nbsp;library&nbsp;directory</tt></dd></dl>
+ <dl><dt><a name="-relpath_conf"><strong>relpath_conf</strong></a>(*paths)</dt><dd><tt>returns&nbsp;the&nbsp;path&nbsp;relative&nbsp;to&nbsp;rangers&nbsp;configuration&nbsp;directory</tt></dd></dl>
+</td></tr></table><p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#55aa55">
 <td colspan=3 valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
     
 <tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><strong>CONFDIR</strong> = '/home/hut/.ranger'<br>
+<td width="100%"><strong>DEFAULT_CONFDIR</strong> = '~/.ranger'<br>
+<strong>LOGFILE</strong> = '/tmp/errorlog'<br>
 <strong>RANGERDIR</strong> = '/home/hut/ranger/ranger'<br>
 <strong>USAGE</strong> = '%prog [options] [path/filename]'<br>
-<strong>__author__</strong> = 'hut'<br>
-<strong>__copyright__</strong> = 'none'<br>
-<strong>__credits__</strong> = 'hut'<br>
-<strong>__email__</strong> = 'hut@lavabit.com'<br>
-<strong>__license__</strong> = 'ISC'<br>
-<strong>__maintainer__</strong> = 'hut'<br>
-<strong>__version__</strong> = '1.0.3'<br>
-<strong>debug</strong> = False</td></tr></table><p>
+<strong>__author__</strong> = 'Roman Zimbelmann'<br>
+<strong>__copyright__</strong> = '<font color="#c040c0">\n</font>Copyright (C) 2009, 2010  Roman Zimbelmann &lt;romanz@lavabit.com&gt;<font color="#c040c0">\n</font>'<br>
+<strong>__credits__</strong> = 'Roman Zimbelmann'<br>
+<strong>__email__</strong> = 'romanz@lavabit.com'<br>
+<strong>__license__</strong> = 'GPL3'<br>
+<strong>__maintainer__</strong> = 'Roman Zimbelmann'<br>
+<strong>__version__</strong> = '1.0.4'<br>
+<strong>arg</strong> = {'cd_after_exit': False, 'debug': False, 'flags'...n': False, 'confdir': '~/.ranger', 'targets': []}</td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#7799ee">
 <td colspan=3 valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial"><big><strong>Author</strong></big></font></td></tr>
     
 <tr><td bgcolor="#7799ee"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%">hut</td></tr></table><p>
+<td width="100%">Roman&nbsp;Zimbelmann</td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#7799ee">
 <td colspan=3 valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial"><big><strong>Credits</strong></big></font></td></tr>
     
 <tr><td bgcolor="#7799ee"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%">hut</td></tr></table>
+<td width="100%">Roman&nbsp;Zimbelmann</td></tr></table>
 </body></html>
\ No newline at end of file