Commit Graph

15438 Commits

Author SHA1 Message Date
Karel Zak 22a900a90f build-sys: add UL_REQUIRES_PROGRAM() macro, use it for asciidoc
* use our generic UL_BUILD_INIT() stuff for ENABLE_ASCIIDOC
* add UL_REQUIRES_PROGRAM()
* add "Manual pages: yes|no" to ./configure summary

Signed-off-by: Karel Zak <kzak@redhat.com>
2021-04-07 10:19:03 +02:00
Mario Blättermann 681f4a1e31 Asciidoc: Fix markup in example man page 2021-04-06 17:51:24 +02:00
Karel Zak 236421a491 build-sys: make man pages optional, add --disable-asciidoc
* don't use dist_noinst_DATA= for generated man pages (use man_MANS=)

* make asciidoctor optional

* add --disable-asciidoc to explicitly disable man pages

Addresses: https://github.com/karelzak/util-linux/issues/1257
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-04-06 17:22:36 +02:00
Karel Zak 53b37016c3 meson: generate man pages from asciidoc
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-04-06 15:32:46 +02:00
Karel Zak ae4e859f68 Merge branch 'more-fixes' of https://github.com/h-c-mueller/util-linux
* 'more-fixes' of https://github.com/h-c-mueller/util-linux:
  more: fix ARROW_DOWN and PAGE_DOWN behaviour to not skip lines
  more: fix command 'f' (screen forward) behaviour
2021-04-06 11:24:40 +02:00
Mario Blättermann 360946bb93 Asciidoc: Fix markup 2021-04-04 15:33:56 +02:00
Karel Zak ba3b935259 tests: update lscpu output
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-04-01 12:30:25 +02:00
Karel Zak 9dadd3e60c lscpu: report also number of cache instances
Caches (sum of all):
  L1d:                   128 KiB (4 instances)
  L1i:                   128 KiB (4 instances)
  L2:                    1 MiB (4 instances)
  L3:                    8 MiB (1 instance)

Suggested-by: John Henning <john.henning@oracle.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-04-01 12:27:05 +02:00
Karel Zak 8bb50864c1 build-sys: improve asciidoc generic rule
* keep it based on suffixes to make possible to generate individual
  pages in dependence on original .adoc
* use absolute builddir to be robust enough for 'make distcheck'
* make man page links depend on man pages

