From b938cb902c3b5bca807a94b277672c64d6767886 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 3 Aug 2014 07:11:12 +0200 Subject: doc: correct punctuation and improve typography in documentation --- man/systemd.service.xml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'man/systemd.service.xml') diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 8afdbc513b..d7c53087f4 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -254,7 +254,7 @@ for, and its node will be bind-mounted over the default bus node location, so the service can only access the bus through its own endpoint. Note that custom bus endpoints default to a - 'deny all' policy. Hence, if at least one + "deny all" policy. Hence, if at least one BusPolicy= directive is given, you have to make sure to add explicit rules for everything the service should be able to do. @@ -403,11 +403,11 @@ Note that it is usually not sufficient to specify a command for this setting that only asks the service to - terminate (for example by queuing some form of termination + terminate (for example, by queuing some form of termination signal for it), but does not wait for it to do so. Since the remaining processes of the services are killed using SIGKILL immediately after the command - exited this would not result in a clean stop. The specified + exited, this would not result in a clean stop. The specified command should hence be a synchronous operation, not an asynchronous one. @@ -628,7 +628,7 @@ - As exceptions to the setting above the service will not + As exceptions to the setting above, the service will not be restarted if the exit code or signal is specified in RestartPreventExitStatus= (see below). Also, the services will always be restarted if the exit code @@ -646,8 +646,8 @@ SuccessExitStatus= - Takes a list of exit status definitions that - when returned by the main service process will be considered + Takes a list of exit status definitions that, + when returned by the main service process, will be considered successful termination, in addition to the normal successful exit code 0 and the signals SIGHUP, SIGINT, SIGTERM, and @@ -679,8 +679,8 @@ RestartPreventExitStatus= - Takes a list of exit status definitions that - when returned by the main service process will prevent + Takes a list of exit status definitions that, + when returned by the main service process, will prevent automatic service restarts, regardless of the restart setting configured with Restart=. Exit status definitions can either be numeric exit codes or termination @@ -699,8 +699,8 @@ RestartForceExitStatus= - Takes a list of exit status definitions that - when returned by the main service process will force automatic + Takes a list of exit status definitions that, + when returned by the main service process, will force automatic service restarts, regardless of the restart setting configured with Restart=. The argument format is similar to @@ -779,8 +779,8 @@ Sockets= Specifies the name of the socket units this service shall inherit socket file descriptors from when the - service is started. Normally it should not be necessary to use - this setting as all socket file descriptors whose unit shares + service is started. Normally, it should not be necessary to use + this setting, as all socket file descriptors whose unit shares the same name as the service (subject to the different unit name suffix of course) are passed to the spawned process. @@ -789,7 +789,7 @@ to multiple processes simultaneously. Also note that a different service may be activated on incoming socket traffic than the one which is ultimately configured to inherit the - socket file descriptors. Or in other words: the + socket file descriptors. Or, in other words: the Service= setting of .socket units does not have to match the inverse of the Sockets= setting of the @@ -992,7 +992,7 @@ contains, resulting in a single argument. Use $FOO as a separate word on the command line, in which case it will be replaced by the value of the environment - variable split at whitespace resulting in zero or more arguments. + variable split at whitespace, resulting in zero or more arguments. For this type of expansion, quotes are respected when splitting into words, and afterwards removed. @@ -1175,7 +1175,7 @@ WantedBy=multi-user.target Oneshot service - Sometimes units should just execute an action without + Sometimes, units should just execute an action without keeping active processes, such as a filesystem check or a cleanup action on boot. For this, Type= exists. Units @@ -1194,10 +1194,10 @@ ExecStart=/usr/sbin/foo-cleanup WantedBy=multi-user.target Note that systemd will consider the unit to be in the - state 'starting' until the program has terminated, so ordered + state "starting" until the program has terminated, so ordered dependencies will wait for the program to finish before starting - themselves. The unit will revert to the 'inactive' state after - the execution is done, never reaching the 'active' state. That + themselves. The unit will revert to the "inactive" state after + the execution is done, never reaching the "active" state. That means another request to start the unit will perform the action again. @@ -1214,7 +1214,7 @@ WantedBy=multi-user.target Similarly to the oneshot services, there are sometimes units that need to execute a program to set up something and then execute another to shut it down, but no process remains - active while they are considered 'started'. Network + active while they are considered "started". Network configuration can sometimes fall into this category. Another use case is if a oneshot service shall not be executed a each time when they are pulled in as a dependency, but only the first @@ -1227,11 +1227,11 @@ WantedBy=multi-user.target types, but is most useful with Type= and Type=. With - Type= systemd waits + Type=, systemd waits until the start action has completed before it considers the unit to be active, so dependencies start only after the start action has succeeded. With - Type= dependencies + Type=, dependencies will start immediately after the start action has been dispatched. The following unit provides an example for a simple static firewall. @@ -1266,7 +1266,7 @@ WantedBy=multi-user.target RemainAfterExit=), the service is considered started. - Often a traditional daemon only consists of one process. + Often, a traditional daemon only consists of one process. Therefore, if only one process is left after the original process terminates, systemd will consider that process the main process of the service. In that case, the @@ -1281,7 +1281,7 @@ WantedBy=multi-user.target traditional PID file, systemd will be able to read the main PID from there. Please set PIDFile= accordingly. Note that the daemon should write that file before finishing - with its initialization, otherwise systemd might try to read the + with its initialization. Otherwise, systemd might try to read the file before it exists. The following example shows a simple daemon that forks and -- cgit v1.2.3-54-g00ecf 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 --- NEWS | 18 ++++---- TODO | 2 +- man/bootctl.xml | 2 +- man/busctl.xml | 12 ++--- man/coredump.conf.xml | 2 +- man/crypttab.xml | 4 +- man/custom-html.xsl | 2 +- man/file-hierarchy.xml | 12 ++--- man/hwdb.xml | 4 +- man/journalctl.xml | 14 +++--- man/journald.conf.xml | 14 +++--- man/libudev.xml | 2 +- man/logind.conf.xml | 4 +- man/machinectl.xml | 30 ++++++------- man/networkctl.xml | 2 +- man/nss-myhostname.xml | 2 +- man/nss-mymachines.xml | 2 +- man/resolved.conf.xml | 6 +-- man/sd-bus-errors.xml | 2 +- man/sd_bus_creds_get_pid.xml | 28 ++++++------ man/sd_bus_creds_new_from_pid.xml | 12 ++--- man/sd_bus_default.xml | 8 ++-- man/sd_bus_error.xml | 8 ++-- man/sd_bus_error_add_map.xml | 2 +- man/sd_bus_message_append_array.xml | 4 +- man/sd_bus_message_get_monotonic_usec.xml | 2 +- man/sd_bus_negotiate_fds.xml | 4 +- man/sd_bus_path_encode.xml | 2 +- man/sd_event_add_child.xml | 2 +- man/sd_event_add_defer.xml | 2 +- man/sd_event_add_signal.xml | 4 +- man/sd_event_run.xml | 8 ++-- man/sd_event_set_name.xml | 4 +- man/sd_event_wait.xml | 8 ++-- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/sd_pid_get_session.xml | 6 +-- man/sd_seat_get_active.xml | 2 +- man/sd_session_is_active.xml | 2 +- man/sd_uid_get_state.xml | 2 +- man/standard-conf.xml | 2 +- man/sysctl.d.xml | 8 ++-- man/systemctl.xml | 22 ++++----- man/systemd-ask-password.xml | 4 +- man/systemd-backlight@.service.xml | 4 +- man/systemd-cgtop.xml | 4 +- man/systemd-escape.xml | 6 +-- man/systemd-firstboot.xml | 8 ++-- man/systemd-fsck@.service.xml | 4 +- man/systemd-hwdb.xml | 2 +- man/systemd-journald.service.xml | 2 +- man/systemd-machine-id-commit.service.xml | 2 +- man/systemd-machine-id-setup.xml | 2 +- man/systemd-notify.xml | 2 +- man/systemd-nspawn.xml | 14 +++--- man/systemd-resolved.service.xml | 2 +- man/systemd-run.xml | 2 +- man/systemd-sysusers.xml | 2 +- man/systemd-sysv-generator.xml | 4 +- man/systemd-timesyncd.service.xml | 2 +- man/systemd-update-done.service.xml | 2 +- man/systemd.automount.xml | 2 +- man/systemd.exec.xml | 6 +-- man/systemd.generator.xml | 8 ++-- man/systemd.link.xml | 4 +- man/systemd.mount.xml | 14 +++--- man/systemd.netdev.xml | 74 +++++++++++++++---------------- man/systemd.network.xml | 24 +++++----- man/systemd.nspawn.xml | 14 +++--- man/systemd.service.xml | 12 ++--- man/systemd.socket.xml | 12 ++--- man/systemd.swap.xml | 6 +-- man/systemd.time.xml | 2 +- man/systemd.unit.xml | 4 +- man/systemd.xml | 2 +- man/sysusers.d.xml | 2 +- man/tmpfiles.d.xml | 26 +++++------ man/udev_device_get_syspath.xml | 2 +- man/udev_device_new_from_syspath.xml | 2 +- man/udev_enumerate_scan_devices.xml | 2 +- man/udevadm.xml | 2 +- src/libsystemd-network/lldp-tlv.c | 2 +- src/libsystemd-network/sd-dhcp-client.c | 2 +- src/libsystemd-network/test-lldp.c | 2 +- src/nspawn/nspawn.c | 4 +- src/shared/machine-pool.c | 2 +- src/udev/udev-builtin-net_id.c | 8 ++-- 87 files changed, 295 insertions(+), 295 deletions(-) (limited to 'man/systemd.service.xml') diff --git a/NEWS b/NEWS index 87da6e18cc..080a5609e5 100644 --- a/NEWS +++ b/NEWS @@ -117,7 +117,7 @@ CHANGES WITH 227: * File descriptors passed during socket activation may now be named. A new API sd_listen_fds_with_names() is added to - access the names. The default names may be overriden, + access the names. The default names may be overridden, either in the .socket file using the FileDescriptorName= parameter, or by passing FDNAME= when storing the file descriptors using sd_notify(). @@ -1209,7 +1209,7 @@ CHANGES WITH 218: * journalctl gained two new commands --vacuum-size= and --vacuum-time= to delete old journal files until the - remaining ones take up no more the specified size on disk, + remaining ones take up no more than the specified size on disk, or are not older than the specified time. * A new, native PPPoE library has been added to sd-network, @@ -1303,7 +1303,7 @@ CHANGES WITH 218: a fixed machine ID for subsequent boots. * networkd's .netdev files now provide a large set of - configuration parameters for VXLAN devices. Similar, the + configuration parameters for VXLAN devices. Similarly, the bridge port cost parameter is now configurable in .network files. There's also new support for configuring IP source routing. networkd .link files gained support for a new @@ -1636,7 +1636,7 @@ CHANGES WITH 216: * .socket units gained a new DeferAcceptSec= setting that controls the kernels' TCP_DEFER_ACCEPT sockopt for - TCP. Similar, support for controlling TCP keep-alive + TCP. Similarly, support for controlling TCP keep-alive settings has been added (KeepAliveTimeSec=, KeepAliveIntervalSec=, KeepAliveProbes=). Also, support for turning off Nagle's algorithm on TCP has been added @@ -1852,7 +1852,7 @@ CHANGES WITH 215: * tmpfiles learnt a new "L+" directive which creates a symlink but (unlike "L") deletes a pre-existing file first, should it already exist and not already be the correct - symlink. Similar, "b+", "c+" and "p+" directives have been + symlink. Similarly, "b+", "c+" and "p+" directives have been added as well, which create block and character devices, as well as fifos in the filesystem, possibly removing any pre-existing files of different types. @@ -2035,14 +2035,14 @@ CHANGES WITH 214: CAP_NET_BROADCAST, CAP_NET_RAW capabilities though, but loses the ability to write to files owned by root this way. - * Similar, systemd-resolved now runs under its own + * Similarly, systemd-resolved now runs under its own "systemd-resolve" user with no capabilities remaining. - * Similar, systemd-bus-proxyd now runs under its own + * Similarly, systemd-bus-proxyd now runs under its own "systemd-bus-proxy" user with only CAP_IPC_OWNER remaining. * systemd-networkd gained support for setting up "veth" - virtual ethernet devices for container connectivity, as well + virtual Ethernet devices for container connectivity, as well as GRE and VTI tunnels. * systemd-networkd will no longer automatically attempt to @@ -2744,7 +2744,7 @@ CHANGES WITH 209: * The configuration of network interface naming rules for "permanent interface names" has changed: a new NamePolicy= setting in the [Link] section of .link files determines the - priority of possible naming schemes (onboard, slot, mac, + priority of possible naming schemes (onboard, slot, MAC, path). The default value of this setting is determined by /usr/lib/net/links/99-default.link. Old 80-net-name-slot.rules udev configuration file has been diff --git a/TODO b/TODO index c1dc3921f1..f4b5fb3c54 100644 --- a/TODO +++ b/TODO @@ -876,7 +876,7 @@ Features: - add Scope= parsing option for [Network] - properly handle routerless dhcp leases - add more attribute support for SIT tunnel - - work with non-ethernet devices + - work with non-Ethernet devices - add support for more bond options * networkd-wait-online: diff --git a/man/bootctl.xml b/man/bootctl.xml index 7e915e9eb5..ebd58750d3 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -68,7 +68,7 @@ system. bootctl status checks and prints the - currently installed versions of the boot loader binaries and the + currently installed versions of the boot loader binaries and all current EFI boot variables. bootctl update updates all installed diff --git a/man/busctl.xml b/man/busctl.xml index 4d8433f1fb..d8c1085021 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -231,7 +231,7 @@ be augmented with data from /proc. When this is turned on, the data shown is possibly inconsistent, as the data read from - /proc might be more recent than rest of + /proc might be more recent than the rest of the credential information. Defaults to yes. @@ -281,7 +281,7 @@ SERVICE is specified, show messages to or from this peer, identified by its well-known or unique name. Otherwise, show all messages on the bus. Use Ctrl-C to - terminate dump. + terminate the dump. @@ -344,7 +344,7 @@ set-property SERVICE OBJECT INTERFACE PROPERTY SIGNATURE ARGUMENT - Set the current value an object + Set the current value of an object property. Takes a service name, object path, interface name, property name, property signature, followed by a list of parameters formatted as strings. @@ -370,9 +370,9 @@ types, each parameter following the signature should simply be the parameter's value formatted as string. Positive boolean values may be formatted as true, yes, - on, 1; negative boolean + on, or 1; negative boolean values may be specified as false, - no, off, + no, off, or 0. For arrays, a numeric argument for the number of entries followed by the entries shall be specified. For variants, the signature of the contents shall be specified, @@ -456,7 +456,7 @@ ARRAY "s" { of the org.freedesktop.systemd1 service, and passes it two strings cups.service and - replace. As result of the method + replace. As a result of the method call, a single object path parameter is received and shown: diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml index 1ce71535b6..a0a497b467 100644 --- a/man/coredump.conf.xml +++ b/man/coredump.conf.xml @@ -98,7 +98,7 @@ Compress= Controls compression for external - storage. Takes a boolean argument, defaults to + storage. Takes a boolean argument, which defaults to yes. diff --git a/man/crypttab.xml b/man/crypttab.xml index d4ff760adc..1de834a045 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -160,10 +160,10 @@ at the beginning. This is different from the option with respect to the sector numbers used in initialization vector (IV) calculation. Using will shift the IV - calculation by the same negative amount. Hence, if , + calculation by the same negative amount. Hence, if is given, sector n will get a sector number of 0 for the IV calculation. Using causes sector n to also be the first - sector of the mapped device, but with its number for IV generation is n. + sector of the mapped device, but with its number for IV generation being n. This option is only relevant for plain devices. diff --git a/man/custom-html.xsl b/man/custom-html.xsl index fe379a4ff0..84c23014e4 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -125,7 +125,7 @@ -- cgit v1.2.3-54-g00ecf