From e91c0b93355b28617f7c0d756026856762ece242 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Wed, 25 Aug 2010 18:01:37 -0700
Subject: Imported Upstream version 0.12

---
 docs/stanford-naming | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'docs/stanford-naming')

diff --git a/docs/stanford-naming b/docs/stanford-naming
index f2a45a7..7315c1e 100644
--- a/docs/stanford-naming
+++ b/docs/stanford-naming
@@ -104,11 +104,10 @@ Object Naming
 
     <group>-<server>-tivoli-key
 
-        The Tivoli backup encryption key for this server.  This is stored
-        in the same file as the password used to connect to the Tivoli
-        server, so both are stored together.  This file is found at
-        /etc/adsm/TSM.PWD.  It must be base64-encoded before being stored
-        in the wallet.
+        The Tivoli password or backup encryption key for this server.
+        Both the password and the encryption key, if used, are stored in
+        the same file, so both are stored together.  This file is found at
+        /etc/adsm/TSM.PWD.
 
     <group>-<service>-config-<name>
 
-- 
cgit v1.2.3