ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yurchor/util-linux 

* 'master' of https://github.com/yurchor/util-linux:
  Fix trivial typos
This commit is contained in:
Karel Zak 2015-08-26 10:52:49 +02:00
parent 3a131296d1 75a8e726e9
commit 0a9e11af22
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-utils/fdisk.c
View File

@ -723,7 +723,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(USAGE_OPTIONS, out);
fputs(_(" -b, --sector-size <size> physical and logical sector size\n"), out);
fputs(_(" -B, --protect-boot don't erase bootbits when creat a new label\n"), out);
fputs(_(" -B, --protect-boot don't erase bootbits when create a new label\n"), out);
fputs(_(" -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"), out);
fputs(_(" -L, --color[=<when>] colorize output (auto, always or never)\n"), out);
fprintf(out,

2
libfdisk/src/dos.c
View File

@ -1961,7 +1961,7 @@ static int dos_set_partition(struct fdisk_context *cxt, size_t n,
if (IS_EXTENDED(p->sys_ind) && !IS_EXTENDED(pa->type->code) && has_logical(cxt)) {
fdisk_warnx(cxt, _(
"Cannot change type of the extended partition which is "
"already used by logical partitons. Delete logical "
"already used by logical partitions. Delete logical "
"partitions first."));
return -EINVAL;
}

2
libfdisk/src/table.c
View File

@ -660,7 +660,7 @@ int fdisk_table_wrong_order(struct fdisk_table *tb)
* @tb: table
*
* Add partitions from table @tb to the in-memory disk label. See
* fdisk_add_partition(), fdisk_delete_all_partitions(). The partitons
* fdisk_add_partition(), fdisk_delete_all_partitions(). The partitions
* that does not define start (or does not follow the default start)
* are ingored.
*

2
sys-utils/zramctl.c
View File

@ -78,7 +78,7 @@ static const struct colinfo infos[] = {
[COL_MEMTOTAL] = { "TOTAL", 5, SCOLS_FL_RIGHT, N_("all memory including allocator fragmentation and metadata overhead") },
[COL_MEMLIMIT] = { "MEM-LIMIT", 5, SCOLS_FL_RIGHT, N_("memory limit used to store compressed data") },
[COL_MEMUSED] = { "MEM-USED", 5, SCOLS_FL_RIGHT, N_("memory zram have consumed to store compressed data") },
[COL_MIGRATED] = { "MIGRATED", 5, SCOLS_FL_RIGHT, N_("number of objects migrated migrated by compaction") },
[COL_MIGRATED] = { "MIGRATED", 5, SCOLS_FL_RIGHT, N_("number of objects migrated by compaction") },
[COL_MOUNTPOINT]= { "MOUNTPOINT",0.10, SCOLS_FL_TRUNC, N_("where the device is mounted") },
};