summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-24 13:10:28 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-24 13:10:28 -0500
commitc8d93e151ede1b17ca2ad33b6480fd59166ec1a4 (patch)
treebd79c3160ca01cda3a2e3978090a23896854a5f6 /doc
parent19f14e6bd219e7761202269491f062a600a9866f (diff)
downloadbcfg2-c8d93e151ede1b17ca2ad33b6480fd59166ec1a4.tar.gz
bcfg2-c8d93e151ede1b17ca2ad33b6480fd59166ec1a4.tar.bz2
bcfg2-c8d93e151ede1b17ca2ad33b6480fd59166ec1a4.zip
docs: formatting fixes, updated reserved encryption options
Diffstat (limited to 'doc')
-rw-r--r--doc/server/encryption.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/server/encryption.txt b/doc/server/encryption.txt
index e84b9fb31..b56487620 100644
--- a/doc/server/encryption.txt
+++ b/doc/server/encryption.txt
@@ -164,9 +164,8 @@ For instance::
.. note::
- The name of a passphrase **cannot** be "algorithm"; that
- configuration option is reserved for configuring the cipher
- algorithm.
+ The name of a passphrase **cannot** be ``algorithm`` or
+ ``decrypt``, which are reserved for other configuration options.
This would define two separate encryption passphrases, presumably for
use by two separate teams. The passphrase names are completely
@@ -212,7 +211,7 @@ though, that may not be possible. (For instance, if you use
encryption to protect data for your production environment from your
staging Bcfg2 server, then you would not expect the staging server to
be able to decrypt everything.) In this case, you want to enable lax
-decryption in the ``[encryption]`` section of ``bcfg2.conf``:
+decryption in the ``[encryption]`` section of ``bcfg2.conf``::
[encryption]
decrypt = lax