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

doc/ minor typos/trailing whitespaces + extension on get options

Browse source
This commit is contained in:
Yaroslav Halchenko 2014-08-19 01:22:24 -04:00
parent 898209661e
commit 2d2d0a4d75
2 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/encryption.mdwn
View file

@ -74,7 +74,7 @@ and since it's exactly the way everyone else uses gpg.
git annex initremote newremote type=.... encryption=pubkey keyid=KEYID ...
A disavantage is that it is not easy to later add additional public keys
A disadvantage is that it is not easy to later add additional public keys
to the special remote. While the `enableremote` parameters `keyid+=` and
`keyid-=` can be used, they have **no effect** on files that are already
present on the remote. Probably the only use for these parameters is

23
doc/git-annex.mdwn
View file

@ -78,7 +78,10 @@ subdirectories).
or transferring them from some kind of key-value store.
Normally git-annex will choose which repository to copy the content from,
but you can override this using the `--from` option.
but you can override this using the `--from` option. Only the last version
of the file is retrieved (use `--all` to retrieve all versions of
the file). `--key=KEY` option can be used to retrieve a specified key
without the filename.
* `drop [path ...]`
@ -275,7 +278,7 @@ subdirectories).
When quvi is installed, links in the feed are tested to see if they
are on a video hosting site, and the video is downloaded. This allows
importing eg, youtube playlists.
importing e.g., youtube playlists.
* `watch`
@ -319,7 +322,7 @@ subdirectories).
This disables running a local web browser, and outputs the url you
can use to open the webapp.
When using the webapp on a remote computer, you'll almost certianly
When using the webapp on a remote computer, you'll almost certainly
want to enable HTTPS. The webapp will use HTTPS if it finds
a .git/annex/privkey.pem and .git/annex/certificate.pem. Here's
one way to generate those files, using a self-signed certificate:
@ -388,7 +391,7 @@ subdirectories).
The name of the remote is the same name used when originally
creating that remote with "initremote". Run "git annex enableremote"
with no parameters to get a list of special remote names.
without any name to get a list of special remote names.
Some special remotes may need parameters to be specified every time.
For example, the directory special remote requires a directory= parameter.
@ -425,7 +428,7 @@ subdirectories).
Run without a number to get the current value.
When git-annex is asked to drop a file, it first verifies that the
required number of copies can be satisfied amoung all the other
required number of copies can be satisfied among all the other
repositories that have a copy of the file.
This can be overridden on a per-file basis by the annex.numcopies setting
@ -1125,7 +1128,7 @@ subdirectories).
Caused a desktop notification to be displayed after each successful
file download and upload.
(Only supported on some platforms, eg Linux with dbus. A no-op when
(Only supported on some platforms, e.g. Linux with dbus. A no-op when
not supported.)
* `--notify-start`
@ -1372,7 +1375,7 @@ Here are all the supported configuration settings.
This is a deprecated setting. You should instead use the
`git annex numcopies` command to configure how many copies of files
are kept acros all repositories.
are kept across all repositories.
This config setting is only looked at when `git annex numcopies` has
never been configured.
@ -1611,7 +1614,7 @@ Here are all the supported configuration settings.
These options are passed after other applicable rsync options,
so can be used to override them. For example, to limit upload bandwidth
to 10Kbye/s, set `--bwlimit 10`.
to 10Kbyte/s, set `--bwlimit 10`.
* `remote.<name>.annex-rsync-download-options`
@ -1686,7 +1689,7 @@ Here are all the supported configuration settings.
In the command line, %file is replaced with the file that should be
erased.
For example, to use the wipe command, set it to `wipe -f %file`
For example, to use the wipe command, set it to `wipe -f %file`.
* `remote.<name>.rsyncurl`
@ -1781,7 +1784,7 @@ not honor the settings from .gitattributes.
Also note that when using views, only the toplevel .gitattributes file is
preserved in the view, so other settings in other files won't have any
efffect.
effect.
# FILES