diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-14 10:37:40 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-21 16:58:04 +0200 |
| commit | 38b38500c6011d6bc59171ee23d92fba46bd131e (patch) | |
| tree | afdb5bd5328ead493714c9a713a268f31cd122c0 /man/machinectl.xml | |
| parent | debf2ddd2880e020070a9108925c4e42a7295d7f (diff) | |
| download | systemd-38b38500c6011d6bc59171ee23d92fba46bd131e.tar.gz | |
tree-wide: use "hostname" spelling everywhere
It's not that I think that "hostname" is vastly superior to "host name". Quite
the opposite — the difference is small, and in some context the two-word version
does fit better. But in the tree, there are ~200 occurrences of the first, and
>1600 of the other, and consistent spelling is more important than any particular
spelling choice.
Diffstat (limited to 'man/machinectl.xml')
| -rw-r--r-- | man/machinectl.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index c211ca02a9..e903eca721 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -56,7 +56,7 @@ </itemizedlist> <para>Machines are identified by names that follow the same rules - as UNIX and DNS host names. For details, see below.</para> + as UNIX and DNS hostnames. For details, see below.</para> <para>Machines are instantiated from disk or file system images that frequently — but not necessarily — carry the same name as machines running @@ -383,7 +383,7 @@ image is optimized for file systems that support copy-on-write, and might not be efficient on others, due to file system limitations.</para> - <para>Note that this command leaves host name, machine ID and + <para>Note that this command leaves hostname, machine ID and all other settings that could identify the instance unmodified. The original image and the cloned copy will hence share these credentials, and it might be necessary to manually @@ -851,7 +851,7 @@ <para>The <command>machinectl</command> tool operates on machines and images whose names must be chosen following strict - rules. Machine names must be suitable for use as host names + rules. Machine names must be suitable for use as hostnames following a conservative subset of DNS and UNIX/Linux semantics. Specifically, they must consist of one or more non-empty label strings, separated by dots. No leading or trailing |