[systemd-devel] [PATCH 1/5] doc: use non-contracted forms in written documents

Jan Engelhardt jengelh at inai.de
Sat May 3 10:15:23 PDT 2014


---
 NEWS                       | 42 +++++++++++++++++++++---------------------
 README                     |  2 +-
 TODO                       | 36 ++++++++++++++++++------------------
 man/sd_bus_path_encode.xml |  2 +-
 man/systemd.network.xml    |  2 +-
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/NEWS b/NEWS
index 0d7376c..5ca6c03 100644
--- a/NEWS
+++ b/NEWS
@@ -127,8 +127,8 @@ CHANGES WITH 212:
           timers configured this way will save to disk when they have
           been last triggered. This information is then used on next
           reboot to possible execute overdue timer events, that
-          couldn't take place because the system was powered off. This
-          enables simple anacron-like behaviour for timer units.
+          could not take place because the system was powered off.
+          This enables simple anacron-like behaviour for timer units.
 
         * systemctl's "list-timers" will now also list the time a
           timer unit was last triggered in addition to the next time
@@ -359,10 +359,10 @@ CHANGES WITH 210:
           anymore. Instead we now build libsystemd.so multiple times
           under these alternative names. This means that the footprint
           is drastically increased, but given that these are
-          transitional compatibility libraries this shouldn't matter
+          transitional compatibility libraries this should not matter
           much. This change has been made necessary to support the ARM
           platform for these compatibility libraries, as the ARM
-          toolchain isn't really at the same level as the toolchain
+          toolchain is not really at the same level as the toolchain
           for other architectures like x86 and does not support
           IFUNC. Please make sure to use --enable-compat-libs only
           during a transitional period!
@@ -617,7 +617,7 @@ CHANGES WITH 209:
           merged them into a single library, libsystemd.so, which
           provides all symbols. The reason for this is cyclic
           dependencies, as these libraries tend to use each other's
-          symbols. So far, we've managed to workaround that by linking
+          symbols. So far, we have managed to workaround that by linking
           a copy of a good part of our code into each of these
           libraries again and again, which, however, makes certain
           things hard to do, like sharing static variables. Also, it
@@ -861,13 +861,13 @@ CHANGES WITH 208:
 
         * A new tmpfiles.d(5) command "m" has been introduced which
           may be used to change the owner/group/access mode of a file
-          or directory if it exists, but do nothing if it doesn't.
+          or directory if it exists, but do nothing if it does not.
 
         * This release removes high-level support for the
           MemorySoftLimit= cgroup setting. The underlying kernel
           cgroup attribute memory.soft_limit= is currently badly
           designed and likely to be removed from the kernel API in its
-          current form, hence we shouldn't expose it for now.
+          current form, hence we should not expose it for now.
 
         * The memory.use_hierarchy cgroup attribute is now enabled for
           all cgroups systemd creates in the memory cgroup
@@ -950,7 +950,7 @@ CHANGES WITH 207:
 
         * InaccessibleDirectories= and ReadOnlyDirectories= now take
           paths that are optionally prefixed with "-" to indicate that
-          it should not be considered a failure if they don't exist.
+          it should not be considered a failure if they do not exist.
 
         * journalctl -o (and similar commands) now understands a new
           output mode "short-precise", it is similar to "short" but
@@ -1056,7 +1056,7 @@ CHANGES WITH 206:
           databases to pre-generate dead device nodes based on meta
           information contained in kernel modules, so that these would
           be auto-loaded on access rather then at boot. As this
-          doesn't really have much to do with the exposing actual
+          does not really have much to do with the exposing actual
           kernel devices to userspace this has always been slightly
           alien in the udev codebase. Following the new scheme kmod
           will now generate a runtime snippet for tmpfiles from the
@@ -1476,7 +1476,7 @@ CHANGES WITH 201:
 
         * 'systemd-analyze dot' gained the ability to filter for
           specific units via shell-style globs, to create smaller,
-          more useful graphs. I.e. it's now possible to create simple
+          more useful graphs. I.e. it is now possible to create simple
           graphs of all the dependencies between only target units, or
           of all units that Avahi has dependencies with.
 
@@ -1854,8 +1854,8 @@ CHANGES WITH 197:
           http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
 
         * Auke Kok's bootchart implementation has been added to the
-          systemd tree. It's an optional component that can graph the
-          boot in quite some detail. It's one of the best bootchart
+          systemd tree. It is an optional component that can graph the
+          boot in quite some detail. It is one of the best bootchart
           implementations around and minimal in its code and
           dependencies.
 
