diff options
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/dev-manual/dev-manual-model.xml | 3 | ||||
-rw-r--r-- | documentation/ref-manual/migration.xml | 2 | ||||
-rw-r--r-- | documentation/ref-manual/ref-classes.xml | 9 |
3 files changed, 7 insertions, 7 deletions
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 55bad34064..43c31b8405 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml | |||
@@ -295,8 +295,7 @@ | |||
295 | <filename>linux-yocto-3.14</filename></emphasis> - The | 295 | <filename>linux-yocto-3.14</filename></emphasis> - The |
296 | stable Yocto Project kernel to use with the Yocto | 296 | stable Yocto Project kernel to use with the Yocto |
297 | Project Releases 1.6 and 1.7. | 297 | Project Releases 1.6 and 1.7. |
298 | These kernels are based on the Linux 3.14 and 3.17 | 298 | This kernel is based on the Linux 3.14 released kernel. |
299 | released kernels, respectively. | ||
300 | </para></listitem> | 299 | </para></listitem> |
301 | <listitem><para><emphasis> | 300 | <listitem><para><emphasis> |
302 | <filename>linux-yocto-3.17</filename></emphasis> - An | 301 | <filename>linux-yocto-3.17</filename></emphasis> - An |
diff --git a/documentation/ref-manual/migration.xml b/documentation/ref-manual/migration.xml index dd8c3e00cc..f8bd852ad8 100644 --- a/documentation/ref-manual/migration.xml +++ b/documentation/ref-manual/migration.xml | |||
@@ -1759,7 +1759,7 @@ | |||
1759 | 1759 | ||
1760 | <para> | 1760 | <para> |
1761 | Some of the core recipes that package binary configuration scripts | 1761 | Some of the core recipes that package binary configuration scripts |
1762 | now disable the scripts instead due to the | 1762 | now disable the scripts due to the |
1763 | scripts previously requiring error-prone path substitution. | 1763 | scripts previously requiring error-prone path substitution. |
1764 | Software that links against these libraries using these scripts | 1764 | Software that links against these libraries using these scripts |
1765 | should use the much more robust <filename>pkg-config</filename> | 1765 | should use the much more robust <filename>pkg-config</filename> |
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml index 1b01ef61c9..496425a5a9 100644 --- a/documentation/ref-manual/ref-classes.xml +++ b/documentation/ref-manual/ref-classes.xml | |||
@@ -103,11 +103,11 @@ | |||
103 | 103 | ||
104 | <para> | 104 | <para> |
105 | By default, the <filename>autotools</filename> class supports | 105 | By default, the <filename>autotools</filename> class supports |
106 | out-of-tree builds | 106 | using out-of-tree builds |
107 | (<link linkend='var-B'><filename>B</filename></link> <filename>!=</filename> | 107 | (<link linkend='var-B'><filename>B</filename></link> <filename>!=</filename> |
108 | <link linkend='var-S'><filename>S</filename></link>). | 108 | <link linkend='var-S'><filename>S</filename></link>). |
109 | If your recipes do not support out-of-tree builds, you should | 109 | If the software being built by a recipe does not support |
110 | have them inherit the | 110 | using out-of-tree builds, you should have the recipe inherit the |
111 | <link linkend='ref-classes-autotools-brokensep'><filename>autotools-brokensep</filename></link> | 111 | <link linkend='ref-classes-autotools-brokensep'><filename>autotools-brokensep</filename></link> |
112 | class. | 112 | class. |
113 | </para> | 113 | </para> |
@@ -116,7 +116,8 @@ | |||
116 | It's useful to have some idea of how the tasks defined by this class work | 116 | It's useful to have some idea of how the tasks defined by this class work |
117 | and what they do behind the scenes. | 117 | and what they do behind the scenes. |
118 | <itemizedlist> | 118 | <itemizedlist> |
119 | <listitem><para><link linkend='ref-tasks-configure'><filename>do_configure</filename></link> ‐ Regenerates the | 119 | <listitem><para><link linkend='ref-tasks-configure'><filename>do_configure</filename></link> ‐ |
120 | Regenerates the | ||
120 | configure script (using <filename>autoreconf</filename>) and then launches it | 121 | configure script (using <filename>autoreconf</filename>) and then launches it |
121 | with a standard set of arguments used during cross-compilation. | 122 | with a standard set of arguments used during cross-compilation. |
122 | You can pass additional parameters to <filename>configure</filename> through the | 123 | You can pass additional parameters to <filename>configure</filename> through the |