diff --git a/CHANGELOG.md b/CHANGELOG.md index 67a12dd8..37b419d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Changelog ### 1.6 (November 5, 2013) +* __1.6.5__ Allows composing multi-line entries on the command line or importing files * __1.6.4__ Fixed a bug that caused creating encrypted journals to fail * __1.6.3__ New, pretty, _useful_ documentation! * __1.6.2__ Starring entries now works for plain-text journals too! diff --git a/docs/usage.rst b/docs/usage.rst index c17bd761..fec5cbb9 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -15,6 +15,9 @@ Composing mode is entered by either starting ``jrnl`` without any arguments -- w jrnl today at 3am: I just met Steve Buscemi in a bar! He looked funny. +You can also import an entry directly from a file:: + + jrnl < my_entry.txt Smart timestamps ~~~~~~~~~~~~~~~~ diff --git a/jrnl/__init__.py b/jrnl/__init__.py index 208872cf..81d5e4ab 100644 --- a/jrnl/__init__.py +++ b/jrnl/__init__.py @@ -7,7 +7,7 @@ jrnl is a simple journal application for your command line. """ __title__ = 'jrnl' -__version__ = '1.6.4' +__version__ = '1.6.5' __author__ = 'Manuel Ebert' __license__ = 'MIT License' __copyright__ = 'Copyright 2013 Manuel Ebert'