@@ -2056,7 +2056,7 @@ CHANGES WITH 196:
           PolicyKit-less systems. Quite frankly this should have been
           this way since day one. It is absolutely our intention to
           make systemd work fine on PolicyKit-less systems, and we
-          consider it a bug if something doesn't work as it should if
+          consider it a bug if something does not work as it should if
           PolicyKit is not around.
 
         * For embedded systems it is now possible to build udev and
@@ -2228,7 +2228,7 @@ CHANGES WITH 192:
         * The bash completion logic is now available for journalctl
           too.
 
-        * We don't mount the "cpuset" controller anymore together with
+        * We do not mount the "cpuset" controller anymore together with
           "cpu" and "cpuacct", as "cpuset" groups generally cannot be
           started if no parameters are assigned to it. "cpuset" hence
           broke code that assumed it it could create "cpu" groups and
@@ -2277,7 +2277,7 @@ CHANGES WITH 191:
 
 CHANGES WITH 190:
 
-        * Whenever a unit changes state we'll now log this to the
+        * Whenever a unit changes state we will now log this to the
           journal and show along the unit's own log output in
           "systemctl status".
 
@@ -2347,7 +2347,7 @@ CHANGES WITH 190:
         * There's now a new RPM macro definition for the system preset
           dir: %_presetdir.
 
-        * journald will now warn if it can't forward a message to the
+        * journald will now warn if it ca not forward a message to the
           syslog daemon because it's socket is full.
 
         * timedated will no longer write or process /etc/timezone,
@@ -2876,7 +2876,7 @@ CHANGES WITH 183:
 
         * systemctl will now warn you if .mount units generated from
           /etc/fstab are out of date due to changes in fstab that
-          haven't been read by systemd yet.
+          have not been read by systemd yet.
 
         * systemd is now suitable for usage in initrds. Dracut has
           already been updated to make use of this. With this in place
@@ -2939,7 +2939,7 @@ CHANGES WITH 183:
         * We now mount /tmp as tmpfs by default, but this can be
           masked and /etc/fstab can override it.
 
-        * Since udisks doesn't make use of /media anymore we are not
+        * Since udisks does not make use of /media anymore we are not
           mounting a tmpfs on it anymore.
 
         * journalctl gained a new --local switch to only interleave
@@ -2980,7 +2980,7 @@ CHANGES WITH 44:
           folks
 
         * We now refuse non-UTF8 strings used in various configuration
-          and unit files. This is done to ensure we don't pass invalid
+          and unit files. This is done to ensure we do not pass invalid
           data over D-Bus or expose it elsewhere.
 
         * Register Mimo USB Screens as suitable for automatic seat
@@ -3141,7 +3141,7 @@ CHANGES WITH 39:
           death, since fanotify() will not see accesses done by blkid,
           or fsck.
 
-        * Don't show kernel threads in systemd-cgls anymore, unless
+        * Do not show kernel threads in systemd-cgls anymore, unless
           requested with new -k switch.
 
         Contributions from: Dan Horák, Kay Sievers, Lennart
@@ -3213,7 +3213,7 @@ CHANGES WITH 38:
           --with-rootprefix= to follow the naming used by udev and
           kmod
 
-        * Unless specified otherwise we'll now install to /usr instead
+        * Unless specified otherwise we will now install to /usr instead
           of /usr/local by default.
 
         * Processes with '@' in argv[0][0] are now excluded from the
diff --git a/README b/README
index cecbcbf..795db89 100644
--- a/README
+++ b/README
@@ -43,7 +43,7 @@ REQUIREMENTS:
 
         Kernel Config Options:
           CONFIG_DEVTMPFS
