From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 17 Jul 2011 08:03:48 +0000 (+0200)
Subject: Merge remote branch 'formorer/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=addb344d78e10cc259a918aa5bfbb0c65f791892;hp=549614037774f391166e5df67f8bd1e57cce46da;p=pwstore

Merge remote branch 'formorer/master'

* formorer/master:
  Add header, reorder headlines
---

diff --git a/README.asciidoc b/README.asciidoc
index 3668e4b..a39d983 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -12,6 +12,9 @@ a set of encrypted files.  Each file can be encrypted to a different set
 of users.  pws helps you with the bookkeeping of which keys to encrypt
 each file to and provides a convinient wrapper to edit protected files.
 
+In the intended use the directory with the encrypted passwords would be
+under SCM control and shared with other people who need access.
+
 initialization
 --------------
 
@@ -24,8 +27,7 @@ and
 Lines starting with a # are comments and thus get ignored.
 
 --------------------------------
-cat .users
-
+% cat .users
 # This file needs to be gpg signed by a key whose fingerprint
 # is listed in ~/.pws-trusted-users
 
@@ -52,8 +54,7 @@ This whitelist lives in ~/.pws-trusted-users, and simply takes one
 key fingerprint per line:
 
 ---------------------------------
-# cat ~/.pws-trusted-users
-
+% cat ~/.pws-trusted-users
 #formorer
 6E3966C1E1D15DB973D05B491E45F8CA9DE23B16
 ---------------------------------
@@ -66,7 +67,7 @@ adding a new file
 -----------------
 
 -----------------------------
-# pws ed -n file
+% pws ed -n file
 -----------------------------
 
 editing files
@@ -75,10 +76,10 @@ editing files
 Every file needs a header like:
 
 ------------------------------
-access: @all
+access: @admins, maxx
 ------------------------------
 
-You can edit the encrypted file with the pws tool: +pwd ed file+.
+You can edit the encrypted file with the pws tool: +pws ed file+.
 
 updating the keyring
 --------------------