aboutsummaryrefslogtreecommitdiffstats
path: root/README.rst
diff options
context:
space:
mode:
authorroot <root@localhost>2013-01-21 17:37:06 -0500
committerroot <root@localhost>2013-01-21 17:37:06 -0500
commit7c45d73f4e52697a004e011a45b52a060479ded5 (patch)
tree06d986e6113f1ba9be8647e09f40243e3c98093e /README.rst
parentf2a1d6daa667795695cbde9d2f8b220dc49103b5 (diff)
downloadgit-remote-gcrypt-7c45d73f4e52697a004e011a45b52a060479ded5.zip
git-remote-gcrypt-7c45d73f4e52697a004e011a45b52a060479ded5.tar.gz
git-remote-gcrypt-7c45d73f4e52697a004e011a45b52a060479ded5.tar.bz2
Edit wording in README
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/README.rst b/README.rst
index d55dc48..22f79bc 100644
--- a/README.rst
+++ b/README.rst
@@ -15,10 +15,10 @@ Remote helper programs are invoked by git to handle network transport.
This helper handles `gcrypt::` URLs that will access a remote repository
encrypted with GPG, using our custom format.
-Supported locations are `local`, `rsync://` and `sftp://`, where
-the repository is stored as a set of files, or instead any `<giturl>`
-where gcrypt will store the same representation in a git repository,
-bridged over arbitrary git transport.
+Supported locations are `local`, `rsync://` and `sftp://`, where the
+repository is stored as a set of files, or instead any `<giturl>` where
+gcrypt will store the same representation in a git repository, bridged
+over arbitrary git transport.
The aim is to provide confidential, authenticated git storage and
collaboration using typical untrusted file hosts or services.
@@ -53,9 +53,9 @@ The following ``git-config(1)`` variables are supported:
to these participants and only signatures from these are accepted.
``gpg -k`` lists all public keys you know.
- When not set we encrypt to your default key and accept any valid
- signature. This behavior can also be requested explicitly by setting
- participants to ``simple``.
+ If this option is not set, we encrypt to your default key and accept
+ any valid signature. This behavior can also be requested explicitly
+ by setting participants to ``simple``.
The ``gcrypt-participants`` setting on the remote takes precedence
over the repository variable ``gcrypt.participants``.