-          CONFIG_CGROUPS (it's OK to disable all controllers)
+          CONFIG_CGROUPS (it is OK to disable all controllers)
           CONFIG_INOTIFY_USER
           CONFIG_SIGNALFD
           CONFIG_TIMERFD
diff --git a/TODO b/TODO
index c9fcd30..876b6c8 100644
--- a/TODO
+++ b/TODO
@@ -40,7 +40,7 @@ Features:
 
 * mount_cgroup_controllers(): symlinks need to get the label applied
 
-* For timer units: add some mechanisms so that timer units that trigger immediately on boot don't have the services they run added to the initial transaction and thus confuse Type=idle. Alternatively, split up the boot-up state into two, and make Type=idle only be affected by jobs for the default target, but ignore any further jobs
+* For timer units: add some mechanisms so that timer units that trigger immediately on boot do not have the services they run added to the initial transaction and thus confuse Type=idle. Alternatively, split up the boot-up state into two, and make Type=idle only be affected by jobs for the default target, but ignore any further jobs
 
 * Add RPM macros for registering/unregistering binfmt drop-ins
 
@@ -75,7 +75,7 @@ Features:
 
 * improve journalctl performance by loading journal files
   lazily. Encode just enough information in the file name, so that we
-  don't have to open it to know that it is not interesting for us, for
+  do not have to open it to know that it is not interesting for us, for
   the most common operations.
 
 * support transient mount units
@@ -167,7 +167,7 @@ Features:
 
 * btrfs raid assembly: some .device jobs stay stuck in the queue
 
-* make sure gdm doesn't use multi-user-x but the new default X configuration file, and then remove multi-user-x from systemd
+* make sure gdm does not use multi-user-x but the new default X configuration file, and then remove multi-user-x from systemd
 
 * man: the documentation of Restart= currently is very misleading and suggests the tools from ExecStartPre= might get restarted.
 
@@ -184,7 +184,7 @@ Features:
 
 * sd-bus:
   - make AddMatch calls on dbus1 transports async
-  - when kdbus doesn't take our message without memfds, try again with memfds
+  - when kdbus does not take our message without memfds, try again with memfds
   - systemd-bus-proxyd needs to enforce good old XML policy
   - port exit-on-idle logic to byebye ioctl
   - allow updating attach flags during runtime
@@ -241,7 +241,7 @@ Features:
   file.
 
 * seems that when we follow symlinks to units we prefer the symlink
-  destination path over /etc and /usr. We shouldn't do that. Instead
+  destination path over /etc and /usr. We should not do that. Instead
   /etc should always override /run+/usr and also any symlink
   destination.
 
@@ -267,7 +267,7 @@ Features:
 
 * journal-or-kmsg is currently broken? See reverted commit 4a01181e460686d8b4a543b1dfa7f77c9e3c5ab8.
 
-* remove any syslog support from log.c -- we probably can't do this before split-off udev is gone for good
+* remove any syslog support from log.c -- we probably cannot do this before split-off udev is gone for good
 
 * shutdown logging: store to EFI var, and store to USB stick?
 
@@ -323,7 +323,7 @@ Features:
   - journald: also get thread ID from client, plus thread name
   - journal: when waiting for journal additions in the client always sleep at least 1s or so, in order to minimize wakeups
   - add API to close/reopen/get fd for journal client fd in libsystemd-journal.
-  - fallback to /dev/log based logging in libsystemd-journal, if we can't log natively?
+  - fallback to /dev/log based logging in libsystemd-journal, if we cannot log natively?
   - declare the local journal protocol stable in the wiki interface chart
   - journal: reuse XZ context
   - sd-journal: speed up sd_journal_get_data() with transparent hash table in bg
@@ -359,7 +359,7 @@ Features:
   - journald: make sure ratelimit is actually really per-service with the new cgroup changes
   - change systemd-journal-flush into a service that stays around during
     boot, and causes the journal to be moved back to /run on shutdown,
-    so that we don't keep /var busy. This needs to happen synchronously,
+    so that we do not keep /var busy. This needs to happen synchronously,
     hence doing this via signals is not going to work.
 
 * document:
@@ -387,7 +387,7 @@ Features:
   - print nice message from systemctl --failed if there are no entries shown, and hook that into ExecStartPre of rescue.service/emergency.service
   - add new command to systemctl: "systemctl system-reexec" which reexecs as many daemons as virtually possible
   - systemctl enable: improve the success messages (i.e. more human readable, less shell-like)
-  - systemctl enable: fail if target to alias into doesn't exist? maybe show how many units are enabled afterwards?
+  - systemctl enable: fail if target to alias into does not exist? maybe show how many units are enabled afterwards?
   - systemctl: "Journal has been rotated since unit was started." message is misleading
   - support "systemctl stop foobar at .service" to stop all units matching a certain template
   - Something is wrong with symlink handling of "autovt at .service" in "systemctl list-unit-files"
@@ -414,7 +414,7 @@ Features:
     o DST changes
   - Support 2012-02~4 as syntax for specifying the fourth to last day of the month.
   - calendarspec: support value ranges with ".." notation. Example: 2013-4..8-1
-  - when parsing calendar timestamps support the UTC timezone (even if we won't support arbitrary timezone specs, support UTC itself certainly makes sense), also support syntaxes such as +0200
+  - when parsing calendar timestamps support the UTC timezone (even if we will not support arbitrary timezone specs, support UTC itself certainly makes sense), also support syntaxes such as +0200
   - Modulate timer frequency based on battery state
 
 * update the kernel's TZ (sys_tz) when DST changes
@@ -438,7 +438,7 @@ Features:
 * If we show an error about a unit (such as not showing up) and it has no Description string, then show a description string generated form the reverse of unit_name_mangle().
 
 * fedup: add --unit to systemctl switch-root somehow
-* fedup: don't delete initrd on switch-root
+* fedup: do not delete initrd on switch-root
 * fedup: generator
 
 * timedated: refuse time changes when NTP is on
@@ -459,7 +459,7 @@ Features:
 
 * hostnamed: before returning information from /etc/machine-info.conf check the modification data and reread. Similar for localed, ...
 
-* currently x-systemd.timeout is lost in the initrd, since crypttab is copied into dracut, but fstab isn't
+* currently x-systemd.timeout is lost in the initrd, since crypttab is copied into dracut, but fstab is not
 
 * nspawn:
   - nspawn: --read-only is not applied recursively to submounts
@@ -505,9 +505,9 @@ Features:
 
 * drop PID 1 reloading, only do reexecing (difficult: Reload()
   currently is properly synchronous, Reexec() is weird, because we
-  can't delay the response properly until we are back, so instead of
+  cannot delay the response properly until we are back, so instead of
   being properly synchronous we just keep open the fd and close it
-  when done. That means clients don't get a successful method reply,
+  when done. That means clients do not get a successful method reply,
   but much rather a disconnect on success.
 
 * properly handle loop back mounts via fstab, especially regards to fsck/passno
@@ -521,7 +521,7 @@ Features:
 * rename "userspace" to "core-os"
 
 * load-fragment: when loading a unit file via a chain of symlinks
-  verify that it isn't masked via any of the names traversed.
+  verify that it is not masked via any of the names traversed.
 
 * introduce Type=pid-file
 
@@ -576,7 +576,7 @@ Features:
   - check systemd-tmpfiles for selinux context hookup for mknod(), symlink() and similar
   - apply "x" on "D" too (see patch from William Douglas)
 
-* for services: don't set $HOME in services unless requested
+* for services: do not set $HOME in services unless requested
 
 * hide PAM options in fragment parser when compile time disabled
 
@@ -717,7 +717,7 @@ External:
 
 * drop accountsservice's StandardOutput=syslog and Type=dbus fields
 
-* dbus upstream still refers to dbus.target and shouldn't
+* dbus upstream still refers to dbus.target and should not
 
 * dbus: in fedora, make /var/lib/dbus/machine-id a symlink to /etc/machine-id
 
@@ -745,7 +745,7 @@ Regularly:
 
 * pahole
 
-* set_put(), hashmap_put() return values check. i.e. == 0 doesn't free()!
+* set_put(), hashmap_put() return values check. i.e. == 0 does not free()!
 
 * use secure_getenv() instead of getenv() where appropriate
 
diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml
index 5c166d0..2cc720f 100644
--- a/man/sd_bus_path_encode.xml
+++ b/man/sd_bus_path_encode.xml
@@ -118,7 +118,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     returns positive or 0, and a valid bus path in the return
     argument. On success, <function>sd_bus_path_decode()</function>
     returns a positive value if the prefixed matched, or 0 if it
-    didn't. If the prefix matched the external identifier is returned
+    did not. If the prefix matched the external identifier is returned
     in the return parameter. If it did not match NULL is returned in
     the return parameter. On failure, a negative errno-style error
     number is returned by either function. The returned strings must
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index f49de17..48e33ac 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -194,7 +194,7 @@
                                                 <para>A boolean. When true, enables IPv4 link-local support.
                                                 If <literal>DHCP=</literal> is also true, acquiring DHCP address
                                                 will deprecate previously acquired IPv4 link-local address or
-                                                stop acquiring process if there hasn't been one acquired before.
+                                                stop acquiring process if one has not been acquired before.
                                                 </para>
                                         </listitem>
                                 </varlistentry>
-- 
1.8.4.5



More information about the systemd-devel mailing list