Merge commit 'origin/master'

Conflicts:
	getopt/getopt.1

diff --cc fdisk/cfdisk.8
index 60f8c04c3de492f8ee1e83a440d53f9939e6b545,703ee1908966b017af16eceb23ffe64f91aef725..f31913de9d005e2f861e7b9b2c10e85c98247663
--- 1/fdisk/cfdisk.8
--- 2/fdisk/cfdisk.8
+++ b/fdisk/cfdisk.8
@@@ -13,13 -13,22 +13,22 @@@
  .\" " for hilit mode
  .TH CFDISK 8 "3 June 1995" "The BOGUS Linux Release" "Linux Programmer's Manual"
  .SH NAME
 -cfdisk \- Curses based disk partition table manipulator for Linux
 +cfdisk \- Curses/slang based disk partition table manipulator for Linux
  .SH SYNOPSIS
- .BI "cfdisk [ \-agvz ] [ \-c " cylinders " ] [ \-h " heads " ]"
- .BI "[ \-s " sectors-per-track " ] [ -P " opt " ] [ " device " ]"
+ .B cfdisk
+ .RB [ \-agvz ]
+ .RB [ \-c
+ .IR cylinders ]
+ .RB [ \-h
+ .IR heads ]
+ .RB [ \-s
+ .IR sectors-per-track ]
+ .RB [ \-P
+ .IR opt ]
+ .RI [ device ]
  .SH DESCRIPTION
  .B cfdisk
 -is a curses based program for partitioning any hard disk drive.
 +is a curses/slang based program for partitioning any hard disk drive.
  Typical values of the
  .I device
  argument are:

diff --cc getopt/getopt.1
index 4f82f85238bbb66568d665cbde3b96408ee30a17,755dc976e396c5cb6a7d2089bf0c24f690e7ed90..4bb4bbcb087c5c378d17d05ffc0ce3de306fccb2
--- 1/getopt/getopt.1
--- 2/getopt/getopt.1
+++ b/getopt/getopt.1
@@@ -402,8 -424,9 +424,9 @@@ if it is called wit
  .SH EXAMPLES
  Example scripts for (ba)sh and (t)csh are provided with the
  .BR getopt (1)
- distribution, and are installed in 
 -distribution, and are optionally installed in
 -.BR /usr/share/getopt .
++distribution, and are optionally installed in 
 +.BR /usr/share/doc/util-linux/examples .
+ 
  .SH ENVIRONMENT
  .IP POSIXLY_CORRECT
  This environment variable is examined by the

diff --cc hwclock/hwclock.8
Simple merge

diff --cc misc-utils/whereis.c
Simple merge

diff --cc mount/losetup.8
index 3d22b85c6921819f08015c15a31a5e4b1c14b5c0,8ccab6cef1dcb8b21c53a9ef3c1c8c204689e132..f42afe5a2e8a987524bbebd57a9c1653f6515085
--- 1/mount/losetup.8
--- 2/mount/losetup.8
+++ b/mount/losetup.8
@@@ -172,11 -165,9 +170,11 @@@ the comman
  .fi
  .SH RESTRICTION
  DES encryption is painfully slow. On the other hand, XOR is terribly weak.
 +Both are insecure nowadays. Some ciphers may require a licence for you to be
 +allowed to use them.
  
  Cryptoloop is deprecated in favor of dm-crypt. For more details see
- .B cryptsetup(8).
+ .BR cryptsetup (8).
  .SH AVAILABILITY
  The losetup command is part of the util-linux-ng package and is available from
  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
Simple merge