Bug#781695: release-notes: proofreading for issue.dbk
Package: release-notes
Severity: normal
Tags: patch
I'm glad to see that the actual content of the Debian release notes
looks pretty much good to go, so I've got no proofreading work to do
here apart from trivial grammarchecking and the like. From my point
of view the upgrade to Jessie is already the smoothest for ages!
I attach a patch for various non-native-speakerisms; below I'll give
item-by-item comments.
> --- issues.dbk.pristine 2015-04-01 16:30:56.944993433 +0100
> +++ issues.dbk 2015-04-01 16:30:14.570238920 +0100
> @@ -19,7 +19,7 @@
> <section id="limited-security-support">
> <title>Limitations in security support</title>
> <para>
> - There are some packages, where Debian cannot promise to provide
> + There are some packages where Debian cannot promise to provide
> minimal backports for security issues. These are covered in the
> following subsections.
> </para>
English doesn't put commas around defining relative clauses.
> @@ -61,7 +61,7 @@
> Node.js</title>
> <para>
> The Node.js platform is built on top of <systemitem
> - role="package">libv8-3.14</systemitem>, which receives a high
> + role="package">libv8-3.14</systemitem>, which experiences a high
> volume of security issues, but there are currently no volunteers
> within the project or the security team sufficiently interested and
> willing to spend the large amount of time required to stem those
The problem here is that it's more or less confusing "bugs" with "bug
reports". I haven't exactly fixed that, but I hope this phrasing at
least makes it less obtrusive.
> @@ -70,13 +70,13 @@
> <para>
> Unfortunately, this means that <systemitem
> role="package">libv8-3.14</systemitem>, <systemitem
> - role="package">nodejs</systemitem> and the associated node-*
> + role="package">nodejs</systemitem>, and the associated node-*
> package ecosystem should not currently be used with untrusted
> - content, for example unsanitized data from the internet.
> + content, such as unsanitized data from the Internet.
> </para>
More natural use of commas.
> <para>
> In addition, these packages will not receive any security updates
> - during the lifetime of the jessie release.
> + during the lifetime of the Jessie release.
> </para>
> </section>
> </section>
> @@ -129,10 +129,10 @@
> upgrade.
> </para>
> <para>
> - When upgrading a Puppet managed system from wheezy to jessie, you must
> + When upgrading a Puppet managed system from Wheezy to Jessie, you must
> ensure that the corresponding puppetmaster runs at least Puppet
> - version 3.7. If the master is running wheezy's <systemitem
> - role="package">puppetmaster</systemitem>, the managed jessie system
> + version 3.7. If the master is running Wheezy's <systemitem
> + role="package">puppetmaster</systemitem>, the managed Jessie system
> will not be able to connect to it.
> </para>
> <para>
I've standardised on the capitalised spellings of releasenames. It's
possible they should all be &variables, but I'd advise against it
since it makes it harder to spot stale content.
> @@ -147,7 +147,7 @@
>
> <section id="php-incompat">
> <!-- Wheezy to Jessie -->
> - <title>PHP 5.6 upgrade has behavioural changes</title>
> + <title>PHP 5.6 upgrade has behavioral changes</title>
> <para>
> The upgrade to Jessie includes an upgrade of PHP from 5.4 to 5.6.
> This may affect any local PHP scripts and you are advised to check
Standardising on en_US (given that we just used "unsanitized").
> @@ -158,7 +158,7 @@
> <listitem>
> <para>
> To prevent man-in-the-middle attacks against encrypted
> - transfers client streams now verify peer certificates by
> + transfers, client streams now verify peer certificates by
> default.
> </para>
> <para>
Adding a comma for clarity.
> @@ -184,13 +184,13 @@
> <listitem>
> <para>
> All internal case insensitivity handling for class,
> - function and constant names is done according to ASCII
> + function, and constant names is done according to ASCII
> rules. Current locale settings are ignored.
> </para>
> </listitem>
> <listitem>
> <para>
> - The keywords "self", "parent" and "static" are now always
> + The keywords "self", "parent", and "static" are now always
> case insensitive.
> </para>
> </listitem>
Standardising on Harvard comma.
> @@ -229,7 +229,7 @@
> <para>
> For legal reasons, the JSON implementation bundled with PHP
> has been replaced with the version provided by the "jsonc"
> - PECL module. Code that makes assumptions (if any) about the
> + PECL module. Code that makes assumptions about the
> finer implementation details of the PHP JSON parser may need
> to be reviewed.
> </para>
The "(if any)" is redundant and confusing.
> @@ -250,12 +250,12 @@
> <title>Incompatible changes in Apache HTTPD 2.4</title>
> <note>
> <para>
> - This section only applies to systems, which have installed an
> + This section only applies to systems which have installed an
> Apache HTTPD server and configured it manually.
> </para>
English doesn't put commas around defining relative clauses.
> </note>
> <para>
> - There has been a number of changes to the configuration of the
> + There have been a number of changes to the configuration of the
> Apache HTTPD server in version 2.4. On the upstream side, the
> syntax has changed. Notably, the access control directives have
> changed considerably and will need manual migration to the
Logically "a number" would be singular, but that's unidiomatic.
> @@ -267,7 +267,7 @@
> migration. However, the reports suggest it may not always work.
> </para>
> <para>
> - The managing of configuration files have also been changed in the
> + The managing of configuration files has also been changed in the
> Debian packaging. In particular, all configuration files and
> sites must now end with ".conf" to be parsed by default. This
> change also replaces the existing use of
Logically "managing" is singular, and this time that's also the idiom.
> @@ -276,7 +276,7 @@
> <note>
> <para>
> During the upgrade, you may also see warnings about
> - configuration files placed in the
> + configuration files placed in
> <filename>/etc/apache2/conf.d/</filename>, which are provided by
> packages from Debian. This warning is unavoidable but harmless
> as the affected packages will move their configuration once
It's either "placed in the foo.d/ directory" or "placed in foo.d/".
> @@ -322,7 +322,7 @@
> <para>
> If you have a preference for another init such as <systemitem
> role="package">sysvinit-core</systemitem> or <systemitem
> - role="package">upstart</systemitem>, it is recommended to setup
> + role="package">upstart</systemitem>, it is recommended to set up
> APT pinning prior to the upgrade. This may also be required if
> you are upgrading LXC containers before the host. In this case,
> please refer to <xref linkend="issues-lxc-wheezy-host" />.
The noun is one word, "setup", but the verb is "set (something) up".
> @@ -340,7 +340,7 @@
> </screen>
> <caution>
> <para>
> - Be advised that some packages may have degraded behaviour or
> + Be advised that some packages may have degraded behavior or
> may be lacking features under a non-default init system.
> </para>
> </caution>
en_US.
> @@ -353,7 +353,7 @@
> installed first.
> </para>
> <para>
> - If APT or aptitude issues computing an upgrade path with the pin
> + If APT or aptitude has issues computing an upgrade path with the pin
> in place, you may be able to help it by manually installing both
> <systemitem role="package">sysvinit-core</systemitem> and
> <systemitem role="package">systemd-shim</systemitem>.
This clause no verb.
> @@ -382,13 +382,13 @@
> <para>
> If you are upgrading from previous releases, your system may
> contain obsolete init-scripts provided by (now) removed packages.
> - These scrips may contain inaccurate or no dependency metadata,
> + These scripts may have inaccurate or no dependency metadata,
> which can lead to dependency cycles in your init configuration.
> </para>
"Scrips" is a plain old typo; "contain inaccurate or no dependency
metadata" is awkward (I have to backtrack and then find myself
mentally rephrasing it as "contain dependency metadata which is
inaccurate or... no?"). I think what I'd say myself is "have missing
or inaccurate dependency metadata", but just changing the verb will
probably do.
> <para>
> - To avoid this, we recommend that you go review the list of
> - packages that are in the "rc" state ("Removed, but Config-files
> - remains" state) and purge at least all that contains init-scripts.
> + To avoid this, we recommend that you go and review the list of
> + packages that are in the "rc" ("Removed, but Config-files
> + remain") state, and purge at least all those containing init-scripts.
> </para>
> <para>
> Please see <xref linkend="purge-removed-packages" /> for details
Various ungrammatical/unidiomatic turns of phrase replaced.
> @@ -400,12 +400,12 @@
> <!-- Wheezy to Jessie -->
> <note>
> <para>
> - This section only applies to systems where Debian provided init
> + This section only applies to systems where Debian-provided init
> scripts have been modified locally.
> </para>
> </note>
Hyphenate compound modifier.
> <para>
> - If you have modified some of your init scripts provided by Debian,
> + If you have modified some of the init scripts provided by Debian,
> please be aware that these may now have been superseded by a
> systemd unit file or by systemd itself. If you have debsums
> installed, you can check for locally modified init scripts by
"Your" just makes it less clear who originally wrote them.
> @@ -471,7 +471,7 @@
> </para>
> <para>
> Without <systemitem role="package">plymouth</systemitem>, you may
> - experience that your boot prompt might disappear. Reports
> + find that your boot prompt disappears. Reports
> suggest that the cryptsetup prompt still accepts input despite
> not being visible. Should you experience this issue, typing the
> correct password may still work.
"Experience that" is unidiomatic.
> @@ -484,7 +484,7 @@
> <title>Required kernel config options for Jessie</title>
> <note>
> <para>
> - This section is only for people, who compile their own kernel.
> + This section is only for people who compile their own kernel.
> If you use the kernels compiled by Debian, you can disregard
> this section.
> </para>
English doesn't put commas around defining relative clauses.
> @@ -500,8 +500,8 @@
> # Required for *some* systemd services
> CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
> </screen> <para>
> - The systemd services, which require
> - CONFIG_DEVPTS_MULTIPLE_INSTANCES=y, will typically contain at
> + The systemd services which require
> + CONFIG_DEVPTS_MULTIPLE_INSTANCES=y will typically contain at
> least one of the following directives:
> </para>
> <screen>
Ditto. This is a particularly important one, since adding the commas
falsely asserts that *all* systemd services require that option.
> @@ -516,7 +516,7 @@
> be required for your particular system.
> </para>
> <para>
> - More information about the requirements, please refer to
> + For more information about the requirements, please refer to
> <filename>/usr/share/doc/systemd/README.gz</filename> (from the
> <systemitem role="package">systemd</systemitem> package).
> </para>
Missing word.
> @@ -533,19 +533,19 @@
> </para>
> </note>
> <para>
> -The upgrade from wheezy to jessie will migrate your system to the
> +The upgrade from Wheezy to Jessie will migrate your system to the
> systemd init system by default (see <xref
> linkend="systemd-upgrade-default-init-system" />).
> </para>
> <para>
> -When upgrading an LXC container, respectively an LXC virtual
> +When upgrading an LXC container or an LXC virtual
> machine, this will have different consequences depending on
> whether the <emphasis>host system</emphasis> has already
> -been upgraded to jessie or not.
> +been upgraded to Jessie or not.
> </para>
>
> <section id="issues-lxc-wheezy-host">
> -<title>Upgrading LXC guests running on wheezy hosts</title>
> +<title>Upgrading LXC guests running on Wheezy hosts</title>
>
> <para>
> If you are upgrading an LXC guest container that is running on a
Several cases of standardising on titlecase; one case of
"respectively", a word which is rarely appropriate in English and
particularly unidiomatic in cases like this.
> @@ -567,7 +567,7 @@
> </section>
>
> <section id="issues-lxc-jessie-host">
> -<title>Upgrading LXC guests running on jessie hosts</title>
> +<title>Upgrading LXC guests running on Jessie hosts</title>
>
> <para>
> In order to be able to boot LXC guests with systemd, you need to
Titlecase standardisation.
> @@ -598,13 +598,13 @@
> (non-standard setups)</title>
> <note>
> <para>
> - This section is only for people have set up LUKS encrypted disks
> - themselves using the whirlpool hash. The debian-installer
> + This section is only for people who have set up LUKS encrypted disks
> + themselves using the whirlpool hash. The debian-installer has
> <emphasis>never</emphasis> supported creating such disks.
> </para>
> </note>
Two missing words.
> <para>
> - If you have <emphasis>manually</emphasis> setup an encrypted disk
> + If you have <emphasis>manually</emphasis> set up an encrypted disk
> with LUKS whirlpool, you will need to migrate it manually to a
> stronger hash. You can check if your disk is using whirlpool by
> using the following command:
The verb is two words.
> @@ -669,7 +669,7 @@
> Shortcut settings previously modified by the user will be preserved
> upon upgrade. These settings can still be configured from the GNOME
> control center, accessible from the top right menu by clicking on
> - the “settings” icon.
> + the "settings" icon.
> </para>
> </section>
We might want to standardise towards Unicode instead, but for now this
direction is easier.
>
> @@ -678,8 +678,8 @@
> <title>Changes to default shell of system users provided by
> <systemitem role="package">base-passwd</systemitem></title>
> <para>
> - The upgrade of <systemitem role="package">base-passwd</systemitem>
> - package will reset the shell of system users that is provided to
> + The upgrade of the <systemitem role="package">base-passwd</systemitem>
> + package will reset the shell of some system users to
> the "nologin" shell. This includes the following users:
> </para>
> <itemizedlist>
Add a definite article.
Subtract confusing and ungrammatical "that is provided".
It's not all system users (or even all the ones that are provided), so
say "some" system users.
> @@ -734,9 +734,9 @@
> </itemizedlist>
> <para>
> If your local setup requires that any of these users have a shell,
> - you should say no to migrating or migrate and then change the shell
> - of the corresponding users. Notable examples includes local backups
> - done via the "backup" user with an "ssh-key" authentication.
> + you should say no to migrating, or migrate and then change the shell
> + of the corresponding users. Notable examples include local backups
> + done via the "backup" user with "ssh-key" authentication.
> </para>
> <caution>
> <para>
Extra comma for clarity.
Examples are plural.
It's "a" key, but articleless authentication.
> @@ -755,21 +755,21 @@
> Where <replaceable>username</replaceable> is the name of the user
> in question and <replaceable>current-shell-mangled</replaceable>
> is the mangled name of the shell. The mangling is done by
> - replacing all non-alphanumerical, non-dashes and non-underscores
> + replacing all characters other than alphanumerics, dashes, and underscores
> with underscores. E.g. /bin/bash becomes _bin_bash.
> </para>
> </section>
Confusingly phrased. Dashes are non-alphanumeric, and alphanumerics
are non-dashes, so /bin/bash ought to become _________.
In the process, sneak in a Harvard comma.
>
> <section id="kde-kontact">
> <!-- Wheezy to Jessie -->
> - <title>Migration to new KDE E-mail, Calendar and Contacts (Kontact)</title>
> + <title>Migration to new KDE E-mail, Calendar, and Contacts (Kontact)</title>
> <para>
> The Kontact Personal Information Management system has received a
> major upgrade. The new version makes much greater use of metadata
> indexing and each user's data must be migrated into these new indices.
> </para>
> <para>
> - E-mail, calendar events and addressbook contacts are automatically
> + E-mail, calendar events, and addressbook contacts are automatically
> migrated when the user logs in and the relevant component is started.
> Some advanced settings such as e-mail filters and custom templates
> require manual intervention. Further details and troubleshooting
> @@ -791,12 +791,12 @@
> <para>
> This issue seems to occur when <systemitem
> role="package">plymouth</systemitem>, <systemitem
> - role="package">systemd</systemitem> and GNOME are all installed.
> + role="package">systemd</systemitem>, and GNOME are all installed.
> This issue is reported as <ulink url="&url-bts;766462"> Debian
> Bug#766462</ulink>.
> </para>
Three more Harvard commas.
> <para>
> - It has been reported that remove the "splash" argument from the
> + It has been reported that removing the "splash" argument from the
> kernel command-line may work around the issue. Please see
> <filename>/etc/default/grub</filename> and remember to run
> <literal>update-grub</literal> after updating the file.
Grammar fix.
> @@ -832,16 +832,16 @@
> <!-- Wheezy to Jessie (#781120) -->
> <title>Change in handling of unreadable module paths by <systemitem role="package">perl</systemitem></title>
> <para>
> - From version 5.18 (and 5.20, which is included in jessie), perl will
> + From version 5.18 (and 5.20, which is included in Jessie), Perl will
The package and binary are "perl", but the language is "Perl".
> exit with a fatal error if it encounters unreadable module paths in
> - <literal>@INC</literal>. The previous behaviour was to skip such
> + <literal>@INC</literal>. The previous behavior was to skip such
> entries. It is recommended to check the contents of <literal>@INC</literal>
> in your environment for directories which are not world-readable, and
> take appropriate action.
> </para>
en_US.
> <para>
> You can see the default <literal>@INC</literal> for
> - <command>perl</command> by running <command>perl -V</command>.
> + Perl by running <command>perl -V</command>.
> </para>
> </section>
> </chapter>
That first reference is talking about Perl the language.
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
--- issues.dbk.pristine 2015-04-01 16:30:56.944993433 +0100
+++ issues.dbk 2015-04-01 16:30:14.570238920 +0100
@@ -19,7 +19,7 @@
<section id="limited-security-support">
<title>Limitations in security support</title>
<para>
- There are some packages, where Debian cannot promise to provide
+ There are some packages where Debian cannot promise to provide
minimal backports for security issues. These are covered in the
following subsections.
</para>
@@ -61,7 +61,7 @@
Node.js</title>
<para>
The Node.js platform is built on top of <systemitem
- role="package">libv8-3.14</systemitem>, which receives a high
+ role="package">libv8-3.14</systemitem>, which experiences a high
volume of security issues, but there are currently no volunteers
within the project or the security team sufficiently interested and
willing to spend the large amount of time required to stem those
@@ -70,13 +70,13 @@
<para>
Unfortunately, this means that <systemitem
role="package">libv8-3.14</systemitem>, <systemitem
- role="package">nodejs</systemitem> and the associated node-*
+ role="package">nodejs</systemitem>, and the associated node-*
package ecosystem should not currently be used with untrusted
- content, for example unsanitized data from the internet.
+ content, such as unsanitized data from the Internet.
</para>
<para>
In addition, these packages will not receive any security updates
- during the lifetime of the jessie release.
+ during the lifetime of the Jessie release.
</para>
</section>
</section>
@@ -129,10 +129,10 @@
upgrade.
</para>
<para>
- When upgrading a Puppet managed system from wheezy to jessie, you must
+ When upgrading a Puppet managed system from Wheezy to Jessie, you must
ensure that the corresponding puppetmaster runs at least Puppet
- version 3.7. If the master is running wheezy's <systemitem
- role="package">puppetmaster</systemitem>, the managed jessie system
+ version 3.7. If the master is running Wheezy's <systemitem
+ role="package">puppetmaster</systemitem>, the managed Jessie system
will not be able to connect to it.
</para>
<para>
@@ -147,7 +147,7 @@
<section id="php-incompat">
<!-- Wheezy to Jessie -->
- <title>PHP 5.6 upgrade has behavioural changes</title>
+ <title>PHP 5.6 upgrade has behavioral changes</title>
<para>
The upgrade to Jessie includes an upgrade of PHP from 5.4 to 5.6.
This may affect any local PHP scripts and you are advised to check
@@ -158,7 +158,7 @@
<listitem>
<para>
To prevent man-in-the-middle attacks against encrypted
- transfers client streams now verify peer certificates by
+ transfers, client streams now verify peer certificates by
default.
</para>
<para>
@@ -184,13 +184,13 @@
<listitem>
<para>
All internal case insensitivity handling for class,
- function and constant names is done according to ASCII
+ function, and constant names is done according to ASCII
rules. Current locale settings are ignored.
</para>
</listitem>
<listitem>
<para>
- The keywords "self", "parent" and "static" are now always
+ The keywords "self", "parent", and "static" are now always
case insensitive.
</para>
</listitem>
@@ -229,7 +229,7 @@
<para>
For legal reasons, the JSON implementation bundled with PHP
has been replaced with the version provided by the "jsonc"
- PECL module. Code that makes assumptions (if any) about the
+ PECL module. Code that makes assumptions about the
finer implementation details of the PHP JSON parser may need
to be reviewed.
</para>
@@ -250,12 +250,12 @@
<title>Incompatible changes in Apache HTTPD 2.4</title>
<note>
<para>
- This section only applies to systems, which have installed an
+ This section only applies to systems which have installed an
Apache HTTPD server and configured it manually.
</para>
</note>
<para>
- There has been a number of changes to the configuration of the
+ There have been a number of changes to the configuration of the
Apache HTTPD server in version 2.4. On the upstream side, the
syntax has changed. Notably, the access control directives have
changed considerably and will need manual migration to the
@@ -267,7 +267,7 @@
migration. However, the reports suggest it may not always work.
</para>
<para>
- The managing of configuration files have also been changed in the
+ The managing of configuration files has also been changed in the
Debian packaging. In particular, all configuration files and
sites must now end with ".conf" to be parsed by default. This
change also replaces the existing use of
@@ -276,7 +276,7 @@
<note>
<para>
During the upgrade, you may also see warnings about
- configuration files placed in the
+ configuration files placed in
<filename>/etc/apache2/conf.d/</filename>, which are provided by
packages from Debian. This warning is unavoidable but harmless
as the affected packages will move their configuration once
@@ -322,7 +322,7 @@
<para>
If you have a preference for another init such as <systemitem
role="package">sysvinit-core</systemitem> or <systemitem
- role="package">upstart</systemitem>, it is recommended to setup
+ role="package">upstart</systemitem>, it is recommended to set up
APT pinning prior to the upgrade. This may also be required if
you are upgrading LXC containers before the host. In this case,
please refer to <xref linkend="issues-lxc-wheezy-host" />.
@@ -340,7 +340,7 @@
</screen>
<caution>
<para>
- Be advised that some packages may have degraded behaviour or
+ Be advised that some packages may have degraded behavior or
may be lacking features under a non-default init system.
</para>
</caution>
@@ -353,7 +353,7 @@
installed first.
</para>
<para>
- If APT or aptitude issues computing an upgrade path with the pin
+ If APT or aptitude has issues computing an upgrade path with the pin
in place, you may be able to help it by manually installing both
<systemitem role="package">sysvinit-core</systemitem> and
<systemitem role="package">systemd-shim</systemitem>.
@@ -382,13 +382,13 @@
<para>
If you are upgrading from previous releases, your system may
contain obsolete init-scripts provided by (now) removed packages.
- These scrips may contain inaccurate or no dependency metadata,
+ These scripts may have inaccurate or no dependency metadata,
which can lead to dependency cycles in your init configuration.
</para>
<para>
- To avoid this, we recommend that you go review the list of
- packages that are in the "rc" state ("Removed, but Config-files
- remains" state) and purge at least all that contains init-scripts.
+ To avoid this, we recommend that you go and review the list of
+ packages that are in the "rc" ("Removed, but Config-files
+ remain") state, and purge at least all those containing init-scripts.
</para>
<para>
Please see <xref linkend="purge-removed-packages" /> for details
@@ -400,12 +400,12 @@
<!-- Wheezy to Jessie -->
<note>
<para>
- This section only applies to systems where Debian provided init
+ This section only applies to systems where Debian-provided init
scripts have been modified locally.
</para>
</note>
<para>
- If you have modified some of your init scripts provided by Debian,
+ If you have modified some of the init scripts provided by Debian,
please be aware that these may now have been superseded by a
systemd unit file or by systemd itself. If you have debsums
installed, you can check for locally modified init scripts by
@@ -471,7 +471,7 @@
</para>
<para>
Without <systemitem role="package">plymouth</systemitem>, you may
- experience that your boot prompt might disappear. Reports
+ find that your boot prompt disappears. Reports
suggest that the cryptsetup prompt still accepts input despite
not being visible. Should you experience this issue, typing the
correct password may still work.
@@ -484,7 +484,7 @@
<title>Required kernel config options for Jessie</title>
<note>
<para>
- This section is only for people, who compile their own kernel.
+ This section is only for people who compile their own kernel.
If you use the kernels compiled by Debian, you can disregard
this section.
</para>
@@ -500,8 +500,8 @@
# Required for *some* systemd services
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
</screen> <para>
- The systemd services, which require
- CONFIG_DEVPTS_MULTIPLE_INSTANCES=y, will typically contain at
+ The systemd services which require
+ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y will typically contain at
least one of the following directives:
</para>
<screen>
@@ -516,7 +516,7 @@
be required for your particular system.
</para>
<para>
- More information about the requirements, please refer to
+ For more information about the requirements, please refer to
<filename>/usr/share/doc/systemd/README.gz</filename> (from the
<systemitem role="package">systemd</systemitem> package).
</para>
@@ -533,19 +533,19 @@
</para>
</note>
<para>
-The upgrade from wheezy to jessie will migrate your system to the
+The upgrade from Wheezy to Jessie will migrate your system to the
systemd init system by default (see <xref
linkend="systemd-upgrade-default-init-system" />).
</para>
<para>
-When upgrading an LXC container, respectively an LXC virtual
+When upgrading an LXC container or an LXC virtual
machine, this will have different consequences depending on
whether the <emphasis>host system</emphasis> has already
-been upgraded to jessie or not.
+been upgraded to Jessie or not.
</para>
<section id="issues-lxc-wheezy-host">
-<title>Upgrading LXC guests running on wheezy hosts</title>
+<title>Upgrading LXC guests running on Wheezy hosts</title>
<para>
If you are upgrading an LXC guest container that is running on a
@@ -567,7 +567,7 @@
</section>
<section id="issues-lxc-jessie-host">
-<title>Upgrading LXC guests running on jessie hosts</title>
+<title>Upgrading LXC guests running on Jessie hosts</title>
<para>
In order to be able to boot LXC guests with systemd, you need to
@@ -598,13 +598,13 @@
(non-standard setups)</title>
<note>
<para>
- This section is only for people have set up LUKS encrypted disks
- themselves using the whirlpool hash. The debian-installer
+ This section is only for people who have set up LUKS encrypted disks
+ themselves using the whirlpool hash. The debian-installer has
<emphasis>never</emphasis> supported creating such disks.
</para>
</note>
<para>
- If you have <emphasis>manually</emphasis> setup an encrypted disk
+ If you have <emphasis>manually</emphasis> set up an encrypted disk
with LUKS whirlpool, you will need to migrate it manually to a
stronger hash. You can check if your disk is using whirlpool by
using the following command:
@@ -669,7 +669,7 @@
Shortcut settings previously modified by the user will be preserved
upon upgrade. These settings can still be configured from the GNOME
control center, accessible from the top right menu by clicking on
- the “settings” icon.
+ the "settings" icon.
</para>
</section>
@@ -678,8 +678,8 @@
<title>Changes to default shell of system users provided by
<systemitem role="package">base-passwd</systemitem></title>
<para>
- The upgrade of <systemitem role="package">base-passwd</systemitem>
- package will reset the shell of system users that is provided to
+ The upgrade of the <systemitem role="package">base-passwd</systemitem>
+ package will reset the shell of some system users to
the "nologin" shell. This includes the following users:
</para>
<itemizedlist>
@@ -734,9 +734,9 @@
</itemizedlist>
<para>
If your local setup requires that any of these users have a shell,
- you should say no to migrating or migrate and then change the shell
- of the corresponding users. Notable examples includes local backups
- done via the "backup" user with an "ssh-key" authentication.
+ you should say no to migrating, or migrate and then change the shell
+ of the corresponding users. Notable examples include local backups
+ done via the "backup" user with "ssh-key" authentication.
</para>
<caution>
<para>
@@ -755,21 +755,21 @@
Where <replaceable>username</replaceable> is the name of the user
in question and <replaceable>current-shell-mangled</replaceable>
is the mangled name of the shell. The mangling is done by
- replacing all non-alphanumerical, non-dashes and non-underscores
+ replacing all characters other than alphanumerics, dashes, and underscores
with underscores. E.g. /bin/bash becomes _bin_bash.
</para>
</section>
<section id="kde-kontact">
<!-- Wheezy to Jessie -->
- <title>Migration to new KDE E-mail, Calendar and Contacts (Kontact)</title>
+ <title>Migration to new KDE E-mail, Calendar, and Contacts (Kontact)</title>
<para>
The Kontact Personal Information Management system has received a
major upgrade. The new version makes much greater use of metadata
indexing and each user's data must be migrated into these new indices.
</para>
<para>
- E-mail, calendar events and addressbook contacts are automatically
+ E-mail, calendar events, and addressbook contacts are automatically
migrated when the user logs in and the relevant component is started.
Some advanced settings such as e-mail filters and custom templates
require manual intervention. Further details and troubleshooting
@@ -791,12 +791,12 @@
<para>
This issue seems to occur when <systemitem
role="package">plymouth</systemitem>, <systemitem
- role="package">systemd</systemitem> and GNOME are all installed.
+ role="package">systemd</systemitem>, and GNOME are all installed.
This issue is reported as <ulink url="&url-bts;766462"> Debian
Bug#766462</ulink>.
</para>
<para>
- It has been reported that remove the "splash" argument from the
+ It has been reported that removing the "splash" argument from the
kernel command-line may work around the issue. Please see
<filename>/etc/default/grub</filename> and remember to run
<literal>update-grub</literal> after updating the file.
@@ -832,16 +832,16 @@
<!-- Wheezy to Jessie (#781120) -->
<title>Change in handling of unreadable module paths by <systemitem role="package">perl</systemitem></title>
<para>
- From version 5.18 (and 5.20, which is included in jessie), perl will
+ From version 5.18 (and 5.20, which is included in Jessie), Perl will
exit with a fatal error if it encounters unreadable module paths in
- <literal>@INC</literal>. The previous behaviour was to skip such
+ <literal>@INC</literal>. The previous behavior was to skip such
entries. It is recommended to check the contents of <literal>@INC</literal>
in your environment for directories which are not world-readable, and
take appropriate action.
</para>
<para>
You can see the default <literal>@INC</literal> for
- <command>perl</command> by running <command>perl -V</command>.
+ Perl by running <command>perl -V</command>.
</para>
</section>
</chapter>
Reply to: