Added manpages to doc build; update of doc.

diff --git a/build/Makebottom b/build/Makebottom
index 7ada9532c044e65957214809cf660050d15bb62c..1e254aea2507f919f6772fae7848f7948b4b3e88 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -18,7 +18,7 @@ programs: $(PROGS)
 datafiles: $(DATAFILES)
 tests: $(TESTS)
 configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
-docs: runtree $(DOCS) $(DOC_INDICES)
+docs: runtree $(DOCS) $(DOC_INDICES) $(MANPAGES)
 
 tags:
        etags `find . -name "*.[ch]"`

diff --git a/ucw/doc/Makefile b/ucw/doc/Makefile
index bef198c6197881492520c3a9900264b1546a3d51..952b200d9c566f449b22f7c3a7262eb1cc288925 100644 (file)
--- a/ucw/doc/Makefile
+++ b/ucw/doc/Makefile
@@ -7,16 +7,18 @@ UCW_INDEX=$(o)/ucw/doc/def_index.html
 UCW_DOCS_HTML=$(addprefix $(o)/ucw/doc/,$(addsuffix .html,$(UCW_DOCS)))
 
 UCW_SRC_MANPAGES=ucw-tableprinter
-UCW_MANPAGES=$(addprefix  $(o)/ucw/doc/,$(addsuffix .1,$(UCW_SRC_MANPAGES)))
+MANPAGES+=$(addprefix  $(o)/ucw/doc/,$(addsuffix .1,$(UCW_SRC_MANPAGES)))
 
 $(o)/ucw/doc/ucw-tableprinter.1: ucw/doc/ucw-tableprinter.txt
-       a2x -f manpage -D $(o)/ucw/doc/ $<
+       $(M)"MANPAGE $<"
+       $(Q)a2x -d manpage -f manpage $<
+       $(Q)mv ucw/doc/ucw-tableprinter.1 $(o)/ucw/doc/
 
 $(UCW_INDEX): DOC_HEAD=$(s)/ucw/doc/def_index.txt
 $(UCW_INDEX): DOC_LIST=$(patsubst %,$(o)/ucw/doc/%.deflist,$(UCW_DOCS))
 $(UCW_INDEX) $(UCW_DOCS_HTML): DOC_MODULE=ucw
 
-DOCS+=$(UCW_DOCS_HTML)
+DOCS+=$(UCW_DOCS_HTML) $(UCW_MANPAGES)
 DOC_INDICES+=$(UCW_INDEX)
 DOC_MODULES+=ucw
 
@@ -25,8 +27,8 @@ INSTALL_TARGETS+=install-libucw-docs
 endif
 
 .PHONY: install-libucw-docs
-install-libucw-docs: $(UCW_INDEX) $(UCW_DOCS_HTML) $(UCW_MANPAGES)
+install-libucw-docs: $(UCW_INDEX) $(UCW_DOCS_HTML) $(MANPAGES)
        install -d -m 755 $(DESTDIR)$(INSTALL_DOC_DIR)/ucw/
        install -m 644 $^ $(DESTDIR)$(INSTALL_DOC_DIR)/ucw/
-       install -d -m 755 $(DESTDIR)$(INSTALL_MAN_DIR)/man1
-       install -m 644 $(UCW_MANPAGES) $(DESTDIR)$(INSTALL_MAN_DIR)/man1
+       install -d -m 755 $(DESTDIR)$(INSTALL_MAN_DIR)/man1/
+       install -m 644 $(UCW_MANPAGES) $(DESTDIR)$(INSTALL_MAN_DIR)/man1/

diff --git a/ucw/doc/ucw-tableprinter.txt b/ucw/doc/ucw-tableprinter.txt
index d8c0165a254db1a41be3cec32d56650943b40246..af9d75d90976c5a5459db36b0a042bf00f35e450 100644 (file)
--- a/ucw/doc/ucw-tableprinter.txt
+++ b/ucw/doc/ucw-tableprinter.txt
@@ -57,7 +57,7 @@ cell format option `cells` can have one of the possible three values:
 `cells` option can be shortcutted as options `raw` and `pretty` with
 no value.
 
-Additionally to standart types (like integer, floating point) there
+Additionally to standard types (like integer, floating point) there
 are the two following types: 1) size; 2) timestamp. The 'size' type
 has the following case-sensitive column options: `KB`, `MB`, `GB`,
 `TB`, `auto`, e.g., a column of type size and name `file-size` can be