From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 23 Apr 2020 18:11:14 +0000 (+0200)
Subject: Merge pull request #15569 from DaanDeMeyer/sd-bus-message-peek-type-docs
X-Git-Tag: v246-rc1~508
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=927cffd57fe5e49c526508738a3b0183829d5a82;p=thirdparty%2Fsystemd.git

Merge pull request #15569 from DaanDeMeyer/sd-bus-message-peek-type-docs
---

927cffd57fe5e49c526508738a3b0183829d5a82
diff --cc man/rules/meson.build
index e59ad3769db,796966b2734..9b2e102dd15
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@@ -319,13 -319,10 +319,16 @@@ manpages = 
     'sd_bus_message_new_method_errorf'],
    ''],
   ['sd_bus_message_new_signal', '3', [], ''],
 + ['sd_bus_message_open_container',
 +  '3',
 +  ['sd_bus_message_close_container',
 +   'sd_bus_message_enter_container',
 +   'sd_bus_message_exit_container'],
 +  ''],
-  ['sd_bus_message_read', '3', ['sd_bus_message_readv'], ''],
+  ['sd_bus_message_read',
+   '3',
+   ['sd_bus_message_peek_type', 'sd_bus_message_readv'],
+   ''],
   ['sd_bus_message_read_array', '3', [], ''],
   ['sd_bus_message_read_basic', '3', [], ''],
   ['sd_bus_message_read_strv', '3', [], ''],
diff --cc man/sd-bus.xml
index 58f53cda0b8,034ba0da264..590998941ad
--- a/man/sd-bus.xml
+++ b/man/sd-bus.xml
@@@ -116,7 -113,7 +116,8 @@@
  <citerefentry><refentrytitle>sd_bus_message_new_method_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
  <citerefentry><refentrytitle>sd_bus_message_new_method_error</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
  <citerefentry><refentrytitle>sd_bus_message_new_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 +<citerefentry><refentrytitle>sd_bus_message_open_container</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>sd_bus_message_peek_type</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
  <citerefentry><refentrytitle>sd_bus_message_read</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
  <citerefentry><refentrytitle>sd_bus_message_read_array</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
  <citerefentry><refentrytitle>sd_bus_message_read_basic</refentrytitle><manvolnum>3</manvolnum></citerefentry>,