[patches] equalizing a few error messages and polishing some man pages

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

Attached bunch of patches mainly tweak the formatting and wording
of several man pages that were (more or less) recently modified.

The first patch, though, makes a few error messages exactly equal
to some other, already existing, ones -- so this does not invalidate
any translations.  The second patch removes a duplicate --help from
the help text of lsblk, and better alphabetizes the other options.
Also this does not invalidate any translations.

The fourth patch removes a strange, illegitimate hybrid of the -F
and -w options from the man page of last.

The fifth patch slightly improves the spelling and grammar of the
2.24 ReleaseNotes, and mentions only those PO files which were
actually updated during this cycle.  Karel, judging from the rc2
announcement, you have a more recent version of this file.  If
you wish me to resolve any conflicts, please push your version.

Last year Sami removed the formatting from the Synopsis of getopt,
but did this incompletely (the last 'parameters' is still italicized).
But, more importantly, the second paragraph of the Description and
the first paragraph of Parsing still refer to the formatted version
of the Synopsis.  So the eleventh patch brings this formatting back,
also because in my opinion it looks better.  It makes some other small
adjustments too.

Regards,

Benno

-- 
http://www.fastmail.fm - Same, same, but different...

From de38dc8604beaa08125b3664f4ad715913af7f3c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Fri, 11 Oct 2013 15:52:07 +0200
Subject: [PATCH 01/11] textual: equalize four error messages with already existing ones

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 disk-utils/fsck.c  |    2 +-
 libfdisk/src/dos.c |    4 ++--
 libfdisk/src/gpt.c |    4 ++--
 libfdisk/src/sgi.c |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 00622c4..3084134 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -713,7 +713,7 @@ static struct fsck_instance *wait_one(int flags)
 				warnx(_("wait: no more child process?!?"));
 				return NULL;
 			}
