mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Various typo fixes in doc/*.mdwn

Browse source
This commit is contained in:
Øyvind A. Holm 2015-04-02 01:50:17 +02:00
parent 334a9f5738
commit 490e97ec10
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/Android.mdwn
View file

@ -39,7 +39,7 @@ terminal. A fairly full set of tools is provided, including `git`, `ssh`,
`rsync`, and `gpg`. `rsync`, and `gpg`.
To prevent the webapp from being automatically started To prevent the webapp from being automatically started
when a terminal window opens, go into the terminal preferences, to "Inital when a terminal window opens, go into the terminal preferences, to "Initial
Command", and clear out the default `git annex webapp` setting. Command", and clear out the default `git annex webapp` setting.
Or, if you'd like to run the assistant automatically, but not open the Or, if you'd like to run the assistant automatically, but not open the

2
doc/automatic_conflict_resolution.mdwn
View file

@ -17,7 +17,7 @@ you don't want.
The "AAA" and "BBB" in the above example are essentially arbitrary The "AAA" and "BBB" in the above example are essentially arbitrary
(technically they are the MD5 checksum of the key). The automatic merge (technically they are the MD5 checksum of the key). The automatic merge
conflict resoltuion is designed so that if two or more repositories both get conflict resolution is designed so that if two or more repositories both get
a merge conflict, and resolve it, the resolved repositories will not a merge conflict, and resolve it, the resolved repositories will not
themselves conflict. This is why it doesn't use something nicer, like themselves conflict. This is why it doesn't use something nicer, like
perhaps the name of the remote that the file came from. perhaps the name of the remote that the file came from.

2
doc/chunking.mdwn
View file

@ -13,7 +13,7 @@ To enable chunking, pass a `chunk=nnMiB` parameter to `git annex
initremote`, specifying the chunk size. initremote`, specifying the chunk size.
Good chunk sizes will depend on the remote, but a good starting place Good chunk sizes will depend on the remote, but a good starting place
is probably `1MiB`. Very large chunks are problimatic, both because is probably `1MiB`. Very large chunks are problematic, both because
git-annex needs to buffer one chunk in memory when uploading, and because git-annex needs to buffer one chunk in memory when uploading, and because
a larger chunk will make resuming interrupted transfers less efficient. a larger chunk will make resuming interrupted transfers less efficient.
On the other hand, when a file is split into a great many chunks, On the other hand, when a file is split into a great many chunks,

4
doc/design/assistant/xmpp_security.mdwn
View file

@ -18,11 +18,11 @@ AES encryption:
use SPEKE (or similar methods like J-PAKE) to generate a shared key. use SPEKE (or similar methods like J-PAKE) to generate a shared key.
Avoids active MITM attacks. Makes pairing harder, especially pairing Avoids active MITM attacks. Makes pairing harder, especially pairing
between one's own devices, since the passphrase has to be entered on between one's own devices, since the passphrase has to be entered on
all devices. Also problimatic when pairing more than 2 devices, all devices. Also problematic when pairing more than 2 devices,
especially when adding a device to the set later, since there especially when adding a device to the set later, since there
would then be multiple different keys in use. would then be multiple different keys in use.
* Rely on the user's gpg key, and do gpg key verification during XMPP * Rely on the user's gpg key, and do gpg key verification during XMPP
pairing. Problimatic because who wants to put their gpg key on their pairing. Problematic because who wants to put their gpg key on their
phone? Also, require the users be in the WOT and be gpg literate. phone? Also, require the users be in the WOT and be gpg literate.
Update: This seems unlikely to be worth doing. [[Telehash]] is better. Update: This seems unlikely to be worth doing. [[Telehash]] is better.

2
doc/git-annex-assistant.mdwn
View file

@ -26,7 +26,7 @@ For more details about the git-annex assistant, see
* `--startdelay=N` * `--startdelay=N`
Wait N seconds before running the startup scan. This process can Wait N seconds before running the startup scan. This process can
be expensive and you may not want to run it immediatly upon login. be expensive and you may not want to run it immediately upon login.
* `--foreground` * `--foreground`

2
doc/git-annex-registerurl.mdwn
View file

@ -15,7 +15,7 @@ No verification is performed of the url's contents.
If the key and url are not specified on the command line, they are If the key and url are not specified on the command line, they are
instead read from stdin. Any number of lines can be provided in this instead read from stdin. Any number of lines can be provided in this
mode, each containing a key and url, sepearated by whitespace. mode, each containing a key and url, separated by whitespace.
# SEE ALSO # SEE ALSO

2
doc/git-annex-unannex.mdwn
View file

@ -1,6 +1,6 @@
# NAME # NAME
git-annex unannex - undo accidential add command git-annex unannex - undo accidental add command
# SYNOPSIS # SYNOPSIS

2
doc/git-annex.mdwn
View file

@ -172,7 +172,7 @@ subdirectories).
* `assistant` * `assistant`
Atomatically sync folders between devices. Automatically sync folders between devices.
See [[git-annex-assistant]](1) for details. See [[git-annex-assistant]](1) for details.