summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/migration.xml
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2018-11-02 08:48:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-22 12:20:51 +0000
commitba78d2117359dbd6248fb2dd9fffa902ae0b85a7 (patch)
tree2438ce962c8bb7431f1fb608e205befbebcadc63 /documentation/ref-manual/migration.xml
parent12eee34540a081affef208254670011c54e5f045 (diff)
downloadopenembedded-core-contrib-ba78d2117359dbd6248fb2dd9fffa902ae0b85a7.tar.gz
ref-manual: Updated migration section for 2.6
Made two minor corrections from reviewer feedback. (From yocto-docs rev: 765e44127f52e1d9d4d1c365b0574ca73364add2) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/migration.xml')
-rw-r--r--documentation/ref-manual/migration.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml
index 756736eff4..466081d526 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -5728,7 +5728,7 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
<ulink url='https://www.openssl.org/'>OpenSSL</ulink> has been
upgraded from 1.0 to 1.1.
By default, this upgrade could cause problems for recipes that
- have both versions their dependency chains.
+ have both versions in their dependency chains.
The problem is that both versions cannot be installed together
at build time.
<note>
@@ -5758,9 +5758,9 @@ id=f4d4f99cfbc2396e49c1613a7d237b9e57f06f81'>commit message</ulink>.
<title>Security Changes</title>
<para>
- The Poky distribution now uses security compiler files by
+ The Poky distribution now uses security compiler flags by
default.
- Inclusion of these files could cause new failures due to stricter
+ Inclusion of these flags could cause new failures due to stricter
checking for various potential security issues in code.
</para>
</section>