-			warn(_("waidpid failed"));
+			warn(_("waitpid failed"));
 			continue;
 		}
 		for (prev = 0, inst = instance_list;
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 163a87b..3aa40de 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -808,8 +808,8 @@ static int add_partition(struct fdisk_context *cxt, int n, struct fdisk_parttype
 	sys = t ? t->type : MBR_LINUX_DATA_PARTITION;
 
 	if (p && p->sys_ind) {
-		fdisk_warnx(cxt, _("Partition %d is already defined.  Delete "
-			 "it before re-adding it."), n + 1);
+		fdisk_warnx(cxt, _("Partition %zd is already defined.  "
+			           "Delete it before re-adding it."), n + 1);
 		return -EINVAL;
 	}
 	fill_bounds(cxt, first, last);
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 9536eb3..0692d15 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -1658,8 +1658,8 @@ static int gpt_add_partition(
 	ents = gpt->ents;
 
 	if (!partition_unused(&ents[partnum])) {
-		fdisk_warnx(cxt, _("Partition %zd is already defined. "
-			 "Delete it before re-adding it."), partnum +1);
+		fdisk_warnx(cxt, _("Partition %zd is already defined.  "
+			           "Delete it before re-adding it."), partnum +1);
 		return -EINVAL;
 	}
 	if (le32_to_cpu(pheader->npartition_entries) ==
diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index 96e84f2..ce23675 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -977,7 +977,7 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
 		} else {
 			/* otherwise print error and use truncated version */
 			fdisk_warnx(cxt,
-				_("Warning:  BLKGETSIZE ioctl failed on %s. "
+				_("BLKGETSIZE ioctl failed on %s. "
 				  "Using geometry cylinder value of %llu. "
 				  "This value may be truncated for devices "
 				  "> 33.8 GB."), cxt->dev_path, cxt->geom.cylinders);
-- 
1.7.0.4

From 7039c9ff504a175b0d4e12ea8eebaff78b844496 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 11:17:19 +0200
Subject: [PATCH 02/11] textual: remove duplicate mention of '--help' from lsblk help text

Also improve the alphabetization of the other options.

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 misc-utils/lsblk.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index b4eddab..9f7f1b6 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1371,20 +1371,19 @@ static void __attribute__((__noreturn__)) help(FILE *out)
 	fputs(_(" -d, --nodeps         don't print slaves or holders\n"), out);
 	fputs(_(" -D, --discard        print discard capabilities\n"), out);
 	fputs(_(" -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"), out);
-	fputs(_(" -I, --include <list> show only devices with specified major numbers\n"), out);
 	fputs(_(" -f, --fs             output info about filesystems\n"), out);
-	fputs(_(" -h, --help           usage information (this)\n"), out);
 	fputs(_(" -i, --ascii          use ascii characters only\n"), out);
-	fputs(_(" -m, --perms          output info about permissions\n"), out);
+	fputs(_(" -I, --include <list> show only devices with specified major numbers\n"), out);
 	fputs(_(" -l, --list           use list format output\n"), out);
+	fputs(_(" -m, --perms          output info about permissions\n"), out);
 	fputs(_(" -n, --noheadings     don't print headings\n"), out);
 	fputs(_(" -o, --output <list>  output columns\n"), out);
 	fputs(_(" -p, --paths          print complete device path\n"), out);
 	fputs(_(" -P, --pairs          use key=\"value\" output format\n"), out);
 	fputs(_(" -r, --raw            use raw output format\n"), out);
 	fputs(_(" -s, --inverse        inverse dependencies\n"), out);
-	fputs(_(" -t, --topology       output info about topology\n"), out);
 	fputs(_(" -S, --scsi           output info about SCSI devices\n"), out);
+	fputs(_(" -t, --topology       output info about topology\n"), out);
 	fputs(USAGE_SEPARATOR, out);
 	fputs(USAGE_HELP, out);
 	fputs(USAGE_VERSION, out);
-- 
1.7.0.4

From e48e6631c7a76101fcb61d6b8cccd1391e6e23cc Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 18:43:29 +0200
Subject: [PATCH 03/11] docs: tweak wording, grammar and formatting of fdisk man page

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 fdisks/fdisk.8 |  103 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/fdisks/fdisk.8 b/fdisks/fdisk.8
index d197982..2212310 100644
--- a/fdisks/fdisk.8
+++ b/fdisks/fdisk.8
@@ -19,40 +19,41 @@ fdisk \- manipulate disk partition table
 .SH DESCRIPTION
 .B fdisk
 is a dialog-driven program for creation and manipulation of partition tables.
-It understands GPT, MBR, SUN, SGI and BSD partition tables.
+It understands GPT, MBR, Sun, SGI and BSD partition tables.
 
-The block devices can be divided into one or more logical disks called
+Block devices can be divided into one or more logical disks called
 .IR partitions .
 This division is recorded in the
 .IR "partition table" ,
 usually found in sector 0 of the disk.
 (In the BSD world one talks about `disk slices' and a `disklabel'.)
 
-All partitioning is driven by device I/O limits (topology) by default.
+All partitioning is driven by device I/O limits (the topology) by default.
 .B fdisk
-is able to optimize disk layout for 4K-sector size and use alignment offset on
-modern devices for MBR and GPT. It's always good idea to follow fdisk defaults
+is able to optimize the disk layout for a 4K-sector size and use an alignment offset on
+modern devices for MBR and GPT.  It is always a good idea to follow \fBfdisk\fR's defaults
 as the default values (e.g. first and last partition sectors) and partition
-sizes specified by +<size>{M,G, ..} notation are always aligned according 
+sizes specified by the +<size>{M,G,...} notation are always aligned according
 to the device properties.
 
 Note that
-.B partx (1)
-provides rich interface for script to print disk layout,
+.BR partx (8)
+provides a rich interface for scripts to print disk layouts,
+.B fdisk
+is mostly designed for humans.  Backward compatibility in the output of
 .B fdisk
-is mostly designed for humans. The backward compatibility in the fdisk output
-is not guaranteed. The input (commands) should be always backwardly compatible.
+is not guaranteed.  The input (the commands) should always be backward compatible.
 
 .SH OPTIONS
 .TP
 .BI "\-b " sectorsize
-Specify the sector size of the disk.  Valid values are 512, 1024, 2048 or 4096.
-(Recent kernels know the sector size.  Use this only on old kernels or
+Specify the sector size of the disk.  Valid values are 512, 1024, 2048, and 4096.
+(Recent kernels know the sector size.  Use this option only on old kernels or
 to override the kernel's ideas.)  Since util-linux-2.17, \fBfdisk\fR differentiates
 between logical and physical sector size.  This option changes both sector sizes to
 .IB sectorsize .
 .TP
-.BI "\-c"[=mode]
+.BR "\-c"[=\fImode\fR]
 Specify the compatibility mode, 'dos' or 'nondos'.  The default is non-DOS
 mode.  For backward compatibility, it is possible to use the option without
 the \fImode\fR argument -- then the default is used.  Note that the optional
@@ -77,27 +78,28 @@ A reasonable value is 63.  This option is DEPRECATED.
 .BI \-h
 Display a help text and exit.
 .TP
-.BI \-L[=\fIwhen\fR]
-Colorize output in interactive mode.  The optional argument \fIwhen\fP can
-be \fBauto\fR, \fBnever\fR or \fBalways\fR. The default is \fBauto\fR.
+.BR "\-L"[=\fIwhen\fR]
+Colorize the output in interactive mode.  The optional argument \fIwhen\fP can
+be \fBauto\fR, \fBnever\fR or \fBalways\fR.  The default is \fBauto\fR.
 .TP
 .B \-l
 List the partition tables for the specified devices and then exit.
 If no devices are given, those mentioned in
 .I /proc/partitions
-(if that exists) are used.
+(if that file exists) are used.
 .TP
 .BI "\-s " partition...
-Print the size (in blocks) of each given partition. This option is DEPRECATED
+Print the size (in blocks) of each given partition.  This option is DEPRECATED
 in favour of
-.B blockdev (1).
+.BR blockdev (1).
 .TP
 .BI "\-t " type
-Disable support for all disklabels and enable support only for specified \fItype\fP.
-This is necessary for example to access protective or hybrid MBR on devices
+Enable support only for disklabels of the specified \fItype\fP, and disable
+support for all other types.
+This is necessary for example to access a protective or hybrid MBR on devices
 with GPT.
 .TP
-.BI "\-u"[=unit]
+.BR "\-u"[=\fIunit\fR]
 When listing partition tables, show sizes in 'sectors' or in 'cylinders'.  The
 default is to show sizes in sectors.  For backward compatibility, it is possible
 to use the option without the \fIunit\fR argument -- then the default is used.
@@ -124,28 +126,28 @@ documentation (the Documentation/devices.txt file).
 .SH DISK LABELS
 .B GPT (GUID Partition Table)
 .RS
-GPT is modern standard for the layout of the partition table. GPT uses 64-bits
-logical block addresses, checksums, UUIDs and names for partitions and
-unlimited number of the partitions (although the number of the partition is
+GPT is modern standard for the layout of the partition table.  GPT uses 64-bit
+logical block addresses, checksums, UUIDs and names for partitions and an
+unlimited number of partitions (although the number of partitions is
 usually restricted to 128 in many partitioning tools).
 
 Note that the first sector is still reserved for a
 .B protective MBR
-in the GPT specification. It prevents MBR-only partitioning tools
-to mis-recognizing and overwriting GPT disks.
+in the GPT specification.  It prevents MBR-only partitioning tools
+from mis-recognizing and overwriting GPT disks.
 
-GPT is always better choice than MBR especially on modern hardware with UEFI
+GPT is always a better choice than MBR, especially on modern hardware with a UEFI
 boot loader.
 .RE
 
 .B DOS-type (MBR)
 .RS
-partition table can describe an unlimited number of partitions.  In sector 0
+A DOS-type partition table can describe an unlimited number of partitions.  In sector 0
 there is room for the description of 4 partitions (called `primary').  One of
 these may be an extended partition; this is a box holding logical partitions,
 with descriptors found in a linked list of sectors, each preceding the
 corresponding logical partitions.  The four primary partitions, present or not,
-get numbers 1-4.  Logical partitions start numbering from 5.
+get numbers 1-4.  Logical partitions are numbered starting from 5.
 
 In a DOS-type partition table the starting offset and the size of each
 partition is stored in two ways: as an absolute number of sectors (given in 32
@@ -156,28 +158,28 @@ will work up to 2 TB.  The latter has two problems.  First, these C/H/S fields
 can be filled only when the number of heads and the number of sectors per track
 are known.  And second, even if we know what these numbers should be, the 24
 bits that are available do not suffice.  DOS uses C/H/S only, Windows uses
-both, Linux never uses C/H/S. The
+both, Linux never uses C/H/S.  The
 .B C/H/S addressing is deprecated
 and may be unsupported in some later fdisk version.
 
-.B Please, read the DOS-mode section if you want DOS compatible partitions.
+.B Please, read the DOS-mode section if you want DOS-compatible partitions.
 .B fdisk
-does not care about cylinders boundary by default.
+does not care about cylinder boundaries by default.
 .RE
 
-.B BSD/SUN-type
+.B BSD/Sun-type
 .RS
-disklabel can describe 8 partitions, the third of which should be a `whole
+A BSD/Sun disklabel can describe 8 partitions, the third of which should be a `whole
 disk' partition.  Do not start a partition that actually uses its first sector
 (like a swap partition) at cylinder 0, since that will destroy the disklabel.
-Note that
+Note that a
 .B BSD label
-is usually nested within DOS partition.
+is usually nested within a DOS partition.
 .RE
 
 .B IRIX/SGI-type
 .RS
-disklabel can describe 16 partitions, the eleventh of which should be an entire
+An IRIX/SGI disklabel can describe 16 partitions, the eleventh of which should be an entire
 `volume' partition, while the ninth should be labeled `volume header'.  The
 volume header will also cover the partition table, i.e., it starts at block
 zero and extends by default over five cylinders.  The remaining space in the
@@ -188,14 +190,14 @@ label only when working with Linux on IRIX/SGI machines or IRIX/SGI disks under
 Linux.
 .RE
 
-A sync() and an ioctl(BLKRRPART) (reread partition table from disk)
+A sync() and an ioctl(BLKRRPART) (rereading the partition table from disk)
 are performed before exiting when the partition table has been updated.
 
 .SH "DOS mode and DOS 6.x WARNING"
-.B Note that all this deprecated. You don't have to care about things like
-.B geometry and cylinders on modern operation systems. If you really want
-.B DOS compatible partitioning then you have to enable DOS-mode and cylinder
-.B units by '-c=dos -u=cylinders' fdisk command line options.
+.B Note that all this is deprecated.  You don't have to care about things like
+.B geometry and cylinders on modern operating systems.  If you really want
+.B DOS-compatible partitioning then you have to enable DOS mode and cylinder
+.B units by using the '-c=dos -u=cylinders' fdisk command-line options.
 
 The DOS 6.x FORMAT command looks for some information in the first sector of
 the data area of the partition, and treats this information as more reliable
@@ -204,19 +206,20 @@ clear the first 512 bytes of the data area of a partition whenever a size
 change occurs.  DOS FORMAT will look at this extra information even if the /U
 flag is given -- we consider this a bug in DOS FORMAT and DOS FDISK.
 
-The bottom line is that if you use cfdisk or fdisk to change the size of a DOS
-partition table entry, then you must also use .B dd to zero the first 512 bytes
+The bottom line is that if you use \fBfdisk\fR or \fBcfdisk\R to change the
+size of a DOS partition table entry, then you must also use
+.BR dd "(1) to " "zero the first 512 bytes"
 of that partition before using DOS FORMAT to format the partition.  For
-example, if you were using cfdisk to make a DOS partition table entry for
-/dev/sda1, then (after exiting fdisk or cfdisk and rebooting Linux so that the
+example, if you were using \fBfdisk\fR to make a DOS partition table entry for
+/dev/sda1, then (after exiting \fBfdisk\fR and rebooting Linux so that the
 partition table information is valid) you would use the command "dd
 if=/dev/zero of=/dev/sda1 bs=512 count=1" to zero the first 512 bytes of the
 partition.
 
 .B fdisk
-usually obtain the disk geometry automatically.  This is not necessarily the
+usually obtains the disk geometry automatically.  This is not necessarily the
 physical disk geometry (indeed, modern disks do not really have anything like a
-physical geometry, certainly not something that can be described in simplistic
+physical geometry, certainly not something that can be described in the simplistic
 Cylinders/Heads/Sectors form), but it is the disk geometry that MS-DOS uses for
 the partition table.
 
@@ -240,7 +243,7 @@ this is unlikely to cause difficulty unless you have OS/2 on your machine.
 
 For best results, you should always use an OS-specific partition table
 program.  For example, you should make DOS partitions with the DOS FDISK
-program and Linux partitions with the Linux fdisk or Linux cfdisk program.
+program and Linux partitions with the Linux fdisk or Linux cfdisk programs.
 
 .SH AUTHORS
 .MT kzak@xxxxxxxxxx
-- 
1.7.0.4

From 6ee79839ec040a83c51d04f6ea20ac86fccd3c07 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 19:49:11 +0200
Subject: [PATCH 04/11] last: remove mistaken -F, --fullnames entry from the man page

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 login-utils/last.1 |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/login-utils/last.1 b/login-utils/last.1
index 0cbfbec..8eb5b82 100644
--- a/login-utils/last.1
+++ b/login-utils/last.1
@@ -143,9 +143,6 @@ For non-local logins, Linux stores not only the host name of the remote
 host but its IP number as well.  This option translates the IP number
 back into a hostname.
 .TP
-\fB\-F\fR, \fB\-\-fullnames\fR
-Print full login and logout times and dates.
-.TP
 \fB\-i\fR, \fB\-\-ip\fR
 This option is like
 .B \-\-dns
-- 
1.7.0.4

From 53c1d48cd2976095b1d6f64553f582005f4b8a2f Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 20:30:01 +0200
Subject: [PATCH 05/11] docs: mention in ReleaseNotes only PO files that were actually updated

Also tweak wording a bit and remove a duplicate line.

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 Documentation/releases/v2.24-ReleaseNotes |   43 +++++++---------------------
 1 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/Documentation/releases/v2.24-ReleaseNotes b/Documentation/releases/v2.24-ReleaseNotes
index ca5b7bc..f6cff4b 100644
--- a/Documentation/releases/v2.24-ReleaseNotes
+++ b/Documentation/releases/v2.24-ReleaseNotes
@@ -7,19 +7,19 @@ Release highlights
 
 fdisk(8):
  - the code has been completely refactored and moved to libfdisk
-   (the library does not have stable API yet)
+   (the library does not have a stable API yet)
  - user interface has been unified for all label types and it supports colors
  - GPT disk UUID, partition UUID and partition name modification is supported now
 
 pylibmount:
- - this new library provides PYTHON BINDING for libmount; use 
-   --with-python[=2|3] to enable the binding
+ - this new library provides PYTHON BINDINGS for libmount;
+   use --with-python[=2|3] to enable the bindings
 
 last(1) and lastb(1):
  - the NEW IMPLEMENTATION has been merged from sysvinit to util-linux and
-   extended; now it supports command line options --present, --since and
+   extended; now it supports command line options --present, --since, and
    --time-format
- - use --enable-deprecated-last to enable old util-linux last(1) implementation
+ - use --enable-deprecated-last to enable the old util-linux last(1) implementation
 
 swapon(8):
  - the option --discard= and fstab mount option discard= allow to explicitly
@@ -28,7 +28,7 @@ swapon(8):
 
 libblkid and blkid(8):
  - supports LOGUUID= for external logs (e.g. extN and XFS)
- - generates pseudo PARTUUID= for MBR partitions (based on MBR Id, Linux kernel 
+ - generates a pseudo PARTUUID= for MBR partitions (based on MBR Id, Linux kernel
    supports the same concept for root= command line option)
 
 agetty(8):
@@ -53,17 +53,17 @@ lscpu(1):
    and Min CPU Mhz
 
 unshare(8):
- - supportes new command line options --fork and --mount-proc for
+ - supports new command line options --fork and --mount-proc for
    pid namespaces
 
 wipefs(8):
-  - now wipes superblock with incorrect checksums too
+  - now wipes superblocks with incorrect checksums too
   - supports new command line option --backup to backup erased data to
     $HOME/wipefs-<devname>-<offset>.bak
 
 nologin(8):
   - this command has been merged into util-linux, the command politely
-    refuse a login.
+    refuses a login.
 
 
 Stable maintenance releases between v2.23 and v2.24
@@ -619,34 +619,16 @@ partx:
    - use TT_FL_FREEDATA for tt table  [Karel Zak]
 pg:
    - check writing to a file was successful  [Sami Kerola]
-pg.c:
-   - Add --help and --version  [Jari Aalto]
+   - add --help and --version  [Jari Aalto]
 po:
    - merge changes  [Karel Zak]
-   - update ca.po (from translationproject.org)  [Josep Puigdemont]
    - update cs.po (from translationproject.org)  [Petr PísaÅ?]
-   - update da.po (from translationproject.org)  [Joe Hansen]
-   - update de.po (from translationproject.org)  [Arun Persaud]
-   - update es.po (from translationproject.org)  [Santiago Vila Doncel]
-   - update et.po (from translationproject.org)  [Meelis Roos]
-   - update eu.po (from translationproject.org)  [Mikel Olasagasti Uranga]
    - update fi.po (from translationproject.org)  [Lauri Nurmi]
    - update fr.po (from translationproject.org)  [David Prévot]
-   - update gl.po (from translationproject.org)  [Fran Diéguez]
-   - update hr.po (from translationproject.org)  [Tomislav Krznar]
-   - update hu.po (from translationproject.org)  [Gabor Kelemen]
-   - update id.po (from translationproject.org)  [Arif E. Nugroho]
-   - update it.po (from translationproject.org)  [Marco Colombo]
-   - update ja.po (from translationproject.org)  [Takeshi Hamasaki]
    - update nl.po (from translationproject.org)  [Benno Schulenberg]
    - update pl.po (from translationproject.org)  [Jakub Bogusz]
-   - update pt_BR.po (from translationproject.org)  [Rodrigo Stulzer Lopes]
-   - update ru.po (from translationproject.org)  [Pavel Maryanov]
-   - update sl.po (from translationproject.org)  [Simon Mihevc]
-   - update sv.po (from translationproject.org)  [Daniel Nylander]
-   - update tr.po (from translationproject.org)  [Nilgün Belma Bugüner]
+   - update pt_BR.po (from translationproject.org)  [Rafael Ferreira]
    - update uk.po (from translationproject.org)  [Yuri Chornoivan]
-   - update util-linux.pot (from translationproject.org)  [FULL NAME]
    - update vi.po (from translationproject.org)  [Trần Ng�c Quân]
    - update zh_CN.po (from translationproject.org)  [Wylmer Wang]
    - update zh_TW.po (from translationproject.org)  [Wei-Lun Chao]
@@ -796,5 +778,3 @@ wipefs:
    - clean up code  [Karel Zak]
 write:
    - change determination can user write to a terminal  [Sami Kerola]
-
-- change determination can user write to a terminal  [Sami Kerola]
-- 
1.7.0.4

From 2f0c3a246d2ad9ddbd045bbf606962a5df93b1ab Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 21:49:42 +0200
Subject: [PATCH 06/11] docs: tweak wording and formatting of last man page

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 login-utils/last.1 |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/login-utils/last.1 b/login-utils/last.1
index 8eb5b82..de81810 100644
--- a/login-utils/last.1
+++ b/login-utils/last.1
@@ -20,13 +20,13 @@ last, lastb \- show listing of last logged in users
 .SH SYNOPSIS
 .B last
 .RI [ options ]
-.RI [ username... ]
-.RI [ tty... ]
+.RI [ username ...]
+.RI [ tty ...]
 .br
 .B lastb
 .RI [ options ]
-.RI [ username... ]
-.RI [ tty... ]
+.RI [ username ...]
+.RI [ tty ...]
 .SH DESCRIPTION
 .B last
 searches back through the file
@@ -34,22 +34,18 @@ searches back through the file
 (or the file designated by the
 .B \-f
 option) and displays a list of all users logged in (and out) since that
-file was created.
-.I Names
-of users and
-.IR tty 's
+file was created.  One or more
+.IR usernames " and/or " ttys
 can be given, in which case
 .B last
-will show only those entries matching the arguments.  Names of
+will show only the entries matching those arguments.  Names of
 .I ttys
 can be abbreviated, thus
 .B last 0
 is the same as
 .BR "last tty0" .
 .PP
-When
-.B last
-catches a \s-2SIGINT\s0 signal (generated by the interrupt key, usually
+When catching a \s-2SIGINT\s0 signal (generated by the interrupt key, usually
 control-C) or a \s-2SIGQUIT\s0 signal,
 .B last
 will show how far it has searched through the file; in the case of the
@@ -74,11 +70,11 @@ which contains all the bad login attempts.
 \fB\-f\fR, \fB\-\-file\fR \fIfile\fR
 Tell
 .B last
-to use a specific file instead of
+to use a specific \fIfile\fR instead of
 .BR /var/log/wtmp .
 The
-.BI \-\-file " file"
-can be specified multiple times, and all of the defined files will be
+.B \-\-file
+option can be given multiple times, and all of the specified files will be
 processed.
 .TP
 \fB\-\fInumber\fR
@@ -100,10 +96,10 @@ Display the state of logins until the specified
 .IR time .
 .TP
 \fB\-p\fR, \fB\-\-present\fR \fItime\fR
-Display users who were present at the specified time.  This option is
-similar with
-.BR \-\-since " and " \-\-until ,
-without printing any other lines than the matching sessions.
+Display the users who were present at the specified time.  This is
+like using the options
+.BR \-\-since " and " \-\-until
+together with the same \fItime\fR.
 .TP
 \fB\-\-time\-format\fR \fIformat\fR
 Define output timestamp
@@ -155,9 +151,9 @@ Display full user and domain names in the output.
 \fB\-x\fR, \fB\-\-system\fR
 Display the system shutdown entries and run level changes.
 .SH TIME FORMATS
-The options that take
+The options that take the
 .I time
-argument will understand the following formats:
+argument understand the following formats:
 .TS
 left l2 l.
 YYYYMMDDhhmmss
-- 
1.7.0.4

From 5ad2b973047c7d00717d32d717baf50a69a07267 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 22:33:59 +0200
Subject: [PATCH 07/11] docs: sort options in last man page alphabetically

And use the option formatting with macros.

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 login-utils/last.1 |   90 ++++++++++++++++++++++++++--------------------------
 1 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/login-utils/last.1 b/login-utils/last.1
index de81810..d0b9744 100644
--- a/login-utils/last.1
+++ b/login-utils/last.1
@@ -14,7 +14,7 @@
 .\" along with this program; if not, write to the Free Software
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 .\"
-.TH "LAST,LASTB" "1" "August 2013" "util-linux" "User Commands"
+.TH "LAST, LASTB" "1" "October 2013" "util-linux" "User Commands"
 .SH NAME
 last, lastb \- show listing of last logged in users
 .SH SYNOPSIS
@@ -67,7 +67,17 @@ except that by default it shows a log of the file
 which contains all the bad login attempts.
 .SH OPTIONS
 .TP
-\fB\-f\fR, \fB\-\-file\fR \fIfile\fR
+.BR \-a , " \-\-hostlast"
+Display the hostname in the last column.  Useful in combination with the
+.B \-\-dns
+option.
+.TP
+.BR \-d , " \-\-dns"
+For non-local logins, Linux stores not only the host name of the remote
+host but its IP number as well.  This option translates the IP number
+back into a hostname.
+.TP
+.BR \-f , " \-\-file " \fIfile\fR
 Tell
 .B last
 to use a specific \fIfile\fR instead of
@@ -77,78 +87,68 @@ The
 option can be given multiple times, and all of the specified files will be
 processed.
 .TP
-\fB\-\fInumber\fR
+.BR \-F , " \-\-fulltimes"
+Print full login and logout times and dates.
+.TP
+.BR \-i , " \-\-ip"
+Like
+.B \-\-dns
+but displays the host's IP number instead of name.
+.TP
+.BI \- number
 .TQ
-\fB\-n\fR, \fB\-\-limit\fR \fInumber\fR
+.BR \-n , " -\-limit " \fInumber\fR
 This is a count telling
 .B last
 how many lines to show.
 .TP
-\fB\-s\fR, \fB\-\-since\fR \fItime\fR
+.BR \-p , " \-\-present " \fItime\fR
+Display the users who were present at the specified time.  This is
+like using the options
+.TP
+.BR \-R , " \-\-nohostname"
+Suppresses the display of the hostname field.
+.BR \-\-since " and " \-\-until
+together with the same \fItime\fR.
+.TP
+.BR \-s , " \-\-since " \fItime\fR
 Display the state of logins since specified
 .IR time .
 This is useful, e.g., to determine easily who was logged in at a
 particular time.  The option is often combined with
 .BR \-\-until .
 .TP
-\fB\-t\fR, \fB\-\-until\fR \fItime\fR
+.BR \-t , " \-\-until " \fItime\fR
 Display the state of logins until the specified
 .IR time .
 .TP
-\fB\-p\fR, \fB\-\-present\fR \fItime\fR
-Display the users who were present at the specified time.  This is
-like using the options
-.BR \-\-since " and " \-\-until
-together with the same \fItime\fR.
-.TP
-\fB\-\-time\-format\fR \fIformat\fR
-Define output timestamp
+.BI \-\-time\-format " format"
+Define the output timestamp
 .I format
-to be one of the
+to be one of
 .IR notime ,
 .IR short ,
 .IR full ,
 or
 .IR iso .
+The
 .I notime
-will not print timestamp at all.
+variant will not print any timestamp at all,
 .I short
-is default, and
+is the default, and
 .I full
-is same as
+is the same as the
 .B \-\-fulltimes
 option.  The
 .I iso
-will display time stamp in ISO-8601 format.  The iso format contains
-timezone information making it to be preferrable when print outs are
+variant will display the timestamp in ISO-8601 format.  The ISO format
+contains timezone information, making it preferrable when printouts are
 investigated outside of the system.
 .TP
-\fB\-F\fR, \fB\-\-fulltimes\fR
-Print full login and logout times and dates.
-.TP
-\fB\-R\fR, \fB\-\-nohostname\fR
-Suppresses the display of the hostname field.
-.TP
-\fB\-a\fR, \fB\-\-hostlast\fR
-Display the hostname in the last column.  Useful in combination with the
-.B \-\-dns
-option.
-.TP
-\fB\-d\fR, \fB\-\-dns\fR
-For non-local logins, Linux stores not only the host name of the remote
-host but its IP number as well.  This option translates the IP number
-back into a hostname.
-.TP
-\fB\-i\fR, \fB\-\-ip\fR
-This option is like
-.B \-\-dns
-in that it displays the remote host, but it displays the host in IP
-number notation.
-.TP
-\fB\-w\fR, \fB\-\-fullnames\fR
-Display full user and domain names in the output.
+.BR \-w , " \-\-fullnames"
+Display full user names and domain names in the output.
 .TP
-\fB\-x\fR, \fB\-\-system\fR
+.BR \-x , " \-\-system"
 Display the system shutdown entries and run level changes.
 .SH TIME FORMATS
 The options that take the
-- 
1.7.0.4

From e240d7e63f019722ec1bb059aa22e8a5e9eb8a1d Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sat, 12 Oct 2013 23:18:29 +0200
Subject: [PATCH 08/11] docs: improve grammar, wording and formatting of su man page

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 login-utils/su.1 |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/login-utils/su.1 b/login-utils/su.1
index e48a4f3..1d81762 100644
--- a/login-utils/su.1
+++ b/login-utils/su.1
@@ -1,14 +1,16 @@
-.TH SU "1" "June 2012" "util-linux" "User Commands"
+.TH SU "1" "October 2013" "util-linux" "User Commands"
 .SH NAME
 su \- run a command with substitute user and group ID
 .SH SYNOPSIS
 .B su
-[options...] [\-] [user [args...]]
+.RI [ options ]
+.RB [ \- ]
+.RI [ user " [" argument ...]]
 .SH DESCRIPTION
 .B su
-allows to run commands with substitute user and group ID.
+allows to run commands with a substitute user and group ID.
 .PP
-When called without arguments
+When called without arguments,
 .B su
 defaults to running an interactive shell as
 .IR root .
@@ -28,7 +30,7 @@ if the target
 .I user
 is not root).  It is recommended to always use the
 .B \-\-login
-option (instead it's shortcut
+option (instead of its shortcut
 .BR \- )
 to avoid side effects caused by mixing environments.
 .PP
@@ -37,11 +39,11 @@ This version of
 uses PAM for authentication, account and session management.  Some
 configuration options found in other
 .B su
-implementations such as e.g. support of a wheel group have to be
+implementations, such as support of a wheel group, have to be
 configured via PAM.
 .SH OPTIONS
 .TP
-\fB\-c\fR \fIcommand\fR, \fB\-\-command\fR=\fIcommand\fR
+\fB\-c\fR, \fB\-\-command\fR=\fIcommand\fR
 Pass
 .I command
 to the shell with the
@@ -56,14 +58,13 @@ but do not create a new session (discouraged).
 \fB\-f\fR, \fB\-\-fast\fR
 Pass
 .B \-f
-to the shell which may or may not be useful depending on the
-shell.
+to the shell, which may or may not be useful, depending on the shell.
 .TP
 \fB\-g\fR, \fB\-\-group\fR=\fIgroup\fR\fR
-specify the primary group, this option is allowed for root user only
+Specify the primary group.  This option is available for the root user only.
 .TP
 \fB\-G\fR, \fB\-\-supp-group\fR=\fIgroup\fR\fR
-specify a supplemental group, this option is allowed for root user only
+Specify a supplemental group.  This option is available for the root user only.
 .TP
 \fB\-\fR, \fB\-l\fR, \fB\-\-login\fR
 Starts the shell as login shell with an environment similar to a real
@@ -71,7 +72,7 @@ login:
 .RS 10
 .TP
 o
-clears all environment variables except for
+clears all environment variables except
 .B TERM
 .TP
 o
@@ -79,7 +80,7 @@ initializes the environment variables
 .BR HOME ,
 .BR SHELL ,
 .BR USER ,
-.BR LOGNAME ,
+.BR LOGNAME ", and"
 .B PATH
 .TP
 o
@@ -92,17 +93,17 @@ in order to make the shell a login shell
 .RE
 .TP
 \fB\-m\fR, \fB\-p\fR, \fB\-\-preserve-environment\fR
-Preserves the whole environment, ie does not set
+Preserves the whole environment, i.e. it does not set
 .BR HOME ,
 .BR SHELL ,
 .B USER
 nor
 .BR LOGNAME .
-The option is ignored if the option \fB\-\-login\fR is specified.
+This option is ignored if the option \fB\-\-login\fR is specified.
 .TP
-\fB\-s\fR \fISHELL\fR, \fB\-\-shell\fR=\fISHELL\fR
-Runs the specified shell instead of the default.  The shell to run is
-selected according to the following rules in order:
+\fB\-s\fR, \fB\-\-shell\fR=\fIshell\fR
+Runs the specified \fIshell\fR instead of the default.  The shell to run is
+selected according to the following rules, in order:
 .RS 10
 .TP
 o
@@ -110,11 +111,11 @@ the shell specified with
 .B \-\-shell
 .TP
 o
-The shell specified in the environment variable
-.B SHELL
+the shell specified in the environment variable
+.BR SHELL ,
 if the
 .B \-\-preserve-environment
-option is used.
+option is used
 .TP
 o
 the shell listed in the passwd entry of the target user
@@ -124,7 +125,7 @@ o
 .RE
 .IP
 If the target user has a restricted shell (i.e. not listed in
-/etc/shells) the
+/etc/shells), the
 .B \-\-shell
 option and the
 .B SHELL
@@ -142,7 +143,7 @@ Upon receiving either
 or
 .BR SIGTERM ,
 .BR su
-terminates it's child and afterwards terminates itself with
+terminates its child and afterwards terminates itself with
 the received signal.
 .SH CONFIG FILES
 .B su
@@ -175,7 +176,7 @@ default value is
 .B ENV_SUPATH
 (string)
 .RS 4
-Defines the PATH environment variable for root. The default value is
+Defines the PATH environment variable for root.  The default value is
 .IR /usr/local/sbin:\:/usr/local/bin:\:/sbin:\:/bin:\:/usr/sbin:\:/usr/bin .
 .RE
 .PP
-- 
1.7.0.4

From 1cbff1a8a374d2620c17b6487b43b15ae2d80ec2 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 13 Oct 2013 12:54:58 +0200
Subject: [PATCH 09/11] docs: improve a bit the wording on the logger man page

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 misc-utils/logger.1 |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index f4cadc6..62449a7 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -38,7 +38,7 @@
 logger \- a shell command interface to the syslog(3) system log module
 .SH SYNOPSIS
 .B logger
-[options] [message]
+.RI [ options "] [" message ]
 .SH DESCRIPTION
 .B logger
 makes entries in the system log.  It provides a shell command
@@ -54,17 +54,17 @@ instead of to the builtin syslog routines.  Unless
 .B \-\-udp
 or
 .B \-\-tcp
-is specified the logger will first try to use UDP, but if it fails a TCP
-connection is attempted.
+is specified, \fBlogger\fR will first try to use UDP,
+but if thist fails a TCP connection is attempted.
 .TP
 \fB\-d\fR, \fB\-\-udp\fR
-Use datagram (UDP) only.  By default the connection is tried to
+Use datagram (UDP) only.  By default the connection is tried to the
 .I syslog
 port defined in /etc/services, which is often
 .IR 514 .
 .TP
 \fB\-T\fR, \fB\-\-tcp\fR
-Use stream (TCP) only.  By default the connection is tried to
+Use stream (TCP) only.  By default the connection is tried to the
 .I syslog-conn
 port defined in /etc/services, which is often
 .IR 601 .
@@ -110,15 +110,15 @@ Write to the specified
 instead of to the builtin syslog routines.
 .TP
 \fB\-\-prio\-prefix\fR
-Look for a syslog prefix on every line read from standard input, a
-number contained within angle brackets that contain both the facility
-and level. The decimal prefix is constructed by multiplying the
-facility by 8 and then adding the level, thus \fIlocal0.info\fR,
+Look for a syslog prefix on every line read from standard input.
+This prefix is a number within angle brackets that contains both the facility
+and the level.  This decimal prefix is constructed by multiplying the
+facility by 8 and then adding the level.  Thus, for example, \fIlocal0.info\fR,
 facility=16 and level=6, becomes \fI<134>\fR.
 
 If the prefix contains no facility, the facility defaults to what is
-specified by \fB\-p\fR option, similarly if no prefix is provided the
-line is logged using the \fB\-p\fR \fIpriority\fR.
+specified by the \fB\-p\fR option.  Similarly, if no prefix is provided,
+the line is logged using the \fB\-p\fR \fIpriority\fR.
 
 This option doesn't affect a command-line message.
 .TP
@@ -131,8 +131,8 @@ End the argument list.  This is to allow the
 to start with a hyphen (\-).
 .TP
 .I message
-Write the message to log; if not specified, and the
-.I \-f
+Write this \fImessage\fR to the log; if not specified, and the
+.B \-f
 flag is not provided, standard input is logged.
 .PP
 The
-- 
1.7.0.4

From 4e6904d74025da040b6ca013d075a5af3a2cead9 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 13 Oct 2013 21:01:07 +0200
Subject: [PATCH 10/11] docs: sort the options in the logger man page alphabetically

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 misc-utils/logger.1 |   62 +++++++++++++++++++++++++-------------------------
 1 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/misc-utils/logger.1 b/misc-utils/logger.1
index 62449a7..c680ec8 100644
--- a/misc-utils/logger.1
+++ b/misc-utils/logger.1
@@ -47,6 +47,19 @@ interface to the
 system log module.
 .SH OPTIONS
 .TP
+\fB\-d\fR, \fB\-\-udp\fR
+Use datagram (UDP) only.  By default the connection is tried to the
+.I syslog
+port defined in /etc/services, which is often
+.IR 514 .
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Display a help text and exit.
+.TP
+\fB\-i\fR, \fB\-\-id\fR
+Log the process ID of the logger process with each line.
+.TP
+.TP
 \fB\-n\fR, \fB\-\-server\fR \fIserver\fR
 Write to the specified remote syslog
 .I server
@@ -57,33 +70,14 @@ or
 is specified, \fBlogger\fR will first try to use UDP,
 but if thist fails a TCP connection is attempted.
 .TP
-\fB\-d\fR, \fB\-\-udp\fR
-Use datagram (UDP) only.  By default the connection is tried to the
-.I syslog
-port defined in /etc/services, which is often
-.IR 514 .
-.TP
-\fB\-T\fR, \fB\-\-tcp\fR
-Use stream (TCP) only.  By default the connection is tried to the
-.I syslog-conn
-port defined in /etc/services, which is often
-.IR 601 .
-.TP
 \fB\-P\fR, \fB\-\-port\fR \fIport\fR
 Use the specified
 .IR port .
-.TP
-\fB\-i\fR, \fB\-\-id\fR
-Log the process ID of the logger process with each line.
-.TP
 \fB\-f\fR, \fB\-\-file\fR \fIfile\fR
 Log the contents of the specified
 .IR file .
 This option cannot be combined with a command-line message.
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Display a help text and exit.
-.TP
 \fB\-p\fR, \fB\-\-priority\fR \fIpriority\fR
 Enter the message into the log with the specified
 .IR priority  .
@@ -97,18 +91,6 @@ logs the message as informational in the local3 facility.
 The default is
 .IR user.notice .
 .TP
-\fB\-s\fR, \fB\-\-stderr\fR
-Output the message to standard error as well as to the system log.
-.TP
-\fB\-t\fR, \fB\-\-tag\fR \fItag\fR
-Mark every line to be logged with the specified
-.IR tag .
-.TP
-\fB\-u\fR, \fB\-\-socket\fR \fIsocket\fR
-Write to the specified
-.I socket
-instead of to the builtin syslog routines.
-.TP
 \fB\-\-prio\-prefix\fR
 Look for a syslog prefix on every line read from standard input.
 This prefix is a number within angle brackets that contains both the facility
@@ -122,6 +104,24 @@ the line is logged using the \fB\-p\fR \fIpriority\fR.
 
 This option doesn't affect a command-line message.
 .TP
+\fB\-s\fR, \fB\-\-stderr\fR
+Output the message to standard error as well as to the system log.
+.TP
+\fB\-T\fR, \fB\-\-tcp\fR
+Use stream (TCP) only.  By default the connection is tried to the
+.I syslog-conn
+port defined in /etc/services, which is often
+.IR 601 .
+.TP
+\fB\-t\fR, \fB\-\-tag\fR \fItag\fR
+Mark every line to be logged with the specified
+.IR tag .
+.TP
+\fB\-u\fR, \fB\-\-socket\fR \fIsocket\fR
+Write to the specified
+.I socket
+instead of to the builtin syslog routines.
+.TP
 \fB\-V\fR, \fB\-\-version\fR
 Display version information and exit.
 .TP
-- 
1.7.0.4

From 4a6e534b0be8de65734ab3c889400f2b76490e6d Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Sun, 13 Oct 2013 21:52:07 +0200
Subject: [PATCH 11/11] docs: improve formatting and wording of the getopt man page

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 misc-utils/getopt.1 |   53 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/misc-utils/getopt.1 b/misc-utils/getopt.1
index 8c4f9f5..3c52908 100644
--- a/misc-utils/getopt.1
+++ b/misc-utils/getopt.1
@@ -2,11 +2,20 @@
 .SH NAME
 getopt \- parse command options (enhanced)
 .SH SYNOPSIS
-getopt optstring parameters
+.BI getopt
+.I optstring parameters
 .br
-getopt [options] [\-\-] optstring parameters
+.B getopt
+.RI [ options ]
+.RB [ \-\- ]
+.I optstring parameters
 .br
-getopt [options] \-o|\-\-options optstring [options] [\-\-]
+.B getopt
+.RI [ options ]
+.BR \-o | \-\-options
+.I optstring
+.RI [ options ]
+.RB [ \-\- ]
 .I parameters
 .SH DESCRIPTION
 .B getopt
@@ -21,10 +30,11 @@ routines to do this.
 The parameters
 .B getopt
 is called with can be divided into two parts: options which modify
-the way getopt will parse
-.RI ( options
-and
-.BR \-o | \-\-options
+the way
+.B getopt
+will do the parsing
+.RI "(the " options
+and the
 .I optstring
 in the
 .BR SYNOPSIS ),
@@ -44,10 +54,10 @@ part is used as the short options string.
 .PP
 If the environment variable
 .B GETOPT_COMPATIBLE
-is set, or if its first parameter is not an option (does not start
+is set, or if the first \fIparameter\fR is not an option (does not start
 with a
 .RB ' \- ',
-this is the first format in the
+the first format in the
 .BR SYNOPSIS ),
 .B getopt
 will generate output that is compatible with that of other versions of
@@ -129,11 +139,11 @@ Disable error reporting by getopt(3).
 Do not generate normal output.  Errors are still reported by
 .BR getopt (3),
 unless you also use
-.IR \-q .
+.BR \-q .
 .TP
 .BR \-s , " \-\-shell \fIshell\fP"
-Set quoting conventions to those of shell.  If no \-s argument is
-found, the
+Set quoting conventions to those of \fIshell\fR.
+If the \fB\-s\fR option is not given, the
 .SM BASH
 conventions are used.  Valid arguments are currently
 .RB ' sh '
@@ -193,7 +203,7 @@ A simple short option is a
 .RB ' \- '
 followed by a short option character.  If the option has a required
 argument, it may be written directly after the option character or as
-the next parameter (ie.  separated by whitespace on the command
+the next parameter (i.e. separated by whitespace on the command
 line).  If the option has an optional argument, it must be written
 directly after the option character if present.
 .PP
@@ -340,8 +350,8 @@ If the first character is
 .RB ' + ',
 or if the environment variable
 .B POSIXLY_CORRECT
-is set, parsing stops as soon as the first non\-option parameter (ie.
-a parameter that does not start with a
+is set, parsing stops as soon as the first non\-option parameter
+(i.e. a parameter that does not start with a
 .RB ' \- ')
 is found that is not an option argument.  The remaining parameters
 are all interpreted as non\-option parameters.
@@ -365,10 +375,11 @@ modifications, and with some advantages.
 .PP
 If the first character of the first parameter of getopt is not a
 .RB ' \- ',
-getopt goes into compatibility mode.  It will interpret its first
+.B getopt
+goes into compatibility mode.  It will interpret its first
 parameter as the string of short options, and all other arguments
-will be parsed.  It will still do parameter shuffling (ie.  all
-non\-option parameters are outputted at the end), unless the
+will be parsed.  It will still do parameter shuffling (i.e. all
+non\-option parameters are output at the end), unless the
 environment variable
 .B POSIXLY_CORRECT
 is set.
@@ -407,10 +418,10 @@ if it is called with
 Example scripts for (ba)sh and (t)csh are provided with the
 .BR getopt (1)
 distribution, and are optionally installed in
-.BR /usr/share/getopt/ 
-or 
+.BR /usr/share/getopt/
+or
 .BR /usr/share/docs/
-in util-linux subdirectory.
+in the util-linux subdirectory.
 .SH ENVIRONMENT
 .IP POSIXLY_CORRECT
 This environment variable is examined by the
-- 
1.7.0.4


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux