Merge from origin/emacs-25

[gnu-emacs] / doc / misc / dbus.texi

diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 2eef4f4e7e77f6e7f456c23ad2c649d2cd1fbb04..f4ebfebcbe381c5b7e425e0c51637c80bd0a7f6d 100644 (file)
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1,8 +1,8 @@
-\input texinfo   @c -*-texinfo-*-
+\input texinfo  @c -*- coding: utf-8 -*-
 @setfilename ../../info/dbus.info
 @c %**start of header
 @settitle Using of D-Bus
-@documentencoding UTF-8
+@include docstyle.texi
 @c @setchapternewpage odd
 @c %**end of header
 
@@ -10,7 +10,7 @@
 @syncodeindex fn cp
 
 @copying
-Copyright @copyright{} 2007--2015 Free Software Foundation, Inc.
+Copyright @copyright{} 2007--2016 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -138,8 +138,8 @@ name could be @samp{org.gnu.Emacs.TextEditor} or
 @section D-Bus version.
 
 D-Bus has evolved over the years.  New features have been added with
-new D-Bus versions.  There are two variables, which allow to determine
-the used D-Bus version.
+new D-Bus versions.  There are two variables, which allow the determination
+of the D-Bus version used.
 
 @defvar dbus-compiled-version
 This variable, a string, determines the version of D-Bus Emacs is