Updated docs from master

This commit is contained in:
Manuel Ebert 2013-11-24 15:53:46 -08:00
parent 718aa11bb6
commit 936c54e70c
39 changed files with 85 additions and 61 deletions

View file

@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Basic Usage &mdash; jrnl 1.6.4 documentation</title>
<title>Basic Usage &mdash; jrnl 1.6.5 documentation</title>
<link rel="stylesheet" href="_static/css/jrnl.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -15,7 +15,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.6.4',
VERSION: '1.6.5',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="jrnl 1.6.4 documentation" href="index.html" />
<link rel="top" title="jrnl 1.6.5 documentation" href="index.html" />
<link rel="next" title="Encryption" href="encryption.html" />
<link rel="prev" title="Getting started" href="installation.html" />
@ -49,6 +49,10 @@
<p>Composing mode is entered by either starting <tt class="docutils literal"><span class="pre">jrnl</span></tt> without any arguments &#8211; which will prompt you to write an entry or launch your editor &#8211; or by just writing an entry on the prompt, such as:</p>
<div class="highlight-python"><pre>jrnl today at 3am: I just met Steve Buscemi in a bar! He looked funny.</pre>
</div>
<p>You can also import an entry directly from a file:</p>
<div class="highlight-python"><div class="highlight"><pre><span class="n">jrnl</span> <span class="o">&lt;</span> <span class="n">my_entry</span><span class="o">.</span><span class="n">txt</span>
</pre></div>
</div>
<div class="section" id="smart-timestamps">
<h3>Smart timestamps<a class="headerlink" href="#smart-timestamps" title="Permalink to this headline"></a></h3>
<p>Timestamps that work:</p>