Signed-off-by: Karel Zak <kzak@redhat.com>
2021-04-01 11:47:21 +02:00
Mario Blättermann 69378d9bf4 Asciidoc: Remove artifact from merge conflict 2021-03-31 17:48:21 +02:00
Mario Blättermann 67467c9891 Asciidoc: Resolve merge conflict 2021-03-31 17:46:27 +02:00
Karel Zak e185f57e34 build-sys: cleanup distcheck options
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-31 11:57:22 +02:00
Karel Zak 625e9c61e8 build-sys: make man pages location independent
We need to evaluate "include::" directive relatively to project
top-level source directory rather than to the current document
location.

Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-31 11:50:47 +02:00
Mario Blättermann 7f29a25af9 Asciidoc: Convert man-common/README to Markdown 2021-03-29 20:19:59 +02:00
Mario Blättermann 3da93af26b po-man: Fix the example man page 2021-03-29 19:51:51 +02:00
Mario Blättermann b09a9007fd po-man: Fix typos in po-man/README.md 2021-03-29 19:47:36 +02:00
Mario Blättermann cde653e0f5 po-man: Update the example man page 2021-03-29 19:45:19 +02:00
Mario Blättermann f99003fb35 po-man: Add po-man/README.md 2021-03-29 19:30:04 +02:00
Mario Blättermann 8a66f33451 po-man: Add (incomplete) de.po for testing purposes 2021-03-29 19:13:54 +02:00
Karel Zak e2463a8f92 github: fix asciidoctror dependence
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-29 18:56:12 +02:00
Mario Blättermann 0a5bc73054 po-man: Add (incomplete) de.po for testing purposes 2021-03-29 18:55:08 +02:00
Mario Blättermann 2bee5365d3 po-man: Adjust paths in po4a.cfg and update .pot file 2021-03-29 18:31:26 +02:00
Mario Blättermann 61459fe4a4 po-man: Move Po4a config file and translation template to po-man 2021-03-29 18:21:17 +02:00
Karel Zak 1d997bbbec github: add ruby-asciidoctor to CI-build
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-29 15:26:37 +02:00
Karel Zak 6a23bf93fd docs: update Documentation/howto-man-page.txt
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-29 15:10:53 +02:00
Karel Zak 97c5380f9c Asciidoc: Incorporate latest changes in findmnt.8
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-29 15:10:53 +02:00
Karel Zak 25ce8fb1ed Merge remote-tracking branch 'mariobl/topic/asciidoc'
* mariobl/topic/asciidoc: (71 commits)
  Asciidoc: Update .pot template
  Asciidoc: Reorder example command sequence
  Asciidoc: Update .pot template
  Asciidoc: Better gettext message splitting in nsenter.1.adoc
  Asciidoc: Update .pot template
  Asciidoc: Fix typo and remove invisible spaces which confuse po4a
  Asciidoc: Update .pot template
  Asciidoc: Fix typo
  Asciidoc: Fix artifact from initial import, sixth attempt
  Asciidoc: Update .pot template
  Asciidoc: Fix artifacts from initial import, fifth attempt
  Asciidoc: Fix artifacts from initial import, fourth attempt
  Asciidoc: Update .pot template
  Asciidoc: Fix artifacts from initial import, third attempt
  Asciidoc: Fix artifacts from initial import, second attempt
  Asciidoc: Fix artifacts from initial import
  Asciidoc: Add po4a config file and initial translation template for man pages
  Asciidoc: Small indentation fix in mount.8.adoc
  Asciidoc: Review sys-utils man pages, part 2
  build-sys: fix out-of-tree build
  ...

Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-29 15:09:27 +02:00
Mario Blättermann 3a21355740 Asciidoc: Update .pot template 2021-03-28 14:31:13 +02:00
Mario Blättermann c8dae3d8fa Asciidoc: Reorder example command sequence 2021-03-28 14:29:45 +02:00
Mario Blättermann 982aa62baa Asciidoc: Update .pot template 2021-03-28 12:00:01 +02:00
Mario Blättermann 86cc47aa51 Asciidoc: Better gettext message splitting in nsenter.1.adoc 2021-03-28 11:58:08 +02:00
Mario Blättermann 5db1d29a04 Asciidoc: Update .pot template 2021-03-28 10:47:42 +02:00
Mario Blättermann 544e64e09e Asciidoc: Fix typo and remove invisible spaces which confuse po4a 2021-03-28 10:47:00 +02:00
Mario Blättermann 3cb9715628 Asciidoc: Update .pot template 2021-03-27 00:45:15 +01:00
Mario Blättermann ff6009fd20 Asciidoc: Fix typo 2021-03-27 00:30:37 +01:00
Mario Blättermann ab3e786dd1 Asciidoc: Fix artifact from initial import, sixth attempt 2021-03-27 00:10:27 +01:00
Mario Blättermann b81d59719b Asciidoc: Update .pot template 2021-03-26 21:42:47 +01:00
Mario Blättermann f933e53c31 Asciidoc: Fix artifacts from initial import, fifth attempt 2021-03-26 21:41:03 +01:00
Mario Blättermann f67dbc88ca Asciidoc: Fix artifacts from initial import, fourth attempt 2021-03-26 21:11:25 +01:00
Mario Blättermann 7a29fa6fe4 Asciidoc: Update .pot template 2021-03-26 20:55:26 +01:00
Mario Blättermann 9b7051d5bf Asciidoc: Fix artifacts from initial import, third attempt 2021-03-26 20:54:06 +01:00
Mario Blättermann 109525d66a Asciidoc: Fix artifacts from initial import, second attempt 2021-03-26 20:17:45 +01:00
Mario Blättermann b53360d8a8 Asciidoc: Fix artifacts from initial import 2021-03-26 20:12:42 +01:00
Mario Blättermann 36e96905f5 Asciidoc: Add po4a config file and initial translation template for man pages 2021-03-26 17:32:17 +01:00
Mario Blättermann 9637ed960a Asciidoc: Small indentation fix in mount.8.adoc 2021-03-26 17:29:16 +01:00
Mario Blättermann 4eab78d379 Asciidoc: Review sys-utils man pages, part 2 2021-03-26 17:19:27 +01:00
Mario Blättermann fc86ec98de
Merge pull request #1 from karelzak/asciidoc-for-mario
Asciidoc for mario
2021-03-26 14:35:55 +01:00
Karel Zak 92c380cbc3 build-sys: fix out-of-tree build
asciidoctor cannot write to source directory, we need to force it to
use $builddir.

Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-26 14:21:36 +01:00
Karel Zak 19feed6d96 build-sys: add man-common/Makemodule.am
Signed-off-by: Karel Zak <kzak@redhat.com>
2021-03-26 14:21:36 +01:00
Mario Blättermann 69dc8997dc Asciidoc: Incorporate latest changes in rfkill.8 and umount.8 2021-03-26 13:35:42 +01:00