diff --git a/README.md b/README.md index dbf8b8c..d659dbe 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ If you find `buku` useful, please consider donating via PayPal. - [Features](#features) - [Installation](#installation) - [Dependencies](#dependencies) - - [Installating from this repository](#installing-from-this-repository) + - [Installing from this repository](#installing-from-this-repository) - [Running as a standalone utility](#running-as-a-standalone-utility) - [Installing with a package manager](#installing-with-a-package-manager) - [Usage](#usage) @@ -56,7 +56,7 @@ If you find `buku` useful, please consider donating via PayPal. - Add a bookmark at Nth index, to fill deleted bookmark indices - Secure parameterized SQLite3 queries to access database - Supports HTTP compression -- Handle multiple HTTP redirections (reports redireted URL, loops, IP blocking) +- Handle multiple HTTP redirections (reports redirected URL, loops, IP blocking) - Unicode in URL works - UTF-8 request and response, page character set detection - Handle piped input @@ -162,7 +162,7 @@ You may need to use `sudo` with `PREFIX` depending on your permissions on destin - `-S` : match all the keywords in URL or title. Order is irrelevant. - Search results are indexed serially. This index is different from actual database index of a bookmark record which is shown within `()` after the URL. - AES256 is used for encryption. Optionally specify (`-t`) the number of hash iterations to use to generate key. Default is 8 iterations. -- Encryption is optional and manual. If you choose to use encryption, the database file should be unlocked (`-k`) before using buku and locked (`-l`) afterwards. Between these 2 operations, the database file lies unencrypted on the disk, and NOT in memory. Also, note that the database file is unecrypted on creation. +- Encryption is optional and manual. If you choose to use encryption, the database file should be unlocked (`-k`) before using buku and locked (`-l`) afterwards. Between these 2 operations, the database file lies unencrypted on the disk, and NOT in memory. Also, note that the database file is unencrypted on creation. # Examples 1. **Add** a new bookmark with title `Linux magazine` & tags `linux news` and `open source`: diff --git a/buku b/buku index df3ebbc..a4bd61a 100755 --- a/buku +++ b/buku @@ -70,7 +70,7 @@ refresh = False # Refresh the full DB replace = False # Replace a tag encrypt = False # Lock database file decrypt = False # Unlock database file -iterations = 8 # Number of hash iteratons to generate key +iterations = 8 # Number of hash iterations to generate key pipeargs = [] # Holds arguments piped to the program _VERSION_ = 1.9 # Program version @@ -302,7 +302,7 @@ def fetchTitle(url): redirurl = urljoin(url, resp.getheader('location', '')) printmsg(redirurl, "REDIRECTION") - if redirurl.find("sorry/IndexRedirect?") >= 0: # graecefully handle Google blocks + if redirurl.find("sorry/IndexRedirect?") >= 0: # gracefully handle Google blocks printmsg("Connection blocked due to unusual activity", "ERROR") break @@ -792,7 +792,7 @@ def encrypt_file(): # Get SHA256 hash of DB file dbhash = get_filehash(dbpath) - # Generate randon 256-bit salt and key + # Generate random 256-bit salt and key salt = Random.get_random_bytes(SALT_SIZE) key = (password + salt.decode('utf-8', "replace")).encode('utf-8') for i in range(iterations): diff --git a/buku.1 b/buku.1 index edb2219..fd08e1f 100644 --- a/buku.1 +++ b/buku.1 @@ -36,7 +36,7 @@ Search works in mysterious ways: .PP AES256 is used for encryption. Optionally specify (-t) the number of hash iterations to use to generate key. Default is 8 iterations. .PP -Encryption is optional and manual. If you choose to use encryption, the database file should be unlocked (-k) before using buku and locked (-l) afterwards. Between these 2 operations, the database file lies unencrypted on the disk, and NOT in memory. Also, note that the database file is unecrypted on creation. +Encryption is optional and manual. If you choose to use encryption, the database file should be unlocked (-k) before using buku and locked (-l) afterwards. Between these 2 operations, the database file lies unencrypted on the disk, and NOT in memory. Also, note that the database file is unencrypted on creation. .SH OPTIONS .TP .BI \-a " URL" " " "[tags]" @@ -56,7 +56,7 @@ Delete ALL bookmarks. Show all bookmarks with empty titles or no tags (for bookkeeping). .TP .B \-g -List all unique tags sorted aplhabetically. +List all unique tags sorted alphabetically. .TP .BI \-i " N" Add a new record at free index