Merge branch 'notsystemd/postmove' into notsystemd/master

# Conflicts:
#	src/grp-journal/systemd-journald/Makefile
#	src/grp-login/systemd-logind/Makefile
#	src/grp-machine/grp-import/systemd-export/Makefile
#	src/grp-machine/grp-import/systemd-import/Makefile
#	src/grp-machine/grp-import/systemd-pull/Makefile
#	src/grp-machine/systemd-machined/Makefile
#	src/grp-network/libnetworkd-core/Makefile
#	src/grp-resolve/libbasic-dns/Makefile
#	src/grp-resolve/systemd-resolved/Makefile
#	src/grp-utils/systemd-path/Makefile
#	src/libshared/src/Makefile
#	src/libsystemd-network/include/systemd-network/sd-ndisc.h
#	src/libsystemd/Makefile
#	src/libsystemd/src/test.mk
#	src/libudev/Makefile
#	src/systemd-dbus1-generator/Makefile
#	src/systemd-nspawn/nspawn.c

Signed-off-by: Luke Shumaker <lukeshu@sbcglobal.net>

1 files changed, 13 insertions, 0 deletions

diff --git a/Makefile-man.am b/Makefile-man.am
index d5b328d267..8ab733360d 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -31,11 +31,13 @@ MANPAGES += \
 	man/sd-id128.3 \
 	man/sd-journal.3 \
 	man/sd_booted.3 \
+	man/sd_bus_add_match.3 \
 	man/sd_bus_creds_get_pid.3 \
 	man/sd_bus_creds_new_from_pid.3 \
 	man/sd_bus_default.3 \
 	man/sd_bus_error.3 \
 	man/sd_bus_error_add_map.3 \
+	man/sd_bus_get_fd.3 \
 	man/sd_bus_message_append.3 \
 	man/sd_bus_message_append_array.3 \
 	man/sd_bus_message_append_basic.3 \
@@ -43,9 +45,11 @@ MANPAGES += \
 	man/sd_bus_message_append_strv.3 \
 	man/sd_bus_message_get_cookie.3 \
 	man/sd_bus_message_get_monotonic_usec.3 \
+	man/sd_bus_message_read_basic.3 \
 	man/sd_bus_negotiate_fds.3 \
 	man/sd_bus_new.3 \
 	man/sd_bus_path_encode.3 \
+	man/sd_bus_process.3 \
 	man/sd_bus_request_name.3 \
 	man/sd_event_add_child.3 \
 	man/sd_event_add_defer.3 \
@@ -334,6 +338,7 @@ MANPAGES_ALIAS += \
 	man/sd_event_default.3 \
 	man/sd_event_dispatch.3 \
 	man/sd_event_get_exit_code.3 \
+	man/sd_event_get_iteration.3 \
 	man/sd_event_get_state.3 \
 	man/sd_event_get_tid.3 \
 	man/sd_event_get_watchdog.3 \
@@ -665,6 +670,7 @@ man/sd_event_child_handler_t.3: man/sd_event_add_child.3
 man/sd_event_default.3: man/sd_event_new.3
 man/sd_event_dispatch.3: man/sd_event_wait.3
 man/sd_event_get_exit_code.3: man/sd_event_exit.3
+man/sd_event_get_iteration.3: man/sd_event_wait.3
 man/sd_event_get_state.3: man/sd_event_wait.3
 man/sd_event_get_tid.3: man/sd_event_new.3
 man/sd_event_get_watchdog.3: man/sd_event_set_watchdog.3
@@ -1314,6 +1320,9 @@ man/sd_event_dispatch.html: man/sd_event_wait.html
 man/sd_event_get_exit_code.html: man/sd_event_exit.html
 	$(html-alias)
 
+man/sd_event_get_iteration.html: man/sd_event_wait.html
+	$(html-alias)
+
 man/sd_event_get_state.html: man/sd_event_wait.html
 	$(html-alias)
 
@@ -2522,11 +2531,13 @@ EXTRA_DIST += \
 	man/sd-journal.xml \
 	man/sd-login.xml \
 	man/sd_booted.xml \
+	man/sd_bus_add_match.xml \
 	man/sd_bus_creds_get_pid.xml \
 	man/sd_bus_creds_new_from_pid.xml \
 	man/sd_bus_default.xml \
 	man/sd_bus_error.xml \
 	man/sd_bus_error_add_map.xml \
+	man/sd_bus_get_fd.xml \
 	man/sd_bus_message_append.xml \
 	man/sd_bus_message_append_array.xml \
 	man/sd_bus_message_append_basic.xml \
@@ -2534,9 +2545,11 @@ EXTRA_DIST += \
 	man/sd_bus_message_append_strv.xml \
 	man/sd_bus_message_get_cookie.xml \
 	man/sd_bus_message_get_monotonic_usec.xml \
+	man/sd_bus_message_read_basic.xml \
 	man/sd_bus_negotiate_fds.xml \
 	man/sd_bus_new.xml \
 	man/sd_bus_path_encode.xml \
+	man/sd_bus_process.xml \
 	man/sd_bus_request_name.xml \
 	man/sd_event_add_child.xml \
 	man/sd_event_add_defer.xml \