man: use "filename" not "file name" by default

We settled on "filename" and "file system", so change a couple of places for
consistency. The exception is when there's an adjective before "file" that
binds more strongly then "name": "password file name", "output file name", etc.
Those cases are left intact.

diff --git a/man/machinectl.xml b/man/machinectl.xml
index 66ee063..cf46fe8 100644 (file)
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -819,7 +819,7 @@
         qcow2 or raw disk image, possibly compressed with xz, gzip or
         bzip2. If the second argument (the resulting image name) is
         not specified, it is automatically derived from the file
-        name. If the file name is passed as <literal>-</literal>, the
+        name. If the filename is passed as <literal>-</literal>, the
         image is read from standard input, in which case the second
         argument is mandatory.</para>
 

diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
index 1192ca1..3bd388d 100644 (file)
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -183,7 +183,7 @@
     whether the specified file descriptor refers to a special file. If
     the <parameter>path</parameter> parameter is not
     <constant>NULL</constant>, it is checked whether the file
-    descriptor is bound to the specified file name. Special files in
+    descriptor is bound to the specified filename. Special files in
     this context are character device nodes and files in
     <filename>/proc</filename> or <filename>/sys</filename>.</para>
   </refsect1>

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index ed75e73..bb69599 100644 (file)
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -506,7 +506,7 @@
           <filename>/proc/devices</filename>. The latter is useful to
           whitelist all current and future devices belonging to a
           specific device group at once. The device group is matched
-          according to file name globbing rules, you may hence use the
+          according to filename globbing rules, you may hence use the
           <literal>*</literal> and <literal>?</literal>
           wildcards. Examples: <filename>/dev/sda5</filename> is a
           path to a device node, referring to an ATA or SCSI block

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 5b82d77..2b183a9 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -262,7 +262,7 @@
       <varlistentry>
         <term><varname>PIDFile=</varname></term>
 
-        <listitem><para>Takes an absolute file name pointing to the
+        <listitem><para>Takes an absolute filename pointing to the
         PID file of this daemon. Use of this option is recommended for
         services where <varname>Type=</varname> is set to
         <option>forking</option>. systemd will read the PID of the
@@ -302,7 +302,7 @@
         <varname>ExecStop=</varname> are not valid.)</para>
 
         <para>For each of the specified commands, the first argument must be an absolute path to an
-        executable. Optionally, this file name may be prefixed with a number of special characters:</para>
+        executable. Optionally, this filename may be prefixed with a number of special characters:</para>
 
         <table>
           <title>Special executable prefixes</title>

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 69000aa..64ad4c2 100644 (file)
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1137,7 +1137,7 @@
         <term><varname>Alias=</varname></term>
 
         <listitem><para>A space-separated list of additional names this unit shall be installed under. The names listed
-        here must have the same suffix (i.e. type) as the unit file name. This option may be specified more than once,
+        here must have the same suffix (i.e. type) as the unit filename. This option may be specified more than once,
         in which case all listed names are used. At installation time, <command>systemctl enable</command> will create
         symlinks from these names to the unit filename. Note that not all unit types support such alias names, and this
         setting is not supported for them. Specifically, mount, slice, swap, and automount units do not support