diff options
| author | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2011-01-31 20:15:49 -0700 |
| commit | 11292d25510e67c83c6580401eccd42d6d6da931 (patch) | |
| tree | ca5850da93c90f8798d7ff115e0124edffb8bb97 /partx | |
| parent | 4f9e177060fb5ad6e574598aefdf2d5f50a8b54f (diff) | |
| parent | 9f55bf3794ca98852dd1f352f993dea60d83a2e1 (diff) | |
| download | util-linux-old-11292d25510e67c83c6580401eccd42d6d6da931.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/mount.8
mount/mount.c
Diffstat (limited to 'partx')
| -rw-r--r-- | partx/addpart.8 | 2 | ||||
| -rw-r--r-- | partx/delpart.8 | 2 | ||||
| -rw-r--r-- | partx/partx.8 | 4 | ||||
| -rw-r--r-- | partx/partx.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/partx/addpart.8 b/partx/addpart.8 index 231cbfaf..1c928098 100644 --- a/partx/addpart.8 +++ b/partx/addpart.8 @@ -13,7 +13,7 @@ simple wrapper around the "add partition" ioctl .B addpart is a program that informs the Linux kernel of new partition. -This command doesn't manipulate with partitions on hard drive. +This command doesn't manipulate partitions on hard drive. .SH PARAMETERS .TP diff --git a/partx/delpart.8 b/partx/delpart.8 index 7dd93894..7f35fb9d 100644 --- a/partx/delpart.8 +++ b/partx/delpart.8 @@ -13,7 +13,7 @@ simple wrapper around the "del partition" ioctl .B delpart is a program that asks the Linux kernel to remove a partition. -This command doesn't manipulate with partitions on hard drive. +This command doesn't manipulate partitions on hard drive. .SH OPTIONS .TP diff --git a/partx/partx.8 b/partx/partx.8 index efd7dbd5..7af977f8 100644 --- a/partx/partx.8 +++ b/partx/partx.8 @@ -32,7 +32,7 @@ The .I disk argument is optional when a .I partition -argument is provided. It's possible to force scannig on partition (for example +argument is provided. It's possible to force scanning on partition (for example to list nested subpartitions), then the string "-" has to be used, for example: .RS @@ -115,7 +115,7 @@ Removes last partition on /dev/sdd. .BR parted (8), .BR partprobe (8) -.SH SEE ALSO +.SH AUTHORS .nf Davidlohr Bueso <dave@gnu.org> Karel Zak <kzak@redhat.com> diff --git a/partx/partx.c b/partx/partx.c index 85590c2b..efb627fc 100644 --- a/partx/partx.c +++ b/partx/partx.c @@ -7,7 +7,7 @@ * aeb, 2000-03-21 -- sah is 42 now * * Copyright (C) 2010 Davidlohr Bueso <dave@gnu.org> - * Rewritten to use libblkid for util-linux-ng + * Rewritten to use libblkid for util-linux * based on ideas from Karel Zak <kzak@redhat.com> */ |