diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-07-05 20:00:24 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-07-05 20:00:24 +0200 |
| commit | 1e04852c3d528234966984b703487c9209d163fe (patch) | |
| tree | 413392b977304574171b46fa6e5d5e902139739c | |
| parent | a427fbba8d17fbee817d3b59fee4e365a90dbbc1 (diff) | |
| parent | 7f98d205ea2cdf777a8053dfde6602136adf70a3 (diff) | |
merge
| -rw-r--r-- | sys/man/1/kill | 7 | ||||
| -rw-r--r-- | sys/man/8/cryptsetup | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/man/1/kill b/sys/man/1/kill index ed4e40c25..d0c2de1fb 100644 --- a/sys/man/1/kill +++ b/sys/man/1/kill @@ -67,8 +67,11 @@ the broken processes. 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. diff --git a/sys/man/8/cryptsetup b/sys/man/8/cryptsetup index 513cea296..8e5664083 100644 --- a/sys/man/8/cryptsetup +++ b/sys/man/8/cryptsetup @@ -21,12 +21,10 @@ device. .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 |