diff options
author | Karel Zak | 2018-02-16 11:25:22 +0100 |
---|---|---|
committer | Karel Zak | 2018-02-16 11:25:22 +0100 |
commit | 7595bed1898109b34eb072093902071fcb75fea9 (patch) | |
tree | aeff32e56443932fa20e1f4611ff3e773ca20392 /libsmartcols | |
parent | fsck: coding style cleanup (diff) | |
parent | tests: use pgrep instead of ps --ppid ... (diff) | |
download | kernel-qcow2-util-linux-7595bed1898109b34eb072093902071fcb75fea9.tar.gz kernel-qcow2-util-linux-7595bed1898109b34eb072093902071fcb75fea9.tar.xz kernel-qcow2-util-linux-7595bed1898109b34eb072093902071fcb75fea9.zip |
Merge branch 'maybe-for-v2.32' of https://github.com/rudimeier/util-linux
* 'maybe-for-v2.32' of https://github.com/rudimeier/util-linux:
tests: use pgrep instead of ps --ppid ...
misc: fix typos using codespell
lsns: fix clang compiler warning
tests: add udevadm settle to sfdisk/resize
build-sys: disable bz2 tarball and fix some am warnings
Diffstat (limited to 'libsmartcols')
-rw-r--r-- | libsmartcols/docs/Makefile.am | 2 | ||||
-rw-r--r-- | libsmartcols/src/table.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libsmartcols/docs/Makefile.am b/libsmartcols/docs/Makefile.am index f84156ab6..e8a7600e9 100644 --- a/libsmartcols/docs/Makefile.am +++ b/libsmartcols/docs/Makefile.am @@ -67,7 +67,7 @@ HTML_IMAGES= # e.g. content_files=running.sgml building.sgml changes-2.0.sgml content_files = $(builddir)/version.xml -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded # These files must be listed here *and* in content_files # e.g. expand_content_files=running.sgml expand_content_files= diff --git a/libsmartcols/src/table.c b/libsmartcols/src/table.c index 408a95cc4..2a9fd1778 100644 --- a/libsmartcols/src/table.c +++ b/libsmartcols/src/table.c @@ -259,7 +259,7 @@ int scols_table_remove_columns(struct libscols_table *tb) * scols_table_move_column: * @tb: table * @pre: column before the column - * @cl: colum to move + * @cl: column to move * * Move the @cl behind @pre. If the @pre is NULL then the @col is the first * column in the table. |