From f8b73e02866867d9d00bb3d0e64fe492c1ed43ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 19 Jan 2024 20:41:55 -0400 Subject: [PATCH] fix example that combined encryption=shared with keyid= --- .../comment_24_2c9eda62766c9d5000346a092fe5d0d8._comment | 2 +- doc/special_remotes/rsync.mdwn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/special_remotes/comment_24_2c9eda62766c9d5000346a092fe5d0d8._comment b/doc/special_remotes/comment_24_2c9eda62766c9d5000346a092fe5d0d8._comment index 905184f958..2d5f5b0b15 100644 --- a/doc/special_remotes/comment_24_2c9eda62766c9d5000346a092fe5d0d8._comment +++ b/doc/special_remotes/comment_24_2c9eda62766c9d5000346a092fe5d0d8._comment @@ -9,7 +9,7 @@ sufficient to back that up. You can run `git annex enableremote` in an clone to enable an existing special remote. The only catch is that, if you have chosen to initremote a special remote -using a gpg key, with `encryption=shared keyid=whatever`, you'll of course +using a gpg key, with `keyid=whatever`, you'll of course also need that gpg key to to use it. If you run `git annex info $myremote` it will tell you amoung other things, any gpg keys that are used by that remote. diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn index 4992a9c86f..04af848543 100644 --- a/doc/special_remotes/rsync.mdwn +++ b/doc/special_remotes/rsync.mdwn @@ -2,12 +2,12 @@ This special remote type rsyncs file contents to somewhere else. Setup example: - # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync keyid=id@joeyh.name encryption=shared + # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync encryption=shared # git annex describe myrsync "rsync server" Or for using rsync over SSH - # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync keyid=id@joeyh.name encryption=shared + # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync encryption=shared # git annex describe myrsync "rsync server" ## configuration