diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contact.mdwn | 2 | ||||
| -rw-r--r-- | doc/encryption.mdwn | 2 | ||||
| -rw-r--r-- | doc/forum/example_of_massively_disconnected_operation.mdwn | 2 | ||||
| -rw-r--r-- | doc/git-annex-shell.mdwn | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 2 | ||||
| -rw-r--r-- | doc/git-union-merge.mdwn | 2 | ||||
| -rw-r--r-- | doc/special_remotes/rsync.mdwn | 4 | ||||
| -rw-r--r-- | doc/special_remotes/webdav.mdwn | 2 | ||||
| -rw-r--r-- | doc/thanks.mdwn | 2 | ||||
| -rw-r--r-- | doc/tips/using_box.com_as_a_special_remote.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/joey.mdwn | 4 |
11 files changed, 13 insertions, 13 deletions
diff --git a/doc/contact.mdwn b/doc/contact.mdwn index b2ccf8201..db9914d50 100644 --- a/doc/contact.mdwn +++ b/doc/contact.mdwn @@ -1,4 +1,4 @@ -Joey Hess <joey@kitenet.net> is the author of git-annex. If you need to +Joey Hess <id@joeyh.name> is the author of git-annex. If you need to talk about something privately, email me. The [[forum]] is the best place to discuss git-annex. diff --git a/doc/encryption.mdwn b/doc/encryption.mdwn index 3cbc37ee3..29cb8a0bc 100644 --- a/doc/encryption.mdwn +++ b/doc/encryption.mdwn @@ -34,7 +34,7 @@ flexibility, it is the default and recommended encryption scheme. Here the KEYID(s) are passed to `gpg` to find encryption keys. Typically, you will say "keyid=2512E3C7" to use a specific gpg key. -Or, you might say "keyid=joey@kitenet.net" to search for matching keys. +Or, you might say "keyid=id@joeyh.name" to search for matching keys. To add a new key and allow it to access all the content that is stored in the encrypted special remote, just run `git annex diff --git a/doc/forum/example_of_massively_disconnected_operation.mdwn b/doc/forum/example_of_massively_disconnected_operation.mdwn index 00a5d8d6c..78ed6784b 100644 --- a/doc/forum/example_of_massively_disconnected_operation.mdwn +++ b/doc/forum/example_of_massively_disconnected_operation.mdwn @@ -4,7 +4,7 @@ So, I synced it back up! :) --[[Joey]] <pre> commit 4151f4595fe6205d4aed653617ab23eb3335130a -Author: Joey Hess <joey@kitenet.net> +Author: Joey Hess <id@joeyh.name> Date: Tue Oct 26 02:18:03 2010 -0400 joey> git pull diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn index 26ccb9a40..e43d51657 100644 --- a/doc/git-annex-shell.mdwn +++ b/doc/git-annex-shell.mdwn @@ -126,7 +126,7 @@ git-shell(1) # AUTHOR -Joey Hess <joey@kitenet.net> +Joey Hess <id@joeyh.name> <http://git-annex.branchable.com/> diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index b8ad6a1d6..c92208e5c 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1896,7 +1896,7 @@ should be included, in, for example, `/usr/share/doc/git-annex/`. # AUTHOR -Joey Hess <joey@kitenet.net> +Joey Hess <id@joeyh.name> <http://git-annex.branchable.com/> diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn index 8e3c34f8f..d0ceb3a8f 100644 --- a/doc/git-union-merge.mdwn +++ b/doc/git-union-merge.mdwn @@ -31,7 +31,7 @@ File modes are not currently merged. # AUTHOR -Joey Hess <joey@kitenet.net> +Joey Hess <id@joeyh.name> <http://git-annex.branchable.com/> diff --git a/doc/special_remotes/rsync.mdwn b/doc/special_remotes/rsync.mdwn index 628d2e8cb..2271cbc2a 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=joey@kitenet.net encryption=shared + # git annex initremote myrsync type=rsync rsyncurl=rsync://rsync.example.com/myrsync keyid=id@joeyh.name 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=joey@kitenet.net encryption=shared + # git annex initremote myrsync type=rsync rsyncurl=ssh.example.com:/myrsync keyid=id@joeyh.name encryption=shared # git annex describe myrsync "rsync server" ## configuration diff --git a/doc/special_remotes/webdav.mdwn b/doc/special_remotes/webdav.mdwn index 6b5f5b122..100de8c20 100644 --- a/doc/special_remotes/webdav.mdwn +++ b/doc/special_remotes/webdav.mdwn @@ -37,4 +37,4 @@ the webdav remote. Setup example: - # WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunk=10mb keyid=joey@kitenet.net + # WEBDAV_USERNAME=id@joeyh.name WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunk=10mb keyid=id@joeyh.name diff --git a/doc/thanks.mdwn b/doc/thanks.mdwn index 90c994847..4b86a45d9 100644 --- a/doc/thanks.mdwn +++ b/doc/thanks.mdwn @@ -4,7 +4,7 @@ you individually, but until I meet all 1500 of you, this page will have to do. You have my most sincere thanks. --[[Joey]] (If I got your name wrong, or you don't want it publically posted here, -email <joey@kitenet.net>.) +email <id@joeyh.name>.) ## 2014-2015 diff --git a/doc/tips/using_box.com_as_a_special_remote.mdwn b/doc/tips/using_box.com_as_a_special_remote.mdwn index 149d1f824..2edd200b1 100644 --- a/doc/tips/using_box.com_as_a_special_remote.mdwn +++ b/doc/tips/using_box.com_as_a_special_remote.mdwn @@ -42,7 +42,7 @@ using the webdav special remote. * Create `~/.davfs2/secrets`. This file contains your Box.com login and password. Your login is probably the email address you signed up with. - echo "/media/box.com joey@kitenet.net mypassword" > ~/.davfs2/secrets + echo "/media/box.com id@joeyh.name mypassword" > ~/.davfs2/secrets chmod 600 ~/.davfs2/secrets * Now you should be able to mount Box, as a non-root user: diff --git a/doc/users/joey.mdwn b/doc/users/joey.mdwn index 306e1cc76..2180dd64f 100644 --- a/doc/users/joey.mdwn +++ b/doc/users/joey.mdwn @@ -1,2 +1,2 @@ -Joey Hess <joey@kitenet.net> -<http://kitenet.net/~joey/> +Joey Hess <id@joeyh.name> +<https://joeyh.name/> |