diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2015-03-29 21:20:53 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-03-29 21:22:27 +0200 |
| commit | 655b0df49c030105a50ba84b1b096af145f91767 (patch) | |
| tree | 2f632f1e2582adeb8b7551241e94498c065862de | |
| parent | 7126bf8d8b6c9d01d45e8580d85df7633e826df4 (diff) | |
s/insert/import/g
| -rw-r--r-- | cli/bash-completion.sh | 4 | ||||
| -rwxr-xr-x | cli/icevault | 4 | ||||
| -rw-r--r-- | cli/icevault.1 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cli/bash-completion.sh b/cli/bash-completion.sh index e1ae871..5ae1c63 100644 --- a/cli/bash-completion.sh +++ b/cli/bash-completion.sh @@ -29,7 +29,7 @@ _icevault() { cmd="${words[1]}" fi - local commands='fill clip cp dump edit git insert ls mv reencrypt rm' + local commands='fill clip cp dump edit git import ls mv reencrypt rm' case "$cmd" in fill) opts='-f --force -p --show-passwords -s --socket='; nargs=1;; clip) opts=; nargs=1 ;; @@ -37,7 +37,7 @@ _icevault() { dump) opts='-p --show-passwords'; nargs=1;; edit) opts=; nargs=1 ;; git) opts= ;; - insert) opts='-f --force -s --socket='; nargs=0;; + import) opts='-f --force -s --socket='; nargs=0;; ls) opts='-0 --zero -r --recursive'; nargs=-1;; mv) opts='-f --force'; nargs=2;; reencrypt) opts=; nargs=-1 ;; diff --git a/cli/icevault b/cli/icevault index 41fb5d8..e4c517a 100755 --- a/cli/icevault +++ b/cli/icevault @@ -659,7 +659,7 @@ my @USAGE = ( dump => "[-p, --show-passwords] scheme://hostname/identity", edit => "scheme://hostname/identity", git => "GIT-COMMAND [GIT-ARG ...]", - insert => "[-f, --force] [-s, --socket=PATH] [identity]", + import => "[-f, --force] [-s, --socket=PATH] [identity]", ls => "[-0, --zero] [-r, --recursive] [scheme://[hostname/[identity]] ...]", mv => "[-f, --force] scheme://hostname/identity1 scheme://hostname/identity2", reencrypt => "[scheme://[hostname/[identity]] ...]", @@ -753,7 +753,7 @@ elsif ($COMMAND eq '_geturi') { exit; } -elsif ($COMMAND eq 'insert') { +elsif ($COMMAND eq 'import') { getopts( 'force|f' => "-f, --force \tOverwrite preexisting identity" , 'socket|s=s' => "-s, --socket=PATH\tSpecifiy the path to the Icevault socket" ); diff --git a/cli/icevault.1 b/cli/icevault.1 index 8aaa76c..d1a2084 100644 --- a/cli/icevault.1 +++ b/cli/icevault.1 @@ -111,7 +111,7 @@ Signing each commit can be achieved as follows, see \fIgit-config\fR(1): \fBicevault git\fR config user.signingkey 0x39278DA8109E6244 .TP -.B insert\fR [\fB-f\fR, \fB--force\fR] [\fB-s\fR, \fB--socket=\fR\fIPATH\fR] [\fIidentity\fR] +.B import\fR [\fB-f\fR, \fB--force\fR] [\fB-s\fR, \fB--socket=\fR\fIPATH\fR] [\fIidentity\fR] Create a new \fIscheme\fR://\fIhostname\fR/\fIidentity\fR URI available for further commands. The HTML form selection algorithm is described in the \fBHTML FORM SELECTION\fR section. If \fIidentity\fR is omitted, it @@ -235,7 +235,7 @@ respectively expand to the \fIscheme\fR, \fIhostname\fR and (Default: "%s/%h/%i.gpg".) .SH HTML FORM SELECTION -The HTML form selection for the \fBinsert\fR and \fBfill\fR commands is +The HTML form selection for the \fBimport\fR and \fBfill\fR commands is performed in the following order: .nr step 1 1 |