man/org.freedesktop.import1.xml

@@ -156,7 +156,7 @@ node /org/freedesktop/import1 {
       <literal>gzip</literal>, depending on which compression scheme is required. The image written to the
       specified file descriptor will be a tar file in case of <function>ExportTar()</function> or a raw disk
       image in case of <function>ExportRaw()</function>. Note that currently raw disk images may not be
-      exported as tar files, and vice versa. This restriction might be lifted eventually. The method
+      exported as tar files, and vice versa. This restriction might be lifted eventually. The call
       returns a transfer identifier and object path for cancelling or tracking the export operation, similar
       to <function>ImportTar()</function> or <function>ImportRaw()</function> as described above.</para>
 
@@ -246,8 +246,8 @@ node /org/freedesktop/import1/transfer/_1 {
       <title>Methods</title>
 
       <para>The <function>Cancel()</function> method may be used to cancel the transfer. It takes no
-      parameters. This method is pretty much equivalent to the <function>CancelTransfer()</function> method
+      parameters. This call is pretty much equivalent to the <function>CancelTransfer()</function> call on
-      on the <structname>Manager</structname> interface (see above), but is exposed on the
+      the <structname>Manager</structname> interface (see above), but is exposed on the
       <structname>Transfer</structname> object itself instead of taking a transfer ID.</para>
     </refsect2>
 

man/org.freedesktop.locale1.xml

@@ -77,7 +77,7 @@ node /org/freedesktop/locale1 {
       daemons will inherit the new system locale. Note that already running daemons will not learn about the
       new value.</para>
 
-      <para>The <function>SetVConsoleKeyboard()</function> method may be used to set the key mapping for the
+      <para>The <function>SetVConsoleKeyboard()</function> call may be used to set the key mapping for the
       virtual console. Similarly, <function>SetX11Keyboard()</function> may be used to set the default key
       mapping of any X11 servers.</para>
 

man/org.freedesktop.login1.xml

@@ -377,7 +377,7 @@ node /org/freedesktop/login1 {
       should be a short human readable string identifying the reason why the lock is taken. Finally,
       <varname>mode</varname> is either <literal>block</literal> or <literal>delay</literal> which encodes
       whether the inhibit shall be consider mandatory or whether it should just delay the operation to a
-      certain maximum time. The method returns a file descriptor. The lock is released the moment this file
+      certain maximum time. The call returns a file descriptor. The lock is released the moment this file
       descriptor and all its duplicates are closed. For more information on the inhibition logic see
       <ulink url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Locks</ulink>.
       </para>
@@ -822,7 +822,7 @@ node /org/freedesktop/login1/session/45 {
       <para><function>TakeControl()</function> allows a process to take exclusive managed device
       access-control for that session. Only one D-Bus connection can be a controller for a given session at any
       time. If the <varname>force</varname> argument is set (root only), an existing controller is kicked
-      out and replaced. Otherwise, this method fails if there is already a controller. Note that this method is
+      out and replaced. Otherwise, this call fails if there is already a controller. Note that this call is
       limited to D-Bus users with the effective UID set to the user of the session or root.</para>
 
       <para><function>ReleaseControl()</function> drops control of a given session. Closing the

man/org.freedesktop.machine1.xml

@@ -219,7 +219,7 @@ node /org/freedesktop/machine1 {
       scope properties are passed as array in the same way as to PID1's
       <function>StartTransientUnit()</function> method. Calling this method will internally register a transient scope
       unit for the calling client (utilizing the passed scope_properties) and move the leader PID into
-      it. The method returns an object path for the registered machine object that implements the
+      it. The call returns an object path for the registered machine object that implements the
       <interfacename>org.freedesktop.machine1.Machine</interfacename> interface (see below). Also see the
       <ulink url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group
       Interfaces</ulink> for details about scope units and how to alter resource control settings on the
@@ -252,7 +252,7 @@ node /org/freedesktop/machine1 {
       <para><function>TerminateMachine()</function> terminates a virtual machine, killing its processes. It
       takes a machine name as its only argument.</para>
 
-      <para><function>GetMachineAddresses()</function> retrieves the IP addresses of a container. This method
+      <para><function>GetMachineAddresses()</function> retrieves the IP addresses of a container. This call
       returns an array of pairs consisting of an address family specifier (<constant>AF_INET</constant> or
       <constant>AF_INET6</constant>) and a byte array containing the addresses. This is only supported for
       containers that make use of network namespacing.</para>

man/org.freedesktop.systemd1.xml

@@ -364,8 +364,8 @@ node /org/freedesktop/systemd1 {
       invoked this method. <function>Unsubscribe()</function> reverts the signal subscription that
       <function>Subscribe()</function> implements. It is not necessary to invoke
       <function>Unsubscribe()</function> as clients are tracked. Signals are no longer sent out as soon as
-      all clients which previously asked for <function>Subscribe()</function> either closed their connection
+      all clients which previously asked for <function>Subscribe()</function> either closed the bus
-      to the bus or invoked <function>Unsubscribe()</function>.</para>
+      connection or invoked <function>Unsubscribe()</function>.</para>
 
       <para><function>Reload()</function> may be invoked to reload all unit files.</para>
 
@@ -376,57 +376,57 @@ node /org/freedesktop/systemd1 {
       <para><function>Exit()</function> may be invoked to ask the manager to exit. This is not available for
       the system manager and is useful only for user session managers.</para>
 
-      <para><function>Reboot()</function>, <function>PowerOff()</function>, <function>Halt()</function>, or
+      <para><function>Reboot()</function>, <function>PowerOff()</function>, <function>Halt()</function>,
       <function>KExec()</function> may be used to ask for immediate reboot, powering down, halt or kexec
       based reboot of the system. Note that this does not shut down any services and immediately transitions
-      into the reboot process. These functions are normally only called as the last step of shutdown and should
+      into the reboot process. These functions are normally only called as last step of shutdown, and should
-      not be called directly. To shut down the machine, it is generally a better idea to invoke
+      not be called directly. To shut down the machine it is a much better choice generally to invoke
-      <function>Reboot()</function> or <function>PowerOff()</function> on the
+      <function>Reboot()</function> and <function>PoweOff()</function> on the
       <filename>systemd-logind</filename> manager object; see
       <citerefentry><refentrytitle>org.freedesktop.login1</refentrytitle><manvolnum>5</manvolnum></citerefentry>
       for more information.</para>
 
       <para><function>SwitchRoot()</function> may be used to transition to a new root directory. This is
-      intended to be used by initial RAM disks. The method takes two arguments: the new root directory (which
+      intended to be used by initial RAM disks. The call takes two arguments: the new root directory (which
-      needs to be specified) and an init binary path (which may be left empty, in which case it is
+      needs to be specified), plus an init binary path (which may be left empty, in which case it is
       automatically searched for). The state of the system manager will be serialized before the
-      transition. After the transition, the manager binary on the main system is invoked and replaces the old
+      transition. After the transition the manager binary on the main system is invoked and replaces the old
       PID 1. All state will then be deserialized.</para>
 
       <para><function>SetEnvironment()</function> may be used to alter the environment block that is passed
-      to all spawned processes. It takes a string array of environment variable assignments. Any previously set
+      to all spawned processes. Takes a string array with environment variable assignments. Settings passed
-      environment variables will be overridden.</para>
+      will override previously set variables.</para>
 
-      <para><function>UnsetEnvironment()</function> may be used to unset environment variables. It takes a
+      <para><function>UnsetEnvironment()</function> may be used to unset environment variables. Takes a
-      string array of environment variable names. All variables specified will be unset (if they have been
+      string array with environment variable names. All variables specified will be unset (if they have been
-      set previously) and no longer be passed to all spawned processes. This method has no effect for variables
+      set previously) and no longer be passed to all spawned processes. This call has no effect for variables
       that were previously not set, but will not fail in that case.</para>
 
       <para><function>UnsetAndSetEnvironment()</function> is a combination of
       <function>UnsetEnvironment()</function> and <function>SetEnvironment()</function>. It takes two
-      lists. The first list contains variables to unset, the second one contains assignments to set. If a
+      lists. The first one is a list of variables to unset, the second one of assignments to set. If a
-      variable is listed in both, the variable is set after this method returns, i.e. the set list overrides the
+      variable is listed in both, the variable is set after this call, i.e. the set list overrides the unset
-      unset list.</para>
+      list.</para>
 
-      <para><function>ListUnitFiles()</function> returns an array of unit names and their enablement
+      <para><function>ListUnitFiles()</function> returns an array of unit names plus their enablement
       status. Note that <function>ListUnit()</function> returns a list of units currently loaded into memory,
-      while <function>ListUnitFiles()</function> returns a list of unit <emphasis>files</emphasis> that were
+      while <function>ListUnitFiles()</function> returns a list of unit <emphasis>files</emphasis> that could
-      found on disk. Note that while most units are read directly from a unit file with the same name, some
+      be found on disk. Note that while most units are read directly from a unit file with the same name some
-      units are not backed by files and some files (templates) cannot directly be loaded as units but need
+      units are not backed by files, and some files (templates) cannot directly be loaded as units but need
-      to be instantiated instead.</para>
+      to be instantiated.</para>
 
-      <para><function>GetUnitFileState()</function> returns the current enablement status of a specific unit
+      <para><function>GetUnitFileState()</function> returns the current enablement status of specific unit
       file.</para>
 
       <para><function>EnableUnitFiles()</function> may be used to enable one or more units in the system (by
       creating symlinks to them in <filename>/etc</filename> or <filename>/run</filename>). It takes a list
       of unit files to enable (either just file names or full absolute paths if the unit files are residing
-      outside the usual unit search paths) and two booleans: the first controls whether the unit shall be
+      outside the usual unit search paths), and two booleans: the first controls whether the unit shall be
       enabled for runtime only (true, <filename>/run</filename>), or persistently (false,
       <filename>/etc</filename>). The second one controls whether symlinks pointing to other units shall be
-      replaced if necessary. This method returns one boolean and an array of the changes made. The boolean
+      replaced if necessary. This call returns one boolean and an array with the changes made. The boolean
       signals whether the unit files contained any enablement information (i.e. an [Install]) section. The
-      changes array consists of structures with three strings: the type of the change (one of
+      changes list consists of structures with three strings: the type of the change (one of
       <literal>symlink</literal> or <literal>unlink</literal>), the file name of the symlink and the
       destination of the symlink. Note that most of the following calls return a changes list in the same
       format.</para>
@@ -441,40 +441,40 @@ node /org/freedesktop/systemd1 {
       <para>Similarly, <function>LinkUnitFiles()</function> links unit files (that are located outside of the
       usual unit search paths) into the unit search path.</para>
 
-      <para>Similarly, <function>PresetUnitFiles()</function> enables/disables one or more unit files
+      <para>Similarly, <function>PresetUnitFiles()</function> enables/disables one or more units file
       according to the preset policy. See
       <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more
       information.</para>
 
-      <para>Similarly, <function>MaskUnitFiles()</function> masks unit files and
+      <para>Similarly, <function>MaskUnitFiles()</function> masks unit files, and
       <function>UnmaskUnitFiles()</function> unmasks them again.</para>
 
       <para><function>SetDefaultTarget()</function> changes the <filename>default.target</filename> link. See
       <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry> for more
-      information.</para>
+      information</para>
 
       <para><function>GetDefaultTarget()</function> retrieves the name of the unit to which
-      <filename>default.target</filename> is aliased.</para>
+      <filename>default.target</filename> is aliased</para>
 
       <para><function>SetUnitProperties()</function> may be used to modify certain unit properties at
       runtime. Not all properties may be changed at runtime, but many resource management settings (primarily
       those listed in
       <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>)
-      may. The changes are applied instantly and stored on disk for future boots, unless
+      may. The changes are applied instantly, and stored on disk for future boots, unless
       <varname>runtime</varname> is true, in which case the settings only apply until the next
       reboot. <varname>name</varname> is the name of the unit to modify. <varname>properties</varname> are
       the settings to set, encoded as an array of property name and value pairs. Note that this is not a
-      dictionary! Also note that when setting array properties with this method usually results in appending to
+      dictionary! Note that when setting array properties with this call this usually results in appending to
-      the pre-configured array. To reset the configured arrays, set the property to an empty array first and
+      the pre-configured array. To reset the configured arrays set the property to an empty array first, then
-      then append to it.</para>
+      append to it.</para>
 
-      <para><function>StartTransientUnit()</function> may be used to create and start a transient unit which
+      <para><function>StartTransientUnit()</function> may be used to create and start a transient unit, which
       will be released as soon as it is not running or referenced anymore or the system is
-      rebooted. <varname>name</varname> is the unit name including its suffix and must be
+      rebooted. <varname>name</varname> is the unit name including suffix, and must be
       unique. <varname>mode</varname> is the same as in <function>StartUnit()</function>,
       <varname>properties</varname> contains properties of the unit, specified like in
       <function>SetUnitProperties()</function>. <varname>aux</varname> is currently unused and should be
-      passed as an empty array. See the <ulink
+      passed as empty array. See the <ulink
       url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group
       Interface</ulink> for more information how to make use of this functionality for resource control
       purposes.</para>
@@ -484,7 +484,7 @@ node /org/freedesktop/systemd1 {
       <title>Signals</title>
 
       <para>Note that most signals are sent out only after <function>Subscribe()</function> has been invoked
-      by at least one client. Make sure to invoke this method when subscribing to these signals!</para>
+      by at least one client. Make sure to invoke this call when subscribing to these signals!</para>
 
       <para><function>UnitNew()</function> and <function>UnitRemoved()</function> are sent out each time a
       new unit is loaded or unloaded. Note that this has little to do with whether a unit is available on
@@ -493,24 +493,24 @@ node /org/freedesktop/systemd1 {
 
       <para><function>JobNew()</function> and <function>JobRemoved()</function> are sent out each time a new
       job is queued or dequeued. Both signals take the numeric job ID, the bus path and the primary unit name
-      for this job as arguments. <function>JobRemoved()</function> also includes a result string which is one
+      for this job as argument. <function>JobRemoved()</function> also includes a result string, being one of
-      of <literal>done</literal>, <literal>canceled</literal>, <literal>timeout</literal>,
+      <literal>done</literal>, <literal>canceled</literal>, <literal>timeout</literal>,
-      <literal>failed</literal>, <literal>dependency</literal>, or
+      <literal>failed</literal>, <literal>dependency</literal>,
       <literal>skipped</literal>. <literal>done</literal> indicates successful execution of a
       job. <literal>canceled</literal> indicates that a job has been canceled (via
       <function>CancelJob()</function> above) before it finished execution (this doesn't necessarily mean
       though that the job operation is actually cancelled too, see above). <literal>timeout</literal>
       indicates that the job timeout was reached. <literal>failed</literal> indicates that the job
-      failed. <literal>dependency</literal> indicates that a job this job depended on failed and the job hence
+      failed. <literal>dependency</literal> indicates that a job this job has been depending on failed and
-      was removed as well. <literal>skipped</literal> indicates that a job was skipped because
+      the job hence has been removed too. <literal>skipped</literal> indicates that a job was skipped because
-      it didn't apply to the unit's current state.</para>
+      it didn't apply to the units current state.</para>
 
-      <para><function>StartupFinished()</function> is sent out when startup finishes. It carries six
+      <para><function>StartupFinished()</function> is sent out when startup finished. It carries six
-      microsecond timespan values, each indicating how much boot time has been spent in the firmware (if
+      microsecond timespan values each indicating how much boot time has been spent in the firmware (if
       known), in the boot loader (if known), in the kernel initialization phase, in the initrd (if known), in
       userspace and in total. These values may also be calculated from the
       <varname>FirmwareTimestampMonotonic</varname>, <varname>LoaderTimestampMonotonic</varname>,
-      <varname>InitRDTimestampMonotonic</varname>, <varname>UserspaceTimestampMonotonic</varname>, and
+      <varname>InitRDTimestampMonotonic</varname>, <varname>UserspaceTimestampMonotonic</varname>,
       <varname>FinishTimestampMonotonic</varname> properties (see below).</para>
 
       <para><function>UnitFilesChanged()</function> is sent out each time the list of enabled or masked unit
@@ -518,7 +518,7 @@ node /org/freedesktop/systemd1 {
 
       <para><function>Reloading()</function> is sent out immediately before a daemon reload is done (with the
       boolean parameter set to True) and after a daemon reload is completed (with the boolean parameter set
-      to False). This may be used by UIs to optimize UI updates.</para>
+      to False). This may be used by UIs to optimize UI updates</para>
     </refsect2>
 
     <refsect2>
@@ -530,15 +530,15 @@ node /org/freedesktop/systemd1 {
       <para>The others:</para>
 
       <para><varname>Version</varname> encodes the version string of the running systemd instance. Note that
-      the version string is purely informational. It should not be parsed and one may not assume the version to
+      the version string is purely informational, it should not be parsed, one may not assume the version to
       be formatted in any particular way. We take the liberty to change the versioning scheme at any time and
-      it is not part of the public API.</para>
+      it is not part of the API.</para>
 
       <para><varname>Features</varname> encodes the features that have been enabled and disabled for this
       build. Enabled options are prefixed with +, disabled options with -.</para>
 
-      <para><varname>Tainted</varname> encodes a couple of taint flags as a colon-separated list. When
+      <para><varname>Tainted</varname> encodes a couple of taint flags, as a colon-separated list. When
-      systemd detects it is running on a system with certain problems, it will set an appropriate taint
+      systemd detects it is run on a system with certain problems it will set an appropriate taint
       flag. Taints may be used to lower the chance of bogus bug reports. The following taints are currently
       known: <literal>split-usr</literal>, <literal>mtab-not-symlink</literal>,
       <literal>cgroups-missing</literal>, <literal>local-hwclock</literal>. <literal>split-usr</literal> is
@@ -556,27 +556,26 @@ node /org/freedesktop/systemd1 {
       <varname>KernelTimestamp</varname>, <varname>KernelTimestampMonotonic</varname>,
       <varname>InitRDTimestamp</varname>, <varname>InitRDTimestampMonotonic</varname>,
       <varname>UserspaceTimestamp</varname>, <varname>UserspaceTimestampMonotonic</varname>,
-      <varname>FinishTimestamp</varname>, and <varname>FinishTimestampMonotonic</varname> encode
+      <varname>FinishTimestamp</varname>, <varname>FinishTimestampMonotonic</varname> encode
       <constant>CLOCK_REALTIME</constant> and <constant>CLOCK_MONOTONIC</constant> microsecond timestamps
       taken when the firmware first began execution, when the boot loader first began execution, when the
       kernel first began execution, when the initrd first began execution, when the main systemd instance
       began execution and finally, when all queued startup jobs finished execution. These values are useful
-      for determining boot-time performance. Note that as monotonic time begins with the kernel startup, the
+      for determining boot-time performance. Note that as monotonic time begins with the kernel startup the
-      <varname>KernelTimestampMonotonic</varname> timestamp will always be 0 and
+      KernelTimestampMonotonic timestamp will always be 0, and FirmwareTimestampMonotonic and
-      <varname>FirmwareTimestampMonotonic</varname> and <varname>LoaderTimestampMonotonic</varname> are to
+      LoaderTimestampMonotonic are to be read as negative values. Also, not all fields are available,
-      be read as negative values. Also, not all fields are always available, depending on the used firmware,
+      depending on the used firmware, boot loader or initrd implementation. In these cases the respective
-      boot loader or initrd implementation. In these cases the respective pairs of timestamps are both 0,
+      pairs of timestamps are both 0, indicating that no data is available.</para>
-      indicating that no data is available.</para>
 
       <para>Similarly, the <varname>SecurityStartTimestamp</varname>,
-      <varname>GeneratorsStartTimestamp</varname> and <varname>LoadUnitTimestamp</varname> (as well as their
+      <varname>GeneratorsStartTimestamp</varname> and <varname>LoadUnitTimestamp</varname> (plus their
       monotonic and stop counterparts) expose performance data for uploading the security policies to the
       kernel (such as the SELinux, IMA, or SMACK policies), for running the generator tools and for loading
-      the unit files.</para>
+      the unit files</para>
 
       <para><varname>NNames</varname> encodes how many unit names are currently known. This only includes
-      names of units that are currently loaded and can be more than the amount of actually loaded units since
+      names of units that are currently loaded and can be more than actually loaded units since units may
-      units may have more than one name.</para>
+      have more than one name.</para>
 
       <para><varname>NJobs</varname> encodes how many jobs are currently queued.</para>
 
@@ -584,21 +583,20 @@ node /org/freedesktop/systemd1 {
 
       <para><varname>NFailedJobs</varname> encodes how many jobs have ever failed in total.</para>
 
-      <para><varname>Progress</varname> encodes boot progress as a floating point value between 0.0 and
+      <para><varname>Progress</varname> encodes boot progress as floating point value between 0.0 and
       1.0. This value begins at 0.0 at early-boot and ends at 1.0 when boot is finished and is based on the
-      number of executed and queued jobs. After startup, this field is always 1.0 indicating a finished
+      number of executed and queued jobs. After startup this field is always 1.0 indicating a finished
       boot.</para>
 
       <para><varname>Environment</varname> encodes the environment block passed to all executed services. It
       may be altered with bus calls such as <function>SetEnvironment()</function> (see above).</para>
 
       <para><varname>UnitPath</varname> encodes the currently active unit file search path. It is an array of
-      file system paths encoded as strings.</para>
+      strings, each being one file system path</para>
 
       <para><varname>Virtualization</varname> contains a short ID string describing the virtualization
-      technology the system runs in. On bare-metal hardware this is the empty string. Otherwise, it contains
+      technology the system runs in. On bare-metal hardware this is the empty string, otherwise an identifier
-      an identifier such as <literal>kvm</literal>, <literal>vmware</literal> and so on. For a full list of
+      such as <literal>kvm</literal>, <literal>vmware</literal> and so on. For a full list of IDs see
-      IDs see
       <citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
       Note that only the "innermost" virtualization technology is exported here. This detects both
       full-machine virtualizations (VMs) and shared-kernel virtualization (containers).</para>
@@ -608,9 +606,9 @@ node /org/freedesktop/systemd1 {
       <varname>ConditionArchitectures=</varname>.</para>
 
       <para><varname>ControlGroup</varname> contains the root control group path of this system manager. Note
-      that the root path is encoded as the empty string here (not as <literal>/</literal>!), so that it can be
+      that the root path is encoded as empty string here (not as <literal>/</literal>!), so that it can be
       appended to <filename>/sys/fs/cgroup/systemd</filename> easily. This value will be set to the empty
-      string for the host instance and some other string for container instances.</para>
+      string for the host instance, and some other string for container instances</para>
     </refsect2>
 
     <refsect2>
@@ -625,7 +623,7 @@ node /org/freedesktop/systemd1 {
       <function>ReenableUnitFiles()</function>, <function>LinkUnitFiles()</function>,
       <function>PresetUnitFiles</function>, <function>MaskUnitFiles</function>, and similar) require
       <interfacename>org.freedesktop.systemd1.manage-unit-files</interfacename>). Operations which modify the
-      exported environment (<function>SetEnvironment()</function>, <function>UnsetEnvironment()</function>,
+      exported environment ( <function>SetEnvironment()</function>, <function>UnsetEnvironment()</function>,
       <function>UnsetAndSetEnvironment()</function>) require
       <interfacename>org.freedesktop.systemd1.set-environment</interfacename>.  <function>Reload()</function>
       and <function>Reexecute()</function> require
@@ -751,12 +749,11 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <function>Restart()</function>, <function>TryRestart()</function>,
       <function>ReloadOrRestart()</function>, <function>ReloadOrTryRestart()</function>,
       <function>Kill()</function>, <function>ResetFailed()</function>, and
-      <function>SetProperties()</function> implement the same operation as the respective methods on the
+      <function>SetProperties()</function> implement the same operation as the respective method calls on the
-      <interfacename>Manager</interfacename> object (see above). However, these methods operate on the unit
+      <interfacename>Manager</interfacename> object (see above), however operate on the unit object and hence
-      object and hence do not take a unit name parameter. Invoking the methods directly on the Manager
+      do not take a unit name parameter. Invoking the methods directly on the Manager object has the
-      object has the advantage of not requiring a <function>GetUnit()</function> call to get the unit object
+      advantage of not requiring a <function>GetUnit()</function> call to get the unit object for a specific
-      for a specific unit name. Calling the methods on the Manager object is hence a round trip
+      unit name. Calling the methods on the Manager object is hence a round trip optimization.</para>
-      optimization.</para>
     </refsect2>
 
     <refsect2>
@@ -777,9 +774,9 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <varname>WantedBy</varname>, <varname>BoundBy</varname>, <varname>Conflicts</varname>,
       <varname>ConflictedBy</varname>, <varname>Before</varname>, <varname>After</varname>,
       <varname>OnFailure</varname>, <varname>Triggers</varname>, <varname>TriggeredBy</varname>,
-      <varname>PropagatesReloadTo</varname>, and <varname>RequiresMountsFor</varname> contain arrays which encode
+      <varname>PropagatesReloadTo</varname>, <varname>RequiresMountsFor</varname> contain arrays which encode
-      the dependencies and their inverse dependencies (where this applies) as configured in the unit file or
+      the dependencies and their inverse dependencies (where this applies), as configured in the unit file or
-      determined automatically.</para>
+      determined automatically. </para>
 
       <para><varname>Description</varname> contains the human readable description string for the
       unit.</para>
@@ -787,16 +784,16 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <para><varname>SourcePath</varname> contains the path to a configuration file this unit is
       automatically generated from in case it is not a native unit (in which case it contains the empty
       string). For example, all mount units generated from <filename>/etc/fstab</filename> have this field
-      set to <filename>/etc/fstab</filename>.</para>
+      set to this value.</para>
 
       <para><varname>Documentation</varname> contains a string array with URLs of documentation for this
       unit.</para>
 
       <para><varname>LoadState</varname> contains a state value that reflects whether the configuration file
       of this unit has been loaded. The following states are currently defined: <literal>loaded</literal>,
-      <literal>error</literal>, and <literal>masked</literal>. <literal>loaded</literal> indicates that the
+      <literal>error</literal>, <literal>masked</literal>. <literal>loaded</literal> indicates that the
       configuration was successfully loaded. <literal>error</literal> indicates that the configuration failed
-      to load. The <varname>LoadError</varname> field (see below) contains information about the cause of
+      to load, the <varname>LoadError</varname> field (see below) contains information about the cause of
       this failure. <literal>masked</literal> indicates that the unit is currently masked out (i.e. symlinked
       to <filename>/dev/null</filename> or empty). Note that the <varname>LoadState</varname> is fully
       orthogonal to the <varname>ActiveState</varname> (see below) as units without valid loaded
@@ -806,7 +803,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       <para><varname>ActiveState</varname> contains a state value that reflects whether the unit is currently
       active or not. The following states are currently defined: <literal>active</literal>,
       <literal>reloading</literal>, <literal>inactive</literal>, <literal>failed</literal>,
-      <literal>activating</literal>, and <literal>deactivating</literal>. <literal>active</literal> indicates
+      <literal>activating</literal>, <literal>deactivating</literal>. <literal>active</literal> indicates
       that unit is active (obviously...). <literal>reloading</literal> indicates that the unit is active and
       currently reloading its configuration. <literal>inactive</literal> indicates that it is inactive and
       the previous run was successful or no previous run has taken place yet. <literal>failed</literal>
@@ -827,46 +824,47 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       later on than the common high-level states explained above.</para>
 
       <para><varname>FragmentPath</varname> contains the unit file path this unit was read from, if there is
-      one (if not, it contains the empty string).</para>
+      any (if not this contains the empty string).</para>
 
       <para><varname>UnitFileState</varname> encodes the install state of the unit file of
       <varname>FragmentPath</varname>. It currently knows the following states: <literal>enabled</literal>,
       <literal>enabled-runtime</literal>, <literal>linked</literal>, <literal>linked-runtime</literal>,
       <literal>masked</literal>, <literal>masked-runtime</literal>, <literal>static</literal>,
-      <literal>disabled</literal>, and <literal>invalid</literal>. <literal>enabled</literal> indicates that a
+      <literal>disabled</literal>, <literal>invalid</literal>. <literal>enabled</literal> indicates that a
       unit file is permanently enabled. <literal>enable-runtime</literal> indicates the unit file is only
-      temporarily enabled and will no longer be enabled after a reboot (that means, it is enabled via
+      temporarily enabled, and will no longer be enabled after a reboot (that means, it is enabled via
       <filename>/run</filename> symlinks, rather than <filename>/etc</filename>). <literal>linked</literal>
-      indicates that a unit is linked into <filename>/etc</filename> permanently. <literal>linked-runtime</literal>
+      indicates that a unit is linked into <filename>/etc</filename> permanently, <literal>linked</literal>
       indicates that a unit is linked into <filename>/run</filename> temporarily (until the next
-      reboot). <literal>masked</literal> indicates that the unit file is masked permanently.
+      reboot). <literal>masked</literal> indicates that the unit file is masked permanently,
-      <literal>masked-runtime</literal> indicates that it is masked in <filename>/run</filename> temporarily
+      <literal>masked-runtime</literal> indicates that it is only temporarily masked in
-      (until the next reboot). <literal>static</literal> indicates that the unit is statically enabled, i.e.
+      <filename>/run</filename>, until the next reboot. <literal>static</literal> indicates that the unit is
-      always enabled and doesn't need to be enabled explicitly. <literal>invalid</literal> indicates that it
+      statically enabled, i.e. always enabled and doesn't need to be enabled
-      could not be determined whether the unit file is enabled.</para>
+      explicitly. <literal>invalid</literal> indicates that it could not be determined whether the unit file
+      is enabled.</para>
 
       <para><varname>InactiveExitTimestamp</varname>, <varname>InactiveExitTimestampMonotonic</varname>,
       <varname>ActiveEnterTimestamp</varname>, <varname>ActiveEnterTimestampMonotonic</varname>,
       <varname>ActiveExitTimestamp</varname>, <varname>ActiveExitTimestampMonotonic</varname>,
-      <varname>InactiveEnterTimestamp</varname>, and <varname>InactiveEnterTimestampMonotonic</varname>
+      <varname>InactiveEnterTimestamp</varname>, <varname>InactiveEnterTimestampMonotonic</varname> contain
-      contain <constant>CLOCK_REALTIME</constant> and <constant>CLOCK_MONOTONIC</constant> 64-bit microsecond
+      <constant>CLOCK_REALTIME</constant> and <constant>CLOCK_MONOTONIC</constant> 64-bit microsecond
       timestamps of the last time a unit left the inactive state, entered the active state, exited the active
       state, or entered an inactive state. These are the points in time where the unit transitioned
       <literal>inactive</literal>/<literal>failed</literal> → <literal>activating</literal>,
       <literal>activating</literal> → <literal>active</literal>, <literal>active</literal> →
       <literal>deactivating</literal>, and finally <literal>deactivating</literal> →
       <literal>inactive</literal>/<literal>failed</literal>. The fields are 0 in case such a transition has
-      not yet been recorded on this boot.</para>
+      not been recording on this boot yet.</para>
 
-      <para><varname>CanStart</varname>, <varname>CanStop</varname>, and <varname>CanReload</varname> encode
+      <para><varname>CanStart</varname>, <varname>CanStop</varname>, <varname>CanReload</varname> encodes as
-      as booleans whether the unit supports the start, stop or reload operations. Even if a unit supports
+      booleans whether the unit supports the start, stop or reload operations. Even if a unit supports such
-      such an operation, the client might not necessary have the necessary privileges to execute them.</para>
+      an operation the client might not necessary have the right privileges to execute them.</para>
 
-      <para><varname>CanIsolate</varname> encodes as a boolean whether the unit may be started in isolation
+      <para><varname>CanIsolate</varname> encodes as boolean whether the unit may be started in isolation
       mode.</para>
 
       <para><varname>Job</varname> encodes the job ID and job object path of the job currently scheduled or
-      executed for this unit, if there is any. If no job is scheduled or executed, the job id field will be
+      executed for this unit, if there is any. If no job is scheduled or executed the job id field will be
       0.</para>
 
       <para><varname>StopWhenUnneeded</varname>, <varname>RefuseManualStart</varname>,
@@ -889,28 +887,28 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
       <para><varname>ConditionTimestamp</varname> and <varname>ConditionTimestampMonotonic</varname> contain
       the <constant>CLOCK_REALTIME</constant>/<constant>CLOCK_MONOTONIC</constant> microsecond timestamps of
-      the last time the configured conditions of the unit have been checked or 0 if they have never been
+      the last time the configured conditions of the unit have been checked, or 0 if they have never been
       checked. Conditions are checked when a unit is requested to start.</para>
 
       <para><varname>ConditionResult</varname> contains the condition result of the last time the configured
       conditions of this unit were checked. </para>
 
-      <para><varname>Conditions</varname> contains all configured conditions of the unit. For each condition,
+      <para><varname>Conditions</varname> contains all configured conditions of the unit. For each condition
       five fields are given: condition type (e.g. <varname>ConditionPathExists</varname>), whether the
       condition is a trigger condition, whether the condition is reversed, the right hand side of the
       condition (e.g. the path in case of <varname>ConditionPathExists</varname>), and the status. The status
       can be 0, in which case the condition hasn't been checked yet, a positive value, in which case the
       condition passed, or a negative value, in which case the condition failed. Currently only 0, +1, and -1
       are used, but additional values may be used in the future, retaining the meaning of
-      zero/positive/negative values.</para>
+      zero/positive/negative values</para>
 
       <para><varname>LoadError</varname> contains a pair of strings. If the unit failed to load (as encoded
       in <varname>LoadState</varname>, see above), then this will include a D-Bus error pair consisting of
-      the error ID and an explanatory human readable string of what happened. If it loaded successfully, this
+      the error ID and an explanatory human readable string of what happened. If it succeeded to load this
       will be a pair of empty strings.</para>
 
-      <para><varname>Transient</varname> contains a boolean that indicates whether the unit was created as a
+      <para><varname>Transient</varname> contains a boolean that indicates whether the unit was created as
-      transient unit (i.e. via <function>CreateTransientUnit()</function> on the manager object).</para>
+      transient unit (i.e. via <function>CreateTransientUnit()</function> on the manager object)</para>
     </refsect2>
 
     <refsect2>
@@ -1075,10 +1073,10 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       last watchdog ping received from the service, or 0 if none was ever received.</para>
 
       <para><varname>ExecStartPre</varname>, <varname>ExecStart</varname>, <varname>ExecStartPost</varname>,
-      <varname>ExecReload</varname>, <varname>ExecStop</varname>, and <varname>ExecStop</varname> are arrays
+      <varname>ExecReload</varname>, <varname>ExecStop</varname>, <varname>ExecStop</varname> each are arrays
-      of structures where each struct contains: the binary path to execute; an array with all arguments to
+      of structures each containing: the binary path to execute; an array with all arguments to pass to the
-      pass to the executed command, starting with argument 0; a boolean whether it should be considered a
+      executed command, starting with argument 0; a boolean whether it should be considered a failure if the
-      failure if the process exits uncleanly; two pairs of
+      process exits uncleanly; two pairs of
       <constant>CLOCK_REALTIME</constant>/<constant>CLOCK_MONOTONIC</constant> microsecond timestamps when
       the process began and finished running the last time, or 0 if it never ran or never finished running;
       the PID of the process, or 0 if it has not run yet; the exit code and status of the last run. This
@@ -1086,17 +1084,16 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       with runtime data.</para>
 
       <para><varname>LimitCPU</varname> (and related properties) map more or less directly to the
-      corresponding settings in the service unit files except that if they aren't set, their value is
+      corresponding settings in the service unit files, however are set to 18446744073709551615 (i.e. -1) if
-      18446744073709551615 (i.e. -1).</para>
+      they aren't set.</para>
 
       <para><varname>Capabilities</varname> contains the configured capabilities, as formatted with
       <citerefentry project='man-pages'><refentrytitle>cap_to_text</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
       </para>
 
       <para><varname>SecureBits</varname>, <varname>CapabilityBoundingSet</varname>,
-      <varname>MountFlags</varname> also correspond to the configured settings of the unit files, but
+      <varname>MountFlags</varname> also correspond to the configured settings of the unit files, but are
-      instead of being formatted as strings, they are encoded as the actual binary flags they are.
+      encoded as the actual binary flag fields they are, rather than formatted as string.</para>
-      </para>
 
       <para><varname>ExecMainStartTimestamp</varname>, <varname>ExecMainStartTimestampMonotonic</varname>,
       <varname>ExecMainExitTimestamp</varname>, <varname>ExecMainExitTimestampMonotonic</varname>,
@@ -1122,17 +1119,17 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       explanatory string.</para>
 
       <para><varname>Result</varname> encodes the execution result of the last run of the service. It is
-      useful to determine the reason a service failed if it is in the <literal>failed</literal> state (see
+      useful to determine the reason a service failed if it is in <literal>failed</literal> state (see
       <varname>ActiveState</varname> above). The following values are currently known:
       <literal>success</literal> is set if the unit didn't fail. <literal>resources</literal> indicates that
-      not enough resources were available to fork off and execute the service
+      not enough resources have been available to fork off and execute the service
       processes. <literal>timeout</literal> indicates that a time-out occurred while executing a service
       operation. <literal>exit-code</literal> indicates that a service process exited with an unclean exit
       code. <literal>signal</literal> indicates that a service process exited with an uncaught
       signal. <literal>core-dump</literal> indicates that a service process exited uncleanly and dumped
       core. <literal>watchdog</literal> indicates that a service did not send out watchdog ping messages
       often enough. <literal>start-limit</literal> indicates that a service has been started too frequently
-      in a specific time frame (as configured in <varname>StartLimitInterval</varname>,
+      in a time frame (as configured in <varname>StartLimitInterval</varname>,
       <varname>StartLimitBurst</varname>).</para>
 
       <para><varname>ControlGroup</varname> indicates the control group path the processes of this service
@@ -1295,15 +1292,15 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
       i.e. those where systemd is responsible for accepted connections. </para>
 
       <para>Similarly <varname>NConnections</varname> contains the number of currently open connections on
-      this socket. It only applies only to socket units with <varname>Accept</varname> set to
+      this socket, and also applies only to socket with <varname>Accept</varname> set to
       <literal>true</literal>.</para>
 
-      <para><varname>Result</varname> encodes the reason why a socket unit failed if it is in the
+      <para><varname>Result</varname> encodes the reason why a socket unit failed if it is in
       <literal>failed</literal> state (see <varname>ActiveState</varname> above). The values
       <literal>success</literal>, <literal>resources</literal>, <literal>timeout</literal>,
       <literal>exit-code</literal>, <literal>signal</literal> and <literal>core-dump</literal> have the same
-      meaning as they have for the corresponding field of service units (see above). In addition to that,
+      meaning as they have for the corresponding field of service units (see above). In addition to that the
-      the value <literal>service-failed-permanent</literal> indicates that the service of this socket failed
+      value <literal>service-failed-permanent</literal> indicates that the service of this socket failed
       continuously.</para>
     </refsect2>
   </refsect1>
@@ -1382,12 +1379,13 @@ node /org/freedesktop/systemd1/unit/dev_2d_foo_2edevice {
     </refsect2>
   </refsect1>
 
+
   <refsect1>
     <title>Mount Unit Objects</title>
 
     <para>All mount unit objects implement the <interfacename>org.freedesktop.systemd1.Mount</interfacename>
     interface (described here) in addition to the generic
-    <interfacename>org.freedesktop.systemd1.Unit</interfacename> interface (see above).</para>
+    <interfacename>org.freedesktop.systemd1.Unit</interfacename> interface (see above)</para>
 
     <programlisting interface="org.freedesktop.systemd1.Mount">
 $ gdbus introspect --system --dest org.freedesktop.systemd1 \
@@ -1505,7 +1503,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
       <title>Properties</title>
 
       <para>Most of the properties map directly to the corresponding settings in mount unit files. As mount
-      units invoke the <filename>/usr/bin/mount</filename> command, their bus objects include implicit
+      units invoke the <filename>/usr/bin/mount</filename> command their bus objects include implicit
       <varname>ExecMount</varname> (and similar) fields which contain information about processes to
       execute. They also share most of the fields related to the execution context that Service objects
       expose (see above). In addition to these properties there are the following:</para>
@@ -1516,7 +1514,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
       <para><varname>Result</varname> contains a value explaining why a mount unit failed if it failed. It
       can take the values <literal>success</literal>, <literal>resources</literal>,
-      <literal>timeout</literal>, <literal>exit-code</literal>, <literal>signal</literal>, or
+      <literal>timeout</literal>, <literal>exit-code</literal>, <literal>signal</literal>,
       <literal>core-dump</literal> which have the identical meaning as the corresponding values of the
       corresponding field of service unit objects (see above).</para>
     </refsect2>
@@ -1564,7 +1562,7 @@ node /org/freedesktop/systemd1/unit/proc_2dsys_2dfs_2dbinfmt_5fmisc_2eautomount
       files.</para>
 
       <para><varname>Result</varname> knows the values <literal>success</literal> and
-      <literal>resources</literal> at this time. They have the same meanings as the corresponding values of
+      <literal>resources</literal>, at this time. They have the same meanings as the corresponding values of
       the corresponding field of the Service object.</para>
     </refsect2>
   </refsect1>
@@ -1613,10 +1611,10 @@ node /org/freedesktop/systemd1/unit/systemd_2dtmpfiles_2dclean_2etimer {
       <para><varname>TimersMonotonic</varname> contains an array of structs that contain information about
       all monotonic timers of this timer unit. The structs contain a string identifying the timer base, which
       is one of <literal>OnActiveUSec</literal>, <literal>OnBootUSec</literal>,
-      <literal>OnStartupUSec</literal>, <literal>OnUnitActiveUSec</literal>, or
+      <literal>OnStartupUSec</literal>, <literal>OnUnitActiveUSec</literal>,
-      <literal>OnUnitInactiveUSec</literal> which correspond to the settings of the same names in the timer
+      <literal>OnUnitInactiveUSec</literal>, which correspond to the settings of the same names in the timer
       unit files; the microsecond offset from this timer base in monotonic time; the next elapsation point on
-      the <constant>CLOCK_MONOTONIC</constant> clock, relative to its epoch.</para>
+      the <constant>CLOCK_MONOTONIC</constant> clock, relative its epoch.</para>
 
       <para><varname>TimersCalendar</varname> contains an array of structs that contain information about all
       realtime/calendar timers of this timer unit. The structs contain a string identifying the timer base,
@@ -1759,7 +1757,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
       <para>Most of the properties map directly to the corresponding settings in swap unit files. As mount
       units invoke the
-      <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry> command,
+      <citerefentry><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry> command
       their bus objects include implicit <varname>ExecActivate</varname> (and similar) fields which contain
       information about processes to execute. They also share most of the fields related to the execution
       context that Service objects expose (see above). In addition to these properties there are the
@@ -1772,7 +1770,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
       <para><varname>Result</varname> contains a value explaining why a mount unit failed if it failed. It
       can take the values <literal>success</literal>, <literal>resources</literal>,
-      <literal>timeout</literal>, <literal>exit-code</literal>, <literal>signal</literal>, or
+      <literal>timeout</literal>, <literal>exit-code</literal>, <literal>signal</literal>,
       <literal>core-dump</literal> which have the identical meanings as the corresponding values of the
       corresponding field of service unit objects (see above).</para>
     </refsect2>
@@ -1821,12 +1819,12 @@ node /org/freedesktop/systemd1/unit/cups_2epath {
 
       <para><varname>Paths</varname> contains an array of structs. Each struct contains the condition to
       watch, which can be one of <literal>PathExists</literal>, <literal>PathExistsGlob</literal>,
-      <literal>PathChanged</literal>, <literal>PathModified</literal>, or <literal>DirectoryNotEmpty</literal>
+      <literal>PathChanged</literal>, <literal>PathModified</literal>, <literal>DirectoryNotEmpty</literal>
       which correspond directly to the matching settings in the path unit files; and the path to watch,
       possibly including glob expressions.</para>
 
       <para><varname>Result</varname> contains a result value which can be <literal>success</literal> or
-      <literal>resources</literal> which have the same meaning as the corresponding field of the Service
+      <literal>resources</literal>, which have the same meaning as the corresponding field of the service
       interface.</para>
     </refsect2>
   </refsect1>
@@ -1944,7 +1942,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
 
       <para><function>Abandon()</function> may be used to place a scope unit in the "abandoned" state. This
       may be used to inform the system manager that the manager that created the scope lost interest in the
-      scope (for example, because it is terminating), without wanting to shut down the scope entirely.</para>
+      scope (for example, because it is terminating), without wanting to shut down the scope entirely</para>
     </refsect2>
 
     <refsect2>
@@ -1952,18 +1950,18 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
 
       <para><function>RequestStop</function> is sent to the peer that is configured in the
       <varname>Controller</varname> property when systemd is requested to terminate the scope unit. A program
-      registering a scope can use this to cleanly shut down the processes it added to the scope instead of
+      registering a scope can use this to cleanly shut down the processes it added to the scope, instead of
       letting systemd do it with the usual <constant>SIGTERM</constant> logic.</para>
     </refsect2>
 
     <refsect2>
       <title>Properties</title>
 
-      <para>All properties correspond directly with the matching properties of service units.</para>
+      <para>All properties correspond directly with the matching properties of service units</para>
 
       <para><varname>Controller</varname> contains the bus name (unique or well-known) that is notified when
       the scope unit is to be shut down via a <function>RequestStop</function> signal (see below). This is
-      set when the scope is created. If not set, the scope's processes will terminated with
+      set when the scope is created. If not set the scope's processes will terminated with
       <constant>SIGTERM</constant> directly.</para>
     </refsect2>
   </refsect1>
@@ -2017,17 +2015,17 @@ node /org/freedesktop/systemd1/job/1292 {
       <para><varname>Id</varname> is the numeric Id of the job. During the runtime of a systemd instance each
       numeric ID is only assigned once.</para>
 
-      <para><varname>Unit</varname> refers to the unit this job belongs to. It is a structure consisting of
+      <para><varname>Unit</varname> refers to the unit this job belongs two. It is a structure consisting of
       the name of the unit and a bus path to the unit's object.</para>
 
       <para><varname>JobType</varname> refers to the job's type and is one of <literal>start</literal>,
       <literal>verify-active</literal>, <literal>stop</literal>, <literal>reload</literal>,
-      <literal>restart</literal>, <literal>try-restart</literal>, or <literal>reload-or-start</literal>. Note
+      <literal>restart</literal>, <literal>try-restart</literal>, <literal>reload-or-start</literal>. Note
       that later versions might define additional values.</para>
 
       <para><varname>State</varname> refers to the job's state and is one of <literal>waiting</literal> and
       <literal>running</literal>. The former indicates that a job is currently queued but has not begun to
-      execute yet. The latter indicates that a job is currently being executed.</para>
+      execute yet, the latter indicates that a job is currently being executed.</para>
     </refsect2>
   </refsect1>
 

man/rules/meson.build

@@ -129,7 +129,6 @@ manpages = [
    'sd_bus_match_signal',
    'sd_bus_match_signal_async'],
   ''],
- ['sd_bus_add_node_enumerator', '3', [], ''],
  ['sd_bus_add_object',
   '3',
   ['SD_BUS_METHOD',
@@ -216,18 +215,6 @@ manpages = [
    'sd_bus_open_user_with_description',
    'sd_bus_open_with_description'],
   ''],
- ['sd_bus_emit_signal',
-  '3',
-  ['sd_bus_emit_interfaces_added',
-   'sd_bus_emit_interfaces_added_strv',
-   'sd_bus_emit_interfaces_removed',
-   'sd_bus_emit_interfaces_removed_strv',
-   'sd_bus_emit_object_added',
-   'sd_bus_emit_object_removed',
-   'sd_bus_emit_properties_changed',
-   'sd_bus_emit_properties_changed_strv',
-   'sd_bus_emit_signalv'],
-  ''],
  ['sd_bus_enqueue_for_read', '3', [], ''],
  ['sd_bus_error',
   '3',
@@ -250,12 +237,6 @@ manpages = [
   '3',
   ['SD_BUS_ERROR_END', 'SD_BUS_ERROR_MAP', 'sd_bus_error_map'],
   ''],
- ['sd_bus_get_current_handler',
-  '3',
-  ['sd_bus_get_current_message',
-   'sd_bus_get_current_slot',
-   'sd_bus_get_current_userdata'],
-  ''],
  ['sd_bus_get_fd',
   '3',
   ['sd_bus_get_events', 'sd_bus_get_timeout', 'sd_bus_set_fd'],

man/sd-bus.xml

@@ -47,7 +47,6 @@
 <citerefentry><refentrytitle>sd_bus_add_fallback</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_add_fallback_vtable</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_add_filter</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_add_node_enumerator</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_attach_event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_call_async</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
@@ -58,25 +57,11 @@
 <citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_close</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_default</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_interfaces_added</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_interfaces_added_strv</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_interfaces_removed</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_interfaces_removed_strv</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_object_added</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_object_removed</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_properties_changed</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_properties_changed_strv</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_emit_signalv</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd-bus-errors</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_error</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_error_add_map</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_get_address</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_get_bus_id</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_get_current_handler</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_get_current_message</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_get_current_slot</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-<citerefentry><refentrytitle>sd_bus_get_current_userdata</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_get_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_get_method_call_timeout</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
 <citerefentry><refentrytitle>sd_bus_get_n_queued_read</refentrytitle><manvolnum>3</manvolnum></citerefentry>,

man/sd_bus_add_node_enumerator.xml

@@ -1,137 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!-- SPDX-License-Identifier: LGPL-2.1+ -->
-
-<refentry id="sd_bus_add_node_enumerator"
-          xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>sd_bus_add_node_enumerator</title>
-    <productname>systemd</productname>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd_bus_add_node_enumerator</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd_bus_add_node_enumerator</refname>
-
-    <refpurpose>Add a node enumerator for a D-Bus object path prefix</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
-
-      <funcprototype>
-        <funcdef>typedef int (*<function>sd_bus_node_enumerator_t</function>)</funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>prefix</parameter></paramdef>
-        <paramdef>void *<parameter>userdata</parameter></paramdef>
-        <paramdef>char ***<parameter>ret_nodes</parameter></paramdef>
-        <paramdef>sd_bus_error *<parameter>ret_error</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_add_node_enumerator</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>sd_bus_slot **<parameter>slot</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>sd_bus_node_enumerator_t <parameter>callback</parameter></paramdef>
-        <paramdef>void *<parameter>userdata</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><function>sd_bus_add_node_enumerator()</function> adds a D-Bus node enumerator for the
-    given path prefix. The given callback is called to enumerate all the available objects with
-    the given path prefix when required (e.g. when
-    <constant>org.freedesktop.DBus.Introspectable.Introspect</constant> or
-    <constant>org.freedesktop.DBus.ObjectManager.GetManagedObjects</constant> are called on a
-    D-Bus service managed by sd-bus).</para>
-
-    <para><parameter>callback</parameter> is called with the path and userdata pointer registered
-    with <function>sd_bus_add_node_enumerator()</function>. When called, it should store all the
-    child object paths of the given path prefix in <parameter>ret_nodes</parameter> and return the
-    number of child objects under the given prefix. If an error occurs, it can either return a
-    negative integer, set <parameter>ret_error</parameter> to a non-empty error or do both. Any
-    errors returned by the callback are encoded as D-Bus errors and sent back to the caller. Errors
-    in <parameter>ret_error</parameter> take priority over negative return values.</para>
-
-    <para>Note that a node enumerator callback will only ever be called for a single  path prefix
-    and hence, for normal operation, <parameter>prefix</parameter> can be ignored. Also, a node
-    enumerator is only used to enumerate the available child objects under a given prefix. To
-    install a handler for a set of dynamic child objects, use
-    <citerefentry><refentrytitle>sd_bus_add_fallback_vtable</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-    </para>
-
-    <para>When <function>sd_bus_add_node_enumerator()</function> succeeds, a slot is created
-    internally. If the output parameter <replaceable>slot</replaceable> is <constant>NULL</constant>,
-    a "floating" slot object is created, see
-    <citerefentry><refentrytitle>sd_bus_slot_set_floating</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-    Otherwise, a pointer to the slot object is returned. In that case, the reference to the slot
-    object should be dropped when the node enumerator is not needed anymore, see
-    <citerefentry><refentrytitle>sd_bus_slot_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-    </para>
-  </refsect1>
-
-  <refsect1>
-    <title>Return Value</title>
-
-    <para>On success, <function>sd_bus_add_node_enumerator()</function> returns a non-negative
-    integer. On failure, it returns a negative errno-style error code.</para>
-
-    <refsect2>
-      <title>Errors</title>
-
-      <para>Returned errors may indicate the following problems:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><constant>-EINVAL</constant></term>
-
-          <listitem><para>One of the required parameters is <constant>NULL</constant> or
-          <parameter>path</parameter> is not a valid object path.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ENOPKG</constant></term>
-
-          <listitem><para>The bus cannot be resolved.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ECHILD</constant></term>
-
-          <listitem><para>The bus was created in a different process.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ENOMEM</constant></term>
-
-          <listitem><para>Memory allocation failed.</para></listitem>
-        </varlistentry>
-      </variablelist>
-    </refsect2>
-  </refsect1>
-
-  <xi:include href="libsystemd-pkgconfig.xml" />
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_add_fallback_vtable</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_slot_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-</refentry>

man/sd_bus_add_object.xml

@@ -488,8 +488,8 @@
   <refsect1>
     <title>Return Value</title>
 
-    <para>On success, <function>sd_bus_add_object_vtable()</function> and
+    <para>On success, <function>sd_bus_add_object_vtable</function> and
-    <function>sd_bus_add_fallback_vtable()</function> return a non-negative integer. On
+    <function>sd_bus_add_fallback_vtable</function> calls return 0 or a positive integer. On
     failure, they return a negative errno-style error code.</para>
 
     <refsect2>
@@ -550,9 +550,7 @@
 
     <para>
       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-      <citerefentry><refentrytitle>sd_bus_emit_properties_changed</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_emit_object_added</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
   </refsect1>
 </refentry>

man/sd_bus_add_object_manager.xml

@@ -51,7 +51,7 @@
     <citerefentry><refentrytitle>sd_bus_emit_interfaces_removed</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     whenever interfaces are added or removed from the sub-tree, respectively.</para>
 
-    <para>When <function>sd_bus_add_object_manager()</function> succeeds, a slot is created
+    <para>When <function>sd_bus_add_object_manager</function> succeeds, a slot is created
     internally. If the output parameter <replaceable>slot</replaceable> is <constant>NULL</constant>,
     a "floating" slot object is created, see
     <citerefentry><refentrytitle>sd_bus_slot_set_floating</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
@@ -111,7 +111,6 @@
       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_bus_add_object_vtable</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_emit_interfaces_added</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_bus_slot_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
   </refsect1>

man/sd_bus_call_method.xml

@@ -134,7 +134,6 @@
       <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_bus_call</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_bus_set_property</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_emit_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
   </refsect1>
 

man/sd_bus_emit_signal.xml

@@ -1,243 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!-- SPDX-License-Identifier: LGPL-2.1+ -->
-
-<refentry id="sd_bus_emit_signal"
-          xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>sd_bus_emit_signal</title>
-    <productname>systemd</productname>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd_bus_emit_signal</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd_bus_emit_signal</refname>
-    <refname>sd_bus_emit_signalv</refname>
-    <refname>sd_bus_emit_interfaces_added</refname>
-    <refname>sd_bus_emit_interfaces_added_strv</refname>
-    <refname>sd_bus_emit_interfaces_removed</refname>
-    <refname>sd_bus_emit_interfaces_removed_strv</refname>
-    <refname>sd_bus_emit_properties_changed</refname>
-    <refname>sd_bus_emit_properties_changed_strv</refname>
-    <refname>sd_bus_emit_object_added</refname>
-    <refname>sd_bus_emit_object_removed</refname>
-
-    <refpurpose>Convenience functions for emitting (standard) D-Bus signals</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-bus-vtable.h&gt;</funcsynopsisinfo>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_signal</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char *<parameter>interface</parameter></paramdef>
-        <paramdef>const char *<parameter>member</parameter></paramdef>
-        <paramdef>const char *<parameter>types</parameter></paramdef>
-        <paramdef>...</paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_signalv</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char *<parameter>interface</parameter></paramdef>
-        <paramdef>const char *<parameter>member</parameter></paramdef>
-        <paramdef>const char *<parameter>types</parameter></paramdef>
-        <paramdef>va_list <parameter>ap</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_interfaces_added</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char *<parameter>interface</parameter></paramdef>
-        <paramdef>...</paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_interfaces_added_strv</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char **<parameter>interfaces</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_interfaces_removed</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char *<parameter>interface</parameter></paramdef>
-        <paramdef>...</paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_interfaces_removed_strv</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char **<parameter>interfaces</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_properties_changed</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char *<parameter>interface</parameter></paramdef>
-        <paramdef>const char *<parameter>name</parameter></paramdef>
-        <paramdef>...</paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_properties_changed_strv</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-        <paramdef>const char *<parameter>interface</parameter></paramdef>
-        <paramdef>const char **<parameter>names</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_object_added</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>int <function>sd_bus_emit_object_removed</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char *<parameter>path</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para><function>sd_bus_emit_signal()</function> is a convenience function for initializing a
-    bus message object and emitting the corresponding D-Bus signal. It combines the
-    <citerefentry><refentrytitle>sd_bus_message_new_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
-    <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    functions into a single function call. <function>sd_bus_emit_signalv()</function> is
-    equivalent to <function>sd_bus_message_append()</function>, except that it is called with a
-    <literal>va_list</literal> instead of a variable number of arguments.</para>
-
-    <para><function>sd_bus_emit_interfaces_added()</function> and
-    <function>sd_bus_emit_interfaces_removed()</function> are used to implement the
-    <function>InterfacesAdded</function> and <function>InterfacesRemoved</function> signals of the
-    <constant>org.freedesktop.DBus.ObjectManager</constant> interface. They take a path whose
-    interfaces have been modified as an argument and a variable list of interfaces that have been
-    added or removed, respectively. The final argument passed to
-    <function>sd_bus_emit_interfaces_added()</function> and
-    <function>sd_bus_emit_interfaces_removed()</function> <emphasis>must</emphasis> be
-    <constant>NULL</constant>. This allows both functions to safely determine the number of passed
-    interface arguments. <function>sd_bus_emit_interfaces_added_strv()</function> and
-    <function>sd_bus_emit_interfaces_removed_strv()</function> are identical to their respective
-    counterparts but both take the list of interfaces as a single argument instead of a variable
-    number of arguments.</para>
-
-    <para><function>sd_bus_emit_properties_changed()</function> is used to implement the
-    <function>PropertiesChanged</function> signal of the
-    <constant>org.freedesktop.DBus.Properties</constant> interface. It takes an object path,
-    interface and a variable list of property names as its arguments.  The final argument passed to
-    <function>sd_bus_emit_properties_changed()</function> <emphasis>must</emphasis> be
-    <constant>NULL</constant>. This allows it to safely determine the number of passed property
-    names. <function>sd_bus_emit_properties_changed_strv()</function> is identical to
-    <function>sd_bus_emit_properties_changed()</function> but takes the list of property names as a
-    single argument instead of a variable number of arguments.</para>
-
-    <para><function>sd_bus_emit_object_added()</function> and
-    <function>sd_bus_emit_object_removed()</function> are convenience functions for emitting the
-    <function>InterfacesAdded</function> or <function>InterfacesRemoved</function> signals for all
-    interfaces registered on a specific object path, respectively. This includes any parent fallback
-    vtables if they are not overridden by a more applicable child vtable. It also includes all the
-    standard D-Bus interfaces implemented by sd-bus itself on any registered object.</para>
-
-    <para>Note that <function>sd_bus_emit_interfaces_added()</function>,
-    <function>sd_bus_emit_interfaces_removed()</function>,
-    <function>sd_bus_emit_object_added()</function> and
-    <function>sd_bus_emit_object_removed()</function> require an object manager to have been
-    registered on the given object path or one of its parent object paths using
-    <citerefentry><refentrytitle>sd_bus_add_object_manager</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-    </para>
-  </refsect1>
-
-  <refsect1>
-    <title>Return Value</title>
-
-    <para>On success, these functions return a non-negative integer. On failure, they return a
-    negative errno-style error code.</para>
-
-    <refsect2>
-      <title>Errors</title>
-
-      <para>Returned errors may indicate the following problems:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><constant>-EINVAL</constant></term>
-
-          <listitem><para>One of the required parameters is <constant>NULL</constant> or invalid. A
-          reserved D-Bus interface was passed as the <replaceable>interface</replaceable> parameter.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ENOPKG</constant></term>
-
-          <listitem><para>The bus cannot be resolved.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ECHILD</constant></term>
-
-          <listitem><para>The bus was created in a different process.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ENOMEM</constant></term>
-
-          <listitem><para>Memory allocation failed.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><constant>-ESRCH</constant></term>
-
-          <listitem><para>One of <function>sd_bus_emit_interfaces_added()</function>,
-          <function>sd_bus_emit_interfaces_removed()</function>,
-          <function>sd_bus_emit_object_added()</function> or
-          <function>sd_bus_emit_object_removed()</function> was called on an object without an
-          object manager registered on its own object path or one of its parent object paths.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-
-      <para>See the man pages of
-      <citerefentry><refentrytitle>sd_bus_message_new_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
-      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-      for more possible errors.</para>
-    </refsect2>
-  </refsect1>
-
-  <xi:include href="libsystemd-pkgconfig.xml" />
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_message_new_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd_bus_call_method</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-</refentry>

man/sd_bus_get_current_handler.xml

@@ -1,85 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!-- SPDX-License-Identifier: LGPL-2.1+ -->
-
-<refentry id="sd_bus_get_current_handler" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <refentryinfo>
-    <title>sd_bus_get_current_handler</title>
-    <productname>systemd</productname>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>sd_bus_get_current_handler</refentrytitle>
-    <manvolnum>3</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>sd_bus_get_current_handler</refname>
-    <refname>sd_bus_get_current_message</refname>
-    <refname>sd_bus_get_current_slot</refname>
-    <refname>sd_bus_get_current_userdata</refname>
-
-    <refpurpose>Query information of the callback a bus object is currently running</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <funcsynopsis>
-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
-
-      <funcprototype>
-        <funcdef>sd_bus_message_handler_t <function>sd_bus_get_current_handler</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>sd_bus_message* <function>sd_bus_get_current_message</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>sd_bus_slot* <function>sd_bus_get_current_slot</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-      </funcprototype>
-
-      <funcprototype>
-        <funcdef>void* <function>sd_bus_get_current_userdata</function></funcdef>
-        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>Description</title>
-
-    <para>Whenever sd-bus is about to invoke a user-supplied callback function, it stores the
-    current callback, D-Bus message, slot and userdata pointer and allows these to be queried via
-    these <function>sd_bus_get_current_handler()</function>,
-    <function>sd_bus_get_current_message()</function>,
-    <function>sd_bus_get_current_slot()</function> and
-    <function>sd_bus_get_current_userdata()</function>, respectively. If <parameter>bus</parameter>
-    cannot be resolved or if execution does not reside in a user-supplied callback of
-    <parameter>bus</parameter> when calling any of these functions, they return
-    <constant>NULL</constant>.</para>
-  </refsect1>
-
-  <refsect1>
-    <title>Return Value</title>
-
-    <para>On success, these functions return the requested object. On failure, they return
-    <constant>NULL</constant>.</para>
-  </refsect1>
-
-  <xi:include href="libsystemd-pkgconfig.xml" />
-
-  <refsect1>
-    <title>See Also</title>
-
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-    </para>
-  </refsect1>
-
-</refentry>

man/sd_bus_message_new_signal.xml

@@ -113,8 +113,7 @@
 
     <para>
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-      <citerefentry><refentrytitle>sd_bus_emit_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     </para>
   </refsect1>