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 --- src/basic/terminal-util.c | 2 +- src/basic/unit-name.c | 2 +- src/core/swap.c | 2 +- src/libsystemd/sd-bus/bus-error.c | 2 +- src/machine/machine.c | 2 +- src/nspawn/nspawn.c | 4 ++-- src/resolve/resolved-conf.c | 2 +- src/sysusers/sysusers.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index b96bfcb8ef..3931b03bc2 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -420,7 +420,7 @@ int acquire_terminal( assert_se(sigaction(SIGHUP, &sa_old, NULL) == 0); - /* Sometimes it makes sense to ignore TIOCSCTTY + /* Sometimes, it makes sense to ignore TIOCSCTTY * returning EPERM, i.e. when very likely we already * are have this controlling terminal. */ if (r < 0 && r == -EPERM && ignore_tiocstty_eperm) diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c index 0775ae7c14..710421508c 100644 --- a/src/basic/unit-name.c +++ b/src/basic/unit-name.c @@ -655,7 +655,7 @@ static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t * /blah/blah is converted to blah-blah.mount, anything else is left alone, * except that @suffix is appended if a valid unit suffix is not present. * - * If @allow_globs, globs characters are preserved. Otherwise they are escaped. + * If @allow_globs, globs characters are preserved. Otherwise, they are escaped. */ int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, const char *suffix, char **ret) { char *s, *t; diff --git a/src/core/swap.c b/src/core/swap.c index f626ea4d87..baaa27b6a3 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -1206,7 +1206,7 @@ static Unit *swap_following(Unit *u) { if (other->from_fragment) return UNIT(other); - /* Otherwise make everybody follow the unit that's named after + /* Otherwise, make everybody follow the unit that's named after * the swap device in the kernel */ if (streq_ptr(s->what, s->devnode)) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index 84229c2964..239d7245e6 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -567,7 +567,7 @@ _public_ int sd_bus_error_set_errnof(sd_bus_error *e, int error, const char *for const char *bus_error_message(const sd_bus_error *e, int error) { if (e) { - /* Sometimes the D-Bus server is a little bit too verbose with + /* Sometimes, the D-Bus server is a little bit too verbose with * its error messages, so let's override them here */ if (sd_bus_error_has_name(e, SD_BUS_ERROR_ACCESS_DENIED)) return "Access denied"; diff --git a/src/machine/machine.c b/src/machine/machine.c index cbc03640c1..196bc4b8f4 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -552,7 +552,7 @@ int machine_kill(Machine *m, KillWho who, int signo) { return 0; } - /* Otherwise make PID 1 do it for us, for the entire cgroup */ + /* Otherwise, make PID 1 do it for us, for the entire cgroup */ return manager_kill_unit(m->manager, m->unit, signo, NULL); } diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index ff12ca6498..c0b29bf4af 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2828,7 +2828,7 @@ static int load_settings(void) { p = j; j = NULL; - /* By default we trust configuration from /etc and /run */ + /* By default, we trust configuration from /etc and /run */ if (arg_settings_trusted < 0) arg_settings_trusted = true; @@ -2858,7 +2858,7 @@ static int load_settings(void) { if (!f && errno != ENOENT) return log_error_errno(errno, "Failed to open %s: %m", p); - /* By default we do not trust configuration from /var/lib/machines */ + /* By default, we do not trust configuration from /var/lib/machines */ if (arg_settings_trusted < 0) arg_settings_trusted = false; } diff --git a/src/resolve/resolved-conf.c b/src/resolve/resolved-conf.c index 42e3be3168..de1bd26174 100644 --- a/src/resolve/resolved-conf.c +++ b/src/resolve/resolved-conf.c @@ -97,7 +97,7 @@ int config_parse_dnsv( /* Empty assignment means clear the list */ manager_flush_dns_servers(m, ltype); else { - /* Otherwise add to the list */ + /* Otherwise, add to the list */ r = manager_parse_dns_server(m, ltype, rvalue); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse DNS server string '%s'. Ignoring.", rvalue); diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index 9a1c88d08e..008b1bde24 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -943,7 +943,7 @@ static int add_user(Item *i) { } } - /* Otherwise try to reuse the group ID */ + /* Otherwise, try to reuse the group ID */ if (!i->uid_set && i->gid_set) { r = uid_is_ok((uid_t) i->gid, i->name); if (r < 0) -- 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 'src') 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 @@