Standardize on 'file system' and 'namespace' in man pages.

[elogind.git] / man / daemon.xml

diff --git a/man/daemon.xml b/man/daemon.xml
index 9d43353f90096eb6725913d9e9620ba1d0c19295..1283799473ece3d31030085d7964d3a2555abe3d 100644 (file)
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -122,7 +122,7 @@
                                 first child, so that only the second
                                 child (the actual daemon process)
                                 stays around. This ensures that the
                                 first child, so that only the second
                                 child (the actual daemon process)
                                 stays around. This ensures that the

-                                daemon process is reparented to
+                                daemon process is re-parented to

                                 init/PID 1, as all daemons should
                                 be.</para></listitem>
 
                                 init/PID 1, as all daemons should
                                 be.</para></listitem>
 


@@ -181,11 +181,11 @@
                                 <function>exit()</function> in the
                                 original process. The process that
                                 invoked the daemon must be able to
                                 <function>exit()</function> in the
                                 original process. The process that
                                 invoked the daemon must be able to

-                                rely that this
+                                rely on that this

                                 <function>exit()</function> happens
                                 after initialization is complete and
                                 all external communication channels
                                 <function>exit()</function> happens
                                 after initialization is complete and
                                 all external communication channels

-                                established and
+                                are established and

                                 accessible.</para></listitem>
                         </orderedlist>
 
                                 accessible.</para></listitem>
                         </orderedlist>
 


@@ -196,7 +196,7 @@
                         compatibility with SysV systems should
                         implement the scheme pointed out
                         above. However, it is recommended to make this
                         compatibility with SysV systems should
                         implement the scheme pointed out
                         above. However, it is recommended to make this

-                        behaviour optional and configurable via a
+                        behavior optional and configurable via a

                         command line argument, to ease debugging as
                         well as to simplify integration into systems
                         using systemd.</para>
                         command line argument, to ease debugging as
                         well as to simplify integration into systems
                         using systemd.</para>


@@ -271,7 +271,7 @@
                                 for details.</para></listitem>
 
                                 <listitem><para>As much as possible,
                                 for details.</para></listitem>
 
                                 <listitem><para>As much as possible,

-                                rely on the init systemd's
+                                rely on the init system's

                                 functionality to limit the access of
                                 the daemon to files, services and
                                 other resources. i.e. in the case of
                                 functionality to limit the access of
                                 the daemon to files, services and
                                 other resources. i.e. in the case of


@@ -462,7 +462,7 @@
 
                         <para>New-style daemons which support socket
                         activation must be able to receive their
 
                         <para>New-style daemons which support socket
                         activation must be able to receive their

-                        sockets from the init system, instead of of
+                        sockets from the init system, instead of

                         creating and binding them themselves. For
                         details about the programming interfaces for
                         this scheme provided by systemd see
                         creating and binding them themselves. For
                         details about the programming interfaces for
                         this scheme provided by systemd see


@@ -740,7 +740,7 @@
                         directory returned by <command>pkg-config
                         systemd
                         --variable=systemdsystemunitdir</command> (for
                         directory returned by <command>pkg-config
                         systemd
                         --variable=systemdsystemunitdir</command> (for

-                        system services), resp. <command>pkg-config
+                        system services) or <command>pkg-config

                         systemd
                         --variable=systemduserunitdir</command>
                         (for user services). This will make the
                         systemd
                         --variable=systemduserunitdir</command>
                         (for user services). This will make the


@@ -905,7 +905,7 @@ fi</programlisting>
                         <function>sd_listen_fds()</function> returns a
                         positive value), skip the socket creation step
                         and use the passed sockets. Secondly, ensure
                         <function>sd_listen_fds()</function> returns a
                         positive value), skip the socket creation step
                         and use the passed sockets. Secondly, ensure

-                        that the file-system socket nodes for local
+                        that the file system socket nodes for local

                         AF_UNIX sockets used in the socket-based
                         activation are not removed when the daemon
                         shuts down, if sockets have been
                         AF_UNIX sockets used in the socket-based
                         activation are not removed when the daemon
                         shuts down, if sockets have been