summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDavid Strauss <david@davidstrauss.net>2013-05-18 02:28:25 -0700
committerDavid Strauss <david@davidstrauss.net>2013-05-18 02:28:25 -0700
commit12f25b6e741bc8394f63778598fc203e3f6d4ae6 (patch)
tree9e692b745e4642b424c165dee5571b5cd774e734 /man
parent16af1d3922e1382c26b1beba38ddb22581c49f3b (diff)
Standardize on 'file system' and 'namespace' in man pages.
This change is based on existing usage in systemd and online. 'File-system' may make sense in adjectival form, but man pages seem to prefer 'file system' even in those situations.
Diffstat (limited to 'man')
-rw-r--r--man/daemon.xml2
-rw-r--r--man/systemd.exec.xml4
-rw-r--r--man/systemd.unit.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/man/daemon.xml b/man/daemon.xml
index 0d29e7aa1c..1283799473 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -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
- 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
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index b3e0287d72..ab1712efeb 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1068,10 +1068,10 @@
<term><varname>InaccessibleDirectories=</varname></term>
<listitem><para>Sets up a new
- file-system name space for executed
+ file system namespace for executed
processes. These options may be used
to limit access a process might have
- to the main file-system
+ to the main file system
hierarchy. Each setting takes a
space-separated list of absolute
directory paths. Directories listed in
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 5ab988178d..6a5eefb6db 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -195,7 +195,7 @@
in a both simpler and more flexible system.</para>
<para>Some unit names reflect paths existing in the
- file system name space. Example: a device unit
+ file system namespace. Example: a device unit
<filename>dev-sda.device</filename> refers to a device
with the device node <filename noindex='true'>/dev/sda</filename> in
the file system namespace. If this applies a special