Merge branch 'master' into 'master'

man page updates

See merge request dbus/dbus-glib!1

3 files changed, 20 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index af73eae..e00bc38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,6 +296,7 @@ AC_CONFIG_FILES([
 Makefile
 m4/Makefile
 doc/Makefile
+doc/dbus-binding-tool.1
 doc/reference/Makefile
 doc/reference/version.xml
 dbus/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9e6f5cb..27119fa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
 SUBDIRS=reference
 
 man_MANS = dbus-binding-tool.1
-
-EXTRA_DIST = $(man_MANS)
\ No newline at end of file
diff --git a/doc/dbus-binding-tool.1 b/doc/dbus-binding-tool.1.in
index 391c87c..a45c0ce 100644
--- a/doc/dbus-binding-tool.1
+++ b/doc/dbus-binding-tool.1.in
@@ -1,13 +1,14 @@
 '\" te
-.TH dbus-binding-tool 1 "26 Feb 2009" "SunOS 5.11" "User Commands"
+.TH dbus-binding-tool 1 "8 Oct 2018" "@PACKAGE_STRING@" "User Commands"
 .SH "NAME"
-dbus-binding-tool \- C language GLib bindings generation utility\&.
+dbus-binding-tool \- C language dbus-glib bindings generation utility\&.
 .SH "SYNOPSIS"
 .PP
 \fBdbus-binding-tool\fR [-\fB-force\fR] [-\fB-help\fR] [-\fB-ignore-unsupported\fR] [-\fB-mode=\fIpretty|glib-client|glib-server\fR\fR] [-\fB-output=\fIfile\fR\fR] [-\fB-prefix=\fIsymbol-prefix\fR\fR] [-\fB-version\fR] [\fB\fIfile\fR\fR\&...]
 .SH "DESCRIPTION"
 .PP
-\fBdbus-binding-tool\fR is used to expose a GObject via D\-Bus\&.  As input, 
+\fBdbus-binding-tool\fR is used to expose a GObject via D\-Bus\&, using
+the deprecated \fBdbus-glib\fR binding for GLib.  As input,
 \fBdbus-binding-tool\fR uses a D\-Bus Introspection XML file\&.  As output,
 the client-side or server-side bindings is generated\&.  This output is a header
 file which eases the use of a remote D\-Bus object\&.  Output is sent to standard
@@ -257,38 +258,33 @@ The following files are used by this application:
 .sp
 .ne 2
 .mk
-\fB\fB/usr/bin/dbus-binding-tool\fR \fR
+\fB\fB@bindir@/dbus-binding-tool\fR \fR
 .in +32n
 .rt
 Executable for the D\-Bus Binding Tool application\&.
 .sp
 .sp 1
 .in -32n
-.SH "ATTRIBUTES"
-.PP
-See \fBattributes\fR(5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() allbox;
-cw(2.750000i)| cw(2.750000i)
-lw(2.750000i)| lw(2.750000i).
-ATTRIBUTE TYPEATTRIBUTE VALUE
-AvailabilitySUNWdbus-bindings
-Interface stabilityVolatile
-.TE
-.sp
 .SH "SEE ALSO"
 .PP
+\fBgdbus-codegen\fR(1),
 \fBdbus-cleanup-sockets\fR(1),
 \fBdbus-daemon\fR(1),
 \fBdbus-monitor\fR(1),
 \fBdbus-send\fR(1),
-\fBdbus-uuidgen\fR(1),
-\fBlibdbus-glib-1\fR(3),
-\fBattributes\fR(5)
+\fBdbus-uuidgen\fR(1)
 .SH "NOTES"
 .PP
-Written by Brian Cameron, Sun Microsystems Inc\&., 2009\&.
+\fBdbus-binding-tool\fR is part of \fBdbus-glib\fR, which is a deprecated D-Bus
+binding for GLib.
+.PP
+dbus-glib receives minimal maintenance and security fixes for the benefit
+of projects like Telepathy and NetworkManager that still rely on it, but
+should not be used in new projects (and existing projects should try
+to move away from it, too). Please use GDBus, part of GLib since 2.26.
+.PP
+\fBgdbus-codegen\fR(1) is the GDBus replacement for \fBdbus-binding-tool\fR.
+.SH "AUTHORS"
+.PP
+Man page written by Brian Cameron, Sun Microsystems Inc\&., 2009\&.
 ...\" created by instant / solbook-to-man, Thu 26 Feb 2009, 19:15
-...\" LSARC 2006/368 D-BUS Message Bus System