diff options
Diffstat (limited to 'documentation/poky-ref-manual/introduction.xml')
-rw-r--r-- | documentation/poky-ref-manual/introduction.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/documentation/poky-ref-manual/introduction.xml b/documentation/poky-ref-manual/introduction.xml index afaa41bd8e..b2e34528e2 100644 --- a/documentation/poky-ref-manual/introduction.xml +++ b/documentation/poky-ref-manual/introduction.xml | |||
@@ -140,7 +140,7 @@ | |||
140 | 'experimental' builds. | 140 | 'experimental' builds. |
141 | The toolchains can | 141 | The toolchains can |
142 | be used either as external standalone toolchains or can be combined with Poky as a | 142 | be used either as external standalone toolchains or can be combined with Poky as a |
143 | prebuilt toolchain to reduce build time. Using the external toolchains is simply a | 143 | pre-built toolchain to reduce build time. Using the external toolchains is simply a |
144 | case of untarring the tarball into the root of your system (it only creates files in | 144 | case of untarring the tarball into the root of your system (it only creates files in |
145 | <filename>/opt/poky</filename>) and then enabling the option | 145 | <filename>/opt/poky</filename>) and then enabling the option |
146 | in <filename>local.conf</filename>. | 146 | in <filename>local.conf</filename>. |
@@ -157,10 +157,10 @@ | |||
157 | </para> | 157 | </para> |
158 | 158 | ||
159 | <para> | 159 | <para> |
160 | The 'master' is where the deveopment work takes place and you should use this if you're | 160 | The 'master' is where the development work takes place and you should use this if you're |
161 | interested in working with the latest cutting-edge developments. It is possible for the trunk | 161 | interested in working with the latest cutting-edge developments. It is possible for the trunk |
162 | to suffer temporary periods of instability while new features are developed. | 162 | to suffer temporary periods of instability while new features are developed. |
163 | If these periods of instability are undesireable, we recommend using one of the release branches. | 163 | If these periods of instability are undesirable, we recommend using one of the release branches. |
164 | </para> | 164 | </para> |
165 | </section> | 165 | </section> |
166 | </section> | 166 | </section> |