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;p=pwstore

Merge remote branch 'formorer/master'

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

addb344d78e10cc259a918aa5bfbb0c65f791892
diff --cc README.asciidoc
index 2e401c2,3668e4b..a39d983
--- a/README.asciidoc
+++ b/README.asciidoc
@@@ -6,11 -12,9 +12,12 @@@ a set of encrypted files.  Each file ca
  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
- ==============
+ --------------
+ 
  First you need a file where your users and group are defined in.  This
  file is named .users.  Lines consist of assignments of the form
   <username> = <keyfingerprint>
@@@ -57,10 -63,10 +64,10 @@@ might have.  A patch to remove this lim
  
  
  adding a new file
- =================
+ -----------------
  
  -----------------------------
 -# pws ed -n file
 +% pws ed -n file
  -----------------------------
  
  editing files
@@@ -69,13 -75,13 +76,13 @@@
  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
- ====================
+ --------------------
  
  If available as .keyring pws instructs GnuPG to use this keyring in
  addition to the user's default keyrings.  This allows sharing of the