diff options
-rw-r--r-- | documentation/poky-ref-manual/faq.xml | 2 | ||||
-rw-r--r-- | documentation/poky-ref-manual/ref-bitbake.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/documentation/poky-ref-manual/faq.xml b/documentation/poky-ref-manual/faq.xml index 0a64147523..249a28d8f4 100644 --- a/documentation/poky-ref-manual/faq.xml +++ b/documentation/poky-ref-manual/faq.xml | |||
@@ -572,7 +572,7 @@ | |||
572 | any network accesses to anything other than the PREMIRROR would fail. | 572 | any network accesses to anything other than the PREMIRROR would fail. |
573 | </para> | 573 | </para> |
574 | <para> | 574 | <para> |
575 | Poky also honors the standard environment variables | 575 | Poky also honors the standard shell environment variables |
576 | <filename>http_proxy</filename>, <filename>ftp_proxy</filename>, | 576 | <filename>http_proxy</filename>, <filename>ftp_proxy</filename>, |
577 | <filename>https_proxy</filename>, and <filename>all_proxy</filename> | 577 | <filename>https_proxy</filename>, and <filename>all_proxy</filename> |
578 | to redirect requests through proxy servers. | 578 | to redirect requests through proxy servers. |
diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml index e8a5dc60ab..fa8c624c1c 100644 --- a/documentation/poky-ref-manual/ref-bitbake.xml +++ b/documentation/poky-ref-manual/ref-bitbake.xml | |||
@@ -36,7 +36,7 @@ | |||
36 | The first thing BitBake does is look for the <filename>bitbake.conf</filename> file. | 36 | The first thing BitBake does is look for the <filename>bitbake.conf</filename> file. |
37 | The Yocto Project keeps this file in the Yocto Project file's <filename>meta/conf/</filename> | 37 | The Yocto Project keeps this file in the Yocto Project file's <filename>meta/conf/</filename> |
38 | directory. | 38 | directory. |
39 | BitBake finds it by examining the <filename>BBPATH</filename> environment | 39 | BitBake finds it by examining its <filename>BBPATH</filename> environment |
40 | variable and looking for the <filename>meta/conf/</filename> | 40 | variable and looking for the <filename>meta/conf/</filename> |
41 | directory. | 41 | directory. |
42 | </para> | 42 | </para> |
@@ -54,7 +54,7 @@ | |||
54 | and the machine configuration file | 54 | and the machine configuration file |
55 | (set by the | 55 | (set by the |
56 | <filename><link linkend='var-MACHINE'>MACHINE</link></filename> variable). | 56 | <filename><link linkend='var-MACHINE'>MACHINE</link></filename> variable). |
57 | The <filename>DISTRO</filename> and <filename>MACHINE</filename> environment | 57 | The <filename>DISTRO</filename> and <filename>MACHINE</filename> BitBake environment |
58 | variables are both usually set in | 58 | variables are both usually set in |
59 | the <filename>local.conf</filename> file. | 59 | the <filename>local.conf</filename> file. |
60 | Valid distribution | 60 | Valid distribution |