Skip to content

Commit

Permalink
Update documentation on import and export
Browse files Browse the repository at this point in the history
  • Loading branch information
jarun committed Nov 7, 2017
1 parent 517ac63 commit ac77c8f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PRs are welcome. Please visit [#174](https://github.com/jarun/Buku/issues/174) f
- Continuous search with on the fly mode switch
- Open bookmarks and search results in browser
- Manual encryption support
- Auto-import Firefox and Google Chrome bookmarks
- Auto-import from Firefox, Google Chrome and Chromium
- Import/export bookmarks from/to HTML or Markdown
- Shorten and expand URLs
- Smart tag management using redirection (>>, >, <<)
Expand Down Expand Up @@ -203,13 +203,13 @@ ENCRYPTION OPTIONS:
-k, --unlock [N] decrypt DB in N (default 8) # iterations
POWER TOYS:
--ai auto-import from Firefox and Chrome
-e, --export file export bookmarks in Firefox format html
--ai auto-import from Firefox/Chrome/Chromium
-e, --export file export bookmarks to Firefox format html
export markdown, if file ends with '.md'
format: [title](url), 1 entry per line
export buku DB, if file ends with '.db'
use --tag to export specific tags
-i, --import file import Firefox or Chrome bookmarks html
-i, --import file import bookmarks html in Firefox format
import markdown, if file ends with '.md'
import buku DB, if file ends with '.db'
-p, --print [...] show record details by indices, ranges
Expand Down
6 changes: 3 additions & 3 deletions buku.1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ is a command-line utility to store, tag, search and organize bookmarks.
* Continuous search with on the fly mode switch
* Open bookmarks and search results in browser
* Manual encryption support
* Auto-import Firefox and Google Chrome bookmarks
* Auto-import from Firefox, Google Chrome and Chromium
* Import/export bookmarks from/to HTML or Markdown
* Shorten and expand URLs
* Smart tag management using redirection (>>, >, <<)
Expand Down Expand Up @@ -181,7 +181,7 @@ Decrypt (unlock) the DB file with
.SH POWER OPTIONS
.TP
.BI \--ai
Auto-import bookmarks from Firefox and Google Chrome.
Auto-import bookmarks from Firefox, Google Chrome and Chromium browsers.
.TP
.BI \-e " " \--export " file"
Export bookmarks to Firefox bookmarks formatted HTML. Works with --tag to export only specific tags. Markdown is used if
Expand All @@ -193,7 +193,7 @@ Markdown format: [title](url), 1 entry per line. A buku database is generated if
has extension '.db'.
.TP
.BI \-i " " \--import " file"
Import bookmarks exported from Firefox or Google Chrome as HTML.
Import bookmarks from Firefox bookmarks formatted html.
.I file
is considered Markdown (compliant with --export format) if it has '.md' extension or another buku database if the extension is '.db'.
.TP
Expand Down
6 changes: 3 additions & 3 deletions buku.py
Original file line number Diff line number Diff line change
Expand Up @@ -3962,13 +3962,13 @@ def main():

power_grp = argparser.add_argument_group(
title='POWER TOYS',
description=''' --ai auto-import from Firefox and Chrome
-e, --export file export bookmarks in Firefox format html
description=''' --ai auto-import from Firefox/Chrome/Chromium
-e, --export file export bookmarks to Firefox format html
export markdown, if file ends with '.md'
format: [title](url), 1 entry per line
export buku DB, if file ends with '.db'
use --tag to export specific tags
-i, --import file import Firefox or Chrome bookmarks html
-i, --import file import bookmarks html in Firefox format
import markdown, if file ends with '.md'
import buku DB, if file ends with '.db'
-p, --print [...] show record details by indices, ranges
Expand Down

0 comments on commit ac77c8f

Please sign in to comment.