[systemd-devel] [PATCH 0/2] Using XML entities for paths in manpages

Lennart Poettering lennart at poettering.net
Thu May 28 10:35:01 PDT 2015


On Wed, 27.05.15 02:38, Filipe Brandenburger (filbranden at google.com) wrote:

> As suggested by Martin Pitt, for better support of distros with non-merged /usr.
> 
> This doesn't get us 100% there but I'd say it gets us much closer.
> 
> I think we still need a new variable for /etc/udev (similar to &pkgsysconfdir;
> which is /etc/systemd) though that is not really critical for non-merged /usr.
> 
> There are also some general explanations (in files man/hwdb.xml, man/udev.xml
> and man/systemd.{link,netdev,network}.xml) which talk of how files in /etc
> override those in /usr/lib but we don't really have a great variable for
> /usr/lib or /lib vs. /etc, so I'd like to think a little further on how to
> solve that particular one...
> 
> I hope that's helpful!

Applied both!

Thanks!

> 
> Cheers,
> Filipe
> 
> 
> Filipe Brandenburger (2):
>   man: generate configured paths in manpages
>   man: use configured path for mount and umount binaries in manpages
> 
>  Makefile.am                                  |  2 ++
>  man/binfmt.d.xml                             |  5 ++++-
>  man/bootchart.conf.xml                       | 17 +++++++++-------
>  man/bootctl.xml                              |  5 ++++-
>  man/bootup.xml                               |  5 ++++-
>  man/busctl.xml                               |  5 ++++-
>  man/coredump.conf.xml                        | 11 ++++++----
>  man/coredumpctl.xml                          |  5 ++++-
>  man/crypttab.xml                             |  5 ++++-
>  man/daemon.xml                               |  5 ++++-
>  man/file-hierarchy.xml                       |  5 ++++-
>  man/halt.xml                                 |  5 ++++-
>  man/hostname.xml                             |  5 ++++-
>  man/hostnamectl.xml                          |  5 ++++-
>  man/hwdb.xml                                 |  9 ++++++---
>  man/journal-remote.conf.xml                  | 11 ++++++----
>  man/journalctl.xml                           |  5 ++++-
>  man/journald.conf.xml                        | 11 ++++++----
>  man/kernel-command-line.xml                  |  5 ++++-
>  man/kernel-install.xml                       |  5 ++++-
>  man/less-variables.xml                       |  5 ++++-
>  man/libsystemd-pkgconfig.xml                 |  5 ++++-
>  man/locale.conf.xml                          |  5 ++++-
>  man/localectl.xml                            |  5 ++++-
>  man/localtime.xml                            |  5 ++++-
>  man/loginctl.xml                             |  5 ++++-
>  man/logind.conf.xml                          | 11 ++++++----
>  man/machine-id.xml                           |  5 ++++-
>  man/machine-info.xml                         |  5 ++++-
>  man/machinectl.xml                           |  9 ++++++---
>  man/modules-load.d.xml                       |  5 ++++-
>  man/networkctl.xml                           |  5 ++++-
>  man/nss-myhostname.xml                       |  5 ++++-
>  man/nss-mymachines.xml                       |  5 ++++-
>  man/os-release.xml                           |  5 ++++-
>  man/pam_systemd.xml                          |  5 ++++-
>  man/resolved.conf.xml                        | 11 ++++++----
>  man/runlevel.xml                             |  5 ++++-
>  man/sd-daemon.xml                            |  5 ++++-
>  man/sd-id128.xml                             |  5 ++++-
>  man/sd-journal.xml                           |  5 ++++-
>  man/sd-login.xml                             |  5 ++++-
>  man/sd_booted.xml                            |  5 ++++-
>  man/sd_bus_creds_get_pid.xml                 |  5 ++++-
>  man/sd_bus_creds_new_from_pid.xml            |  5 ++++-
>  man/sd_bus_default.xml                       |  5 ++++-
>  man/sd_bus_error.xml                         |  5 ++++-
>  man/sd_bus_message_append.xml                |  5 ++++-
>  man/sd_bus_message_append_array.xml          |  5 ++++-
>  man/sd_bus_message_append_basic.xml          |  5 ++++-
>  man/sd_bus_message_append_string_memfd.xml   |  5 ++++-
>  man/sd_bus_message_append_strv.xml           |  5 ++++-
>  man/sd_bus_message_get_cookie.xml            |  5 ++++-
>  man/sd_bus_message_get_monotonic_usec.xml    |  5 ++++-
>  man/sd_bus_negotiate_fds.xml                 |  5 ++++-
>  man/sd_bus_new.xml                           |  5 ++++-
>  man/sd_bus_path_encode.xml                   |  5 ++++-
>  man/sd_bus_request_name.xml                  |  5 ++++-
>  man/sd_event_add_child.xml                   |  5 ++++-
>  man/sd_event_add_defer.xml                   |  5 ++++-
>  man/sd_event_add_signal.xml                  |  5 ++++-
>  man/sd_event_add_time.xml                    |  5 ++++-
>  man/sd_event_get_fd.xml                      |  5 ++++-
>  man/sd_event_new.xml                         |  5 ++++-
>  man/sd_event_run.xml                         |  5 ++++-
>  man/sd_event_set_name.xml                    |  5 ++++-
>  man/sd_event_wait.xml                        |  5 ++++-
>  man/sd_get_seats.xml                         |  5 ++++-
>  man/sd_id128_get_machine.xml                 |  5 ++++-
>  man/sd_id128_randomize.xml                   |  5 ++++-
>  man/sd_id128_to_string.xml                   |  5 ++++-
>  man/sd_is_fifo.xml                           |  5 ++++-
>  man/sd_journal_add_match.xml                 |  5 ++++-
>  man/sd_journal_get_catalog.xml               |  5 ++++-
>  man/sd_journal_get_cursor.xml                |  5 ++++-
>  man/sd_journal_get_cutoff_realtime_usec.xml  |  5 ++++-
>  man/sd_journal_get_data.xml                  |  5 ++++-
>  man/sd_journal_get_fd.xml                    |  5 ++++-
>  man/sd_journal_get_realtime_usec.xml         |  5 ++++-
>  man/sd_journal_get_usage.xml                 |  5 ++++-
>  man/sd_journal_next.xml                      |  5 ++++-
>  man/sd_journal_open.xml                      |  5 ++++-
>  man/sd_journal_print.xml                     |  5 ++++-
>  man/sd_journal_query_unique.xml              |  5 ++++-
>  man/sd_journal_seek_head.xml                 |  5 ++++-
>  man/sd_journal_stream_fd.xml                 |  5 ++++-
>  man/sd_listen_fds.xml                        |  5 ++++-
>  man/sd_login_monitor_new.xml                 |  5 ++++-
>  man/sd_machine_get_class.xml                 |  5 ++++-
>  man/sd_notify.xml                            |  5 ++++-
>  man/sd_pid_get_session.xml                   |  5 ++++-
>  man/sd_seat_get_active.xml                   |  5 ++++-
>  man/sd_session_is_active.xml                 |  5 ++++-
>  man/sd_uid_get_state.xml                     |  5 ++++-
>  man/sd_watchdog_enabled.xml                  |  5 ++++-
>  man/shutdown.xml                             |  5 ++++-
>  man/standard-conf.xml                        |  9 ++++++---
>  man/standard-options.xml                     |  5 ++++-
>  man/sysctl.d.xml                             |  7 +++++--
>  man/systemctl.xml                            |  9 ++++++---
>  man/systemd-activate.xml                     | 11 ++++++----
>  man/systemd-analyze.xml                      |  5 ++++-
>  man/systemd-ask-password-console.service.xml |  5 ++++-
>  man/systemd-ask-password.xml                 |  5 ++++-
>  man/systemd-backlight at .service.xml           |  7 +++++--
>  man/systemd-binfmt.service.xml               |  7 +++++--
>  man/systemd-bootchart.xml                    | 13 +++++++-----
>  man/systemd-bus-proxyd.xml                   |  7 +++++--
>  man/systemd-bus-proxyd at .service.xml          |  5 ++++-
>  man/systemd-cat.xml                          |  5 ++++-
>  man/systemd-cgls.xml                         |  5 ++++-
>  man/systemd-cgtop.xml                        |  5 ++++-
>  man/systemd-coredump.xml                     |  7 +++++--
>  man/systemd-cryptsetup-generator.xml         |  7 +++++--
>  man/systemd-cryptsetup at .service.xml          |  7 +++++--
>  man/systemd-debug-generator.xml              |  7 +++++--
>  man/systemd-delta.xml                        |  5 ++++-
>  man/systemd-detect-virt.xml                  |  5 ++++-
>  man/systemd-efi-boot-generator.xml           |  7 +++++--
>  man/systemd-escape.xml                       |  5 ++++-
>  man/systemd-firstboot.xml                    |  5 ++++-
>  man/systemd-fsck at .service.xml                |  7 +++++--
>  man/systemd-fstab-generator.xml              |  7 +++++--
>  man/systemd-getty-generator.xml              |  7 +++++--
>  man/systemd-gpt-auto-generator.xml           |  7 +++++--
>  man/systemd-halt.service.xml                 | 11 ++++++----
>  man/systemd-hibernate-resume-generator.xml   |  7 +++++--
>  man/systemd-hibernate-resume at .service.xml    |  7 +++++--
>  man/systemd-hostnamed.service.xml            |  7 +++++--
>  man/systemd-hwdb.xml                         |  7 +++++--
>  man/systemd-inhibit.xml                      |  5 ++++-
>  man/systemd-initctl.service.xml              |  7 +++++--
>  man/systemd-journal-gatewayd.service.xml     |  7 +++++--
>  man/systemd-journal-remote.xml               |  5 ++++-
>  man/systemd-journal-upload.xml               |  9 ++++++---
>  man/systemd-journald.service.xml             |  9 ++++++---
>  man/systemd-localed.service.xml              |  7 +++++--
>  man/systemd-logind.service.xml               |  7 +++++--
>  man/systemd-machine-id-commit.service.xml    |  7 +++++--
>  man/systemd-machine-id-commit.xml            |  5 ++++-
>  man/systemd-machine-id-setup.xml             |  5 ++++-
>  man/systemd-machined.service.xml             |  7 +++++--
>  man/systemd-modules-load.service.xml         |  7 +++++--
>  man/systemd-networkd-wait-online.service.xml |  7 +++++--
>  man/systemd-networkd.service.xml             | 11 ++++++----
>  man/systemd-notify.xml                       |  5 ++++-
>  man/systemd-nspawn.xml                       |  5 ++++-
>  man/systemd-path.xml                         |  5 ++++-
>  man/systemd-quotacheck.service.xml           |  7 +++++--
>  man/systemd-random-seed.service.xml          |  7 +++++--
>  man/systemd-remount-fs.service.xml           |  7 +++++--
>  man/systemd-resolved.service.xml             |  7 +++++--
>  man/systemd-rfkill at .service.xml              |  7 +++++--
>  man/systemd-run.xml                          |  5 ++++-
>  man/systemd-sleep.conf.xml                   | 13 +++++++-----
>  man/systemd-socket-proxyd.xml                |  9 ++++++---
>  man/systemd-suspend.service.xml              | 13 +++++++-----
>  man/systemd-sysctl.service.xml               |  7 +++++--
>  man/systemd-system-update-generator.xml      |  7 +++++--
>  man/systemd-system.conf.xml                  | 17 +++++++++-------
>  man/systemd-sysusers.xml                     |  5 ++++-
>  man/systemd-sysv-generator.xml               |  7 +++++--
>  man/systemd-timedated.service.xml            |  7 +++++--
>  man/systemd-timesyncd.service.xml            |  7 +++++--
>  man/systemd-tmpfiles.xml                     |  5 ++++-
>  man/systemd-tty-ask-password-agent.xml       |  5 ++++-
>  man/systemd-udevd.service.xml                |  7 +++++--
>  man/systemd-update-done.service.xml          |  7 +++++--
>  man/systemd-update-utmp.service.xml          |  7 +++++--
>  man/systemd-user-sessions.service.xml        |  7 +++++--
>  man/systemd-vconsole-setup.service.xml       |  7 +++++--
>  man/systemd.automount.xml                    |  5 ++++-
>  man/systemd.device.xml                       |  5 ++++-
>  man/systemd.exec.xml                         |  5 ++++-
>  man/systemd.generator.xml                    |  4 ++--
>  man/systemd.journal-fields.xml               |  5 ++++-
>  man/systemd.kill.xml                         |  5 ++++-
>  man/systemd.link.xml                         | 11 ++++++----
>  man/systemd.mount.xml                        |  5 ++++-
>  man/systemd.netdev.xml                       | 27 ++++++++++++++-----------
>  man/systemd.network.xml                      | 25 +++++++++++++----------
>  man/systemd.path.xml                         |  5 ++++-
>  man/systemd.preset.xml                       | 21 ++++++++++---------
>  man/systemd.resource-control.xml             |  5 ++++-
>  man/systemd.scope.xml                        |  5 ++++-
>  man/systemd.service.xml                      |  5 ++++-
>  man/systemd.slice.xml                        |  5 ++++-
>  man/systemd.snapshot.xml                     |  5 ++++-
>  man/systemd.socket.xml                       |  5 ++++-
>  man/systemd.special.xml                      |  5 ++++-
>  man/systemd.swap.xml                         |  5 ++++-
>  man/systemd.target.xml                       |  5 ++++-
>  man/systemd.time.xml                         |  5 ++++-
>  man/systemd.timer.xml                        |  5 ++++-
>  man/systemd.unit.xml                         | 30 ++++++++++++++--------------
>  man/systemd.xml                              |  7 +++++--
>  man/sysusers.d.xml                           |  5 ++++-
>  man/telinit.xml                              |  5 ++++-
>  man/timedatectl.xml                          |  9 ++++++---
>  man/timesyncd.conf.xml                       | 11 ++++++----
>  man/tmpfiles.d.xml                           |  5 ++++-
>  man/udev.conf.xml                            |  5 ++++-
>  man/udev.xml                                 |  9 ++++++---
>  man/udevadm.xml                              |  5 ++++-
>  man/user-system-options.xml                  |  5 ++++-
>  man/vconsole.conf.xml                        |  5 ++++-
>  206 files changed, 973 insertions(+), 362 deletions(-)
> 
> -- 
> 2.4.1
> 
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Lennart

-- 
Lennart Poettering, Red Hat


More information about the systemd-devel mailing list