diff options
| author | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
| commit | 0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (patch) | |
| tree | 2e5237f1d4e2cac2efad97ce31abc386c1e37b6d /misc-utils/uuidgen.1 | |
| parent | 3cbdfd84fde6159d7778e70618fbbc8df219cafe (diff) | |
| parent | 6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc (diff) | |
| download | util-linux-old-0864d694ca05ea9383ef09bc1bc3a182e15e2ffa.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/Makefile.am
sys-utils/ipcs.c
tests/ts/blkid/images-fs/befs.img.bz2
tests/ts/blkid/images-fs/ddf-raid.img.bz2
Diffstat (limited to 'misc-utils/uuidgen.1')
| -rw-r--r-- | misc-utils/uuidgen.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1 index 18e33de7..32c98f1d 100644 --- a/misc-utils/uuidgen.1 +++ b/misc-utils/uuidgen.1 @@ -22,9 +22,9 @@ all UUIDs created on the local system, and among UUIDs created on other systems in the past and in the future. .PP -There are two types of UUID's which +There are two types of UUIDs which .B uuidgen -can generate: time-based UUID's and random-based UUID's. By +can generate: time-based UUIDs and random-based UUIDs. By default .B uuidgen will generate a random-based UUID if a high-quality random number |