ref: 6e5069dadeb25fafd2c758932276c3b5d9793cc1
parent: 303347a9fa8785ada26efb90d4c12a791b87fd9f
parent: d397d1f40138f3a75f211665bb4aab9056240a86
author: cinap_lenrek <cinap_lenrek@gmx.de>
date: Thu Jul 5 16:00:24 EDT 2012
merge
--- a/sys/man/1/kill
+++ b/sys/man/1/kill
@@ -67,8 +67,11 @@
flags processes matching the program name
.I regexp
as not to be killed in the event of memory
-exhaustion. This is usualy run from termrc
-and cpurc (see
+exhaustion. This is usually run from
+.B termrc
+and
+.B cpurc
+(see
.IR cpurc (8))
to protect important system processes from
getting killed.
--- a/sys/man/8/cryptsetup
+++ b/sys/man/8/cryptsetup
@@ -21,12 +21,10 @@
.PP
The
.B -f
-flag formats the partitions
+flag formats the partition
.I files,
-generating a new encryption key. The encryption key is
-protected by a password that
-.I cryptsetup
-will prompt for confirmation.
+generating a new encryption key. The user will be prompted
+for a password that will be used to protect the encryption key.
.PP
The flags
.B -i
--
⑨