diff options
author | Joey Hess <joey@kitenet.net> | 2012-09-08 13:04:19 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-09-08 13:04:19 -0400 |
commit | 3dd4b4058f7796c5d08f1172fcf39c777540f80e (patch) | |
tree | 13af8c38710f1696de04b492d44c113fa8b40440 /templates/configurators/pairing.hamlet | |
parent | 0c01348b65bb3d0364f90ce9785236fa05985f75 (diff) |
implement pair request broadcasts
Pair requests are sent on all network interfaces, and contain the best
available hostname to use to contact the host on that interface.
Added a pairing in progress page.
Revert "reduce some boilerplate using ghc extensions", because it caused
overlapping instances for Text.
Diffstat (limited to 'templates/configurators/pairing.hamlet')
-rw-r--r-- | templates/configurators/pairing.hamlet | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/configurators/pairing.hamlet b/templates/configurators/pairing.hamlet index 4aa1cdbb0..eb16e5b6d 100644 --- a/templates/configurators/pairing.hamlet +++ b/templates/configurators/pairing.hamlet @@ -5,7 +5,7 @@ $if start Pair with a computer on your local network (or VPN), and the # two git annex repositories will be combined into one, with changes # - kept in sync between all paired devices. + kept in sync between them. $else Pairing with #{username}@#{hostname} will combine the two git annex # repositories into one, with changes kept in sync between them. @@ -46,5 +46,5 @@ A quotation is one good choice, something like: # "#{sampleQuote}" $else - Only letters and numbers matter; punctuation and white space is # + Only letters and numbers matter; punctuation and spaces are # ignored. |