X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile-man.am;h=079ba63e7eaa30dd9b92405240682be1257ed921;hp=c232f486dedf98457366ce77d8628dba4969d76c;hb=12c0d47c60f4fb6f5a11c02ddb91a6c7ded5a049;hpb=effbc8e4f70fc70e4a4a8a1dc77228dd187f9c22

diff --git a/Makefile-man.am b/Makefile-man.am
index c232f486d..079ba63e7 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1,6 +1,12 @@
 # Do not edit. Generated by make-man-rules.py.
-# Regenerate with 'make all update-man-list'.
-
+# To regenerate:
+#   1. Create, update, or remove source .xml files in man/
+#   2. Run 'make update-man-list'
+#   3. Run 'make man' to generate manpages
+#
+# To make a man page conditional on a configure switch add
+# attribute conditional="ENABLE_WHAT" or conditional="WITH_WHAT"
+# to <refentry> element.
 MANPAGES += \
 	man/bootup.7 \
 	man/busctl.1 \
@@ -85,6 +91,7 @@ MANPAGES += \
 	man/systemd.exec.5 \
 	man/systemd.journal-fields.7 \
 	man/systemd.kill.5 \
+	man/systemd.link.5 \
 	man/systemd.mount.5 \
 	man/systemd.path.5 \
 	man/systemd.preset.5 \
@@ -100,9 +107,6 @@ MANPAGES += \
 	man/systemd.time.7 \
 	man/systemd.timer.5 \
 	man/systemd.unit.5 \
-	man/systemd.link.5 \
-	man/systemd.netdev.5 \
-	man/systemd.network.5 \
 	man/telinit.8 \
 	man/tmpfiles.d.5 \
 	man/udev.7 \
@@ -687,7 +691,6 @@ MANPAGES += \
 	man/sd_bus_creds_get_pid.3 \
 	man/sd_bus_creds_new_from_pid.3 \
 	man/sd_bus_error.3 \
-	man/sd_bus_label_escape.3 \
 	man/sd_bus_message_append.3 \
 	man/sd_bus_message_append_array.3 \
 	man/sd_bus_message_append_basic.3 \
@@ -697,6 +700,7 @@ MANPAGES += \
 	man/sd_bus_message_get_monotonic_usec.3 \
 	man/sd_bus_new.3 \
 	man/sd_bus_open_user.3 \
+	man/sd_bus_path_encode.3 \
 	man/sd_bus_request_name.3 \
 	man/systemd-bus-proxyd.8 \
 	man/systemd-bus-proxyd@.service.8
@@ -738,7 +742,6 @@ MANPAGES_ALIAS += \
 	man/sd_bus_error_set_const.3 \
 	man/sd_bus_error_set_errno.3 \
 	man/sd_bus_error_set_errnof.3 \
-	man/sd_bus_label_unescape.3 \
 	man/sd_bus_message_append_array_iovec.3 \
 	man/sd_bus_message_append_array_memfd.3 \
 	man/sd_bus_message_append_array_space.3 \
@@ -750,6 +753,7 @@ MANPAGES_ALIAS += \
 	man/sd_bus_open_system.3 \
 	man/sd_bus_open_system_container.3 \
 	man/sd_bus_open_system_remote.3 \
+	man/sd_bus_path_decode.3 \
 	man/sd_bus_ref.3 \
 	man/sd_bus_release_name.3 \
 	man/sd_bus_unref.3 \
@@ -791,7 +795,6 @@ man/sd_bus_error_set.3: man/sd_bus_error.3
 man/sd_bus_error_set_const.3: man/sd_bus_error.3
 man/sd_bus_error_set_errno.3: man/sd_bus_error.3
 man/sd_bus_error_set_errnof.3: man/sd_bus_error.3
-man/sd_bus_label_unescape.3: man/sd_bus_label_escape.3
 man/sd_bus_message_append_array_iovec.3: man/sd_bus_message_append_array.3
 man/sd_bus_message_append_array_memfd.3: man/sd_bus_message_append_array.3
 man/sd_bus_message_append_array_space.3: man/sd_bus_message_append_array.3
@@ -803,6 +806,7 @@ man/sd_bus_message_get_seqnum.3: man/sd_bus_message_get_monotonic_usec.3
 man/sd_bus_open_system.3: man/sd_bus_open_user.3
 man/sd_bus_open_system_container.3: man/sd_bus_open_user.3
 man/sd_bus_open_system_remote.3: man/sd_bus_open_user.3
+man/sd_bus_path_decode.3: man/sd_bus_path_encode.3
 man/sd_bus_ref.3: man/sd_bus_new.3
 man/sd_bus_release_name.3: man/sd_bus_request_name.3
 man/sd_bus_unref.3: man/sd_bus_new.3
@@ -918,9 +922,6 @@ man/sd_bus_error_set_errno.html: man/sd_bus_error.html
 man/sd_bus_error_set_errnof.html: man/sd_bus_error.html
 	$(html-alias)
 
-man/sd_bus_label_unescape.html: man/sd_bus_label_escape.html
-	$(html-alias)
-
 man/sd_bus_message_append_array_iovec.html: man/sd_bus_message_append_array.html
 	$(html-alias)
 
@@ -954,6 +955,9 @@ man/sd_bus_open_system_container.html: man/sd_bus_open_user.html
 man/sd_bus_open_system_remote.html: man/sd_bus_open_user.html
 	$(html-alias)
 
+man/sd_bus_path_decode.html: man/sd_bus_path_encode.html
+	$(html-alias)
+
 man/sd_bus_ref.html: man/sd_bus_new.html
 	$(html-alias)
 
