From a8eaaee72a2f06e0fb64fb71de3b71ecba31dafb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 3 Aug 2014 07:11:37 +0200 Subject: doc: correct orthography, word forms and missing/extraneous words --- man/machinectl.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'man/machinectl.xml') diff --git a/man/machinectl.xml b/man/machinectl.xml index 81bf268527..859789850c 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -245,7 +245,7 @@ checksum and signature. If no, no verification is done. If checksum is specified, the download is - checked for integrity after transfer is complete, but no + checked for integrity after the transfer is complete, but no signatures are verified. If signature is specified, the checksum is verified and the images's signature is checked against a local keyring of trustable vendors. It is @@ -423,7 +423,7 @@ When using the shell command without arguments, (thus invoking the executed shell or command on the - local host), it is similar in many ways to a su1 session, but, unlike su, completely isolates the new session from the originating session, so that it @@ -433,7 +433,7 @@ environment variables or resource limits, among other properties. - Note that the + Note that systemd-run1 may be used in place of the shell command, and allows more detailed, low-level configuration of the @@ -633,7 +633,7 @@ set-limit [NAME] BYTES - Sets the maximum size in bytes a specific + Sets the maximum size in bytes that a specific container or VM image, or all images, may grow up to on disk (disk quota). Takes either one or two parameters. The first, optional parameter refers to a container or VM image name. If @@ -646,7 +646,7 @@ Note that per-container size limits are only supported on btrfs file systems. Also note that, if - set-limit is invoked without image + set-limit is invoked without an image parameter, and /var/lib/machines is empty, and the directory is not located on btrfs, a btrfs loopback file is implicitly created as @@ -656,7 +656,7 @@ loopback may later be readjusted with set-limit, as well. If such a loopback-mounted /var/lib/machines - directory is used, set-limit without image + directory is used, set-limit without an image name alters both the quota setting within the file system as well as the loopback file and file system size itself. @@ -802,7 +802,7 @@ and places it under the specified name in /var/lib/machines/. When import-tar is used, the file specified as - first argument should be a tar archive, possibly compressed + the first argument should be a tar archive, possibly compressed with xz, gzip or bzip2. It will then be unpacked into its own subvolume in /var/lib/machines. When import-raw is used, the file should be a @@ -883,17 +883,17 @@ semantics. Specifically, they must consist of one or more non-empty label strings, separated by dots. No leading or trailing dots are allowed. No sequences of multiple dots are allowed. The - label strings may only consists of alphanumeric characters as well + label strings may only consist of alphanumeric characters as well as the dash and underscore. The maximum length of a machine name is 64 characters. A special machine with the name .host refers to the running host system itself. This is useful for execution - operations or inspecting the host system as well. Not that + operations or inspecting the host system as well. Note that machinectl list will not show this special machine unless the switch is specified. - Requirements on image names are less strict, however must be + Requirements on image names are less strict, however, they must be valid UTF-8, must be suitable as file names (hence not be the single or double dot, and not include a slash), and may not contain control characters. Since many operations search for an @@ -901,7 +901,7 @@ images in the same strict fashion as machines. A special image with the name .host - refers to the image of the running host system. It is hence + refers to the image of the running host system. It hence conceptually maps to the special .host machine name described above. Note that machinectl list-images won't show this special image either, unless @@ -943,7 +943,7 @@ A simple directory tree, containing the files and directories of the container to boot. - A subvolume (on btrfs file systems), which are + Subvolumes (on btrfs file systems), which are similar to the simple directories, described above. However, they have additional benefits, such as efficient cloning and quota reporting. @@ -956,7 +956,7 @@ See systemd-nspawn1 - for more information on image formats, in particular it's + for more information on image formats, in particular its and options. @@ -1010,8 +1010,8 @@ # machinectl export-tar fedora myfedora.tar.xz - Exports the container fedora in an - xz-compress tar file myfedora.tar.xz in the + Exports the container fedora as an + xz-compressed tar file myfedora.tar.xz into the current directory. -- cgit v1.2.3-54-g00ecf