@@ -1007,7 +1011,9 @@ endif
 
 if ENABLE_NETWORKD
 MANPAGES += \
-	man/systemd-networkd.service.8
+	man/systemd-networkd.service.8 \
+	man/systemd.netdev.5 \
+	man/systemd.network.5
 MANPAGES_ALIAS += \
 	man/systemd-networkd.8
 man/systemd-networkd.8: man/systemd-networkd.service.8
@@ -1128,7 +1134,8 @@ endif
 
 if HAVE_MICROHTTPD
 MANPAGES += \
-	man/systemd-journal-gatewayd.service.8
+	man/systemd-journal-gatewayd.service.8 \
+	man/systemd-journal-remote.8
 MANPAGES_ALIAS += \
 	man/systemd-journal-gatewayd.8 \
 	man/systemd-journal-gatewayd.socket.8
@@ -1172,6 +1179,12 @@ MANPAGES_ALIAS += \
 	man/sd_login_monitor_get_fd.3 \
 	man/sd_login_monitor_get_timeout.3 \
 	man/sd_login_monitor_unref.3 \
+	man/sd_peer_get_machine_name.3 \
+	man/sd_peer_get_owner_uid.3 \
+	man/sd_peer_get_session.3 \
+	man/sd_peer_get_slice.3 \
+	man/sd_peer_get_unit.3 \
+	man/sd_peer_get_user_unit.3 \
 	man/sd_pid_get_machine_name.3 \
 	man/sd_pid_get_owner_uid.3 \
 	man/sd_pid_get_slice.3 \
@@ -1206,6 +1219,12 @@ man/sd_login_monitor_get_events.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_timeout.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
+man/sd_peer_get_machine_name.3: man/sd_pid_get_session.3
+man/sd_peer_get_owner_uid.3: man/sd_pid_get_session.3
+man/sd_peer_get_session.3: man/sd_pid_get_session.3
+man/sd_peer_get_slice.3: man/sd_pid_get_session.3
+man/sd_peer_get_unit.3: man/sd_pid_get_session.3
+man/sd_peer_get_user_unit.3: man/sd_pid_get_session.3
 man/sd_pid_get_machine_name.3: man/sd_pid_get_session.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_slice.3: man/sd_pid_get_session.3
@@ -1258,6 +1277,24 @@ man/sd_login_monitor_get_timeout.html: man/sd_login_monitor_new.html
 man/sd_login_monitor_unref.html: man/sd_login_monitor_new.html
 	$(html-alias)
 
+man/sd_peer_get_machine_name.html: man/sd_pid_get_session.html
+	$(html-alias)
+
+man/sd_peer_get_owner_uid.html: man/sd_pid_get_session.html
+	$(html-alias)
+
+man/sd_peer_get_session.html: man/sd_pid_get_session.html
+	$(html-alias)
+
+man/sd_peer_get_slice.html: man/sd_pid_get_session.html
+	$(html-alias)
+
+man/sd_peer_get_unit.html: man/sd_pid_get_session.html
+	$(html-alias)
+
+man/sd_peer_get_user_unit.html: man/sd_pid_get_session.html
+	$(html-alias)
+
 man/sd_pid_get_machine_name.html: man/sd_pid_get_session.html
 	$(html-alias)
 
@@ -1345,6 +1382,8 @@ MANPAGES_ALIAS += \
 
 endif
 
+# Really, do not edit this file.
+
 EXTRA_DIST += \
        man/binfmt.d.xml \
 	man/bootchart.conf.xml \
@@ -1384,7 +1423,6 @@ EXTRA_DIST += \
 	man/sd_bus_creds_get_pid.xml \
 	man/sd_bus_creds_new_from_pid.xml \
 	man/sd_bus_error.xml \
-	man/sd_bus_label_escape.xml \
 	man/sd_bus_message_append.xml \
 	man/sd_bus_message_append_array.xml \
 	man/sd_bus_message_append_basic.xml \
@@ -1394,6 +1432,7 @@ EXTRA_DIST += \
 	man/sd_bus_message_get_monotonic_usec.xml \
 	man/sd_bus_new.xml \
 	man/sd_bus_open_user.xml \
+	man/sd_bus_path_encode.xml \
 	man/sd_bus_request_name.xml \
 	man/sd_get_seats.xml \
 	man/sd_id128_get_machine.xml \
@@ -1454,6 +1493,7 @@ EXTRA_DIST += \
 	man/systemd-inhibit.xml \
 	man/systemd-initctl.service.xml \
 	man/systemd-journal-gatewayd.service.xml \
+	man/systemd-journal-remote.xml \
 	man/systemd-journald.service.xml \
 	man/systemd-localed.service.xml \
 	man/systemd-logind.service.xml \
@@ -1490,7 +1530,10 @@ EXTRA_DIST += \
 	man/systemd.index.xml \
 	man/systemd.journal-fields.xml \
 	man/systemd.kill.xml \
+	man/systemd.link.xml \
 	man/systemd.mount.xml \
+	man/systemd.netdev.xml \
+	man/systemd.network.xml \
 	man/systemd.path.xml \
 	man/systemd.preset.xml \
 	man/systemd.resource-control.xml \
@@ -1505,9 +1548,6 @@ EXTRA_DIST += \
 	man/systemd.time.xml \
 	man/systemd.timer.xml \
 	man/systemd.unit.xml \
-	man/systemd.link.xml \
-	man/systemd.netdev.xml \
-	man/systemd.network.xml \
 	man/systemd.xml \
 	man/telinit.xml \
 	man/timedatectl.xml \