diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2016-03-15 10:31:34 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 21:56:06 +0000 |
commit | 6cdb356826d8aec19b9180433d4452feb46d48d7 (patch) | |
tree | 1d9909154f52409289051533575c22c6d5d63db6 /documentation | |
parent | 77594c08d75a9143afb47cd110f7a7f59f06c8b5 (diff) | |
download | poky-6cdb356826d8aec19b9180433d4452feb46d48d7.tar.gz |
toaster-manual: Edits to a previous patch.
I applied some grammar and writing edits to a large patch of new
text.
(From yocto-docs rev: 67cd700131e7cbca5769f25328772406f860d519)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/toaster-manual/toaster-manual-setup-and-use.xml | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml index 2e465f432b..12fe5839bd 100644 --- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml +++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml | |||
@@ -119,7 +119,7 @@ | |||
119 | If you used <filename>virtualenv</filename>, which is | 119 | If you used <filename>virtualenv</filename>, which is |
120 | recommended, to set up the Toaster system dependencies, | 120 | recommended, to set up the Toaster system dependencies, |
121 | you need be sure the virtual environment is activated. | 121 | you need be sure the virtual environment is activated. |
122 | To activate this environment, use the following: | 122 | To activate this environment, use the following command: |
123 | <literallayout class='monospaced'> | 123 | <literallayout class='monospaced'> |
124 | $ source venv/bin/activate | 124 | $ source venv/bin/activate |
125 | </literallayout> | 125 | </literallayout> |
@@ -179,7 +179,7 @@ | |||
179 | <para> | 179 | <para> |
180 | You can use a production instance of Toaster to share the | 180 | You can use a production instance of Toaster to share the |
181 | Toaster instance with remote users, multiple users, or both. | 181 | Toaster instance with remote users, multiple users, or both. |
182 | The production instance is also the setup that can cope with | 182 | The production instance is also the setup that can handle |
183 | heavier loads on the web service. | 183 | heavier loads on the web service. |
184 | Use the instructions in the following sections to set up | 184 | Use the instructions in the following sections to set up |
185 | Toaster to run builds through the Toaster web interface. | 185 | Toaster to run builds through the Toaster web interface. |
@@ -559,44 +559,48 @@ | |||
559 | </section> | 559 | </section> |
560 | 560 | ||
561 | <section id='a-note-on-the-local-yocto-project-release'> | 561 | <section id='a-note-on-the-local-yocto-project-release'> |
562 | <title>A Note on the Local Yocto Project Release</title> | 562 | <title>Additional Information About the Local Yocto Project Release</title> |
563 | 563 | ||
564 | <para> | 564 | <para> |
565 | This note only applies if you have set up Toaster | 565 | This section only applies if you have set up Toaster |
566 | for local development, as explained in | 566 | for local development, as explained in the |
567 | <link linkend='starting-toaster-for-local-development'> | 567 | "<link linkend='starting-toaster-for-local-development'>Starting Toaster for Local Development</link>" |
568 | section 3.1.</link> | 568 | section. |
569 | </para> | 569 | </para> |
570 | |||
570 | <para> | 571 | <para> |
571 | When you create a project in Toaster, you will be asked to | 572 | When you create a project in Toaster, you will be asked to |
572 | provide a name and to select a Yocto Project release. One | 573 | provide a name and to select a Yocto Project release. |
573 | of the release options you will find is called | 574 | One of the release options you will find is called |
574 | <emphasis>Local Yocto Project</emphasis>. | 575 | "Local Yocto Project". |
575 | <imagedata fileref="figures/new-project.png" align="center" width="9in" /> | 576 | <imagedata fileref="figures/new-project.png" align="center" width="9in" /> |
576 | </para> | 577 | </para> |
577 | 578 | ||
578 | <para> | 579 | <para> |
579 | When you select the <emphasis>Local Yocto Project</emphasis> | 580 | When you select the "Local Yocto Project" release, Toaster |
580 | release, Toaster will run your builds using the local Yocto | 581 | will run your builds using the local Yocto |
581 | Project clone you have in your computer: the same clone | 582 | Project clone you have in your computer: the same clone |
582 | you are using to run Toaster. Unless you manually update | 583 | you are using to run Toaster. |
584 | Unless you manually update | ||
583 | this clone, your builds will always use the same Git revision. | 585 | this clone, your builds will always use the same Git revision. |
584 | </para> | 586 | </para> |
585 | 587 | ||
586 | <para> | 588 | <para> |
587 | If you select any of the other release options, Toaster | 589 | If you select any of the other release options, Toaster |
588 | will fetch the tip of your selected release from the upstream | 590 | will fetch the tip of your selected release from the upstream |
589 | <ulink url='https://git.yoctoproject.org'>Yocto Project | 591 | <ulink url='https://git.yoctoproject.org'>Yocto Project repository</ulink> |
590 | repository</ulink> every time you run a build. This effectively | 592 | every time you run a build. |
593 | Fetching this tip effectively | ||
591 | means that if your selected release is updated upstream, the | 594 | means that if your selected release is updated upstream, the |
592 | Git revision you are using for your builds will change. | 595 | Git revision you are using for your builds will change. |
593 | If you are doing development locally, you might not want this | 596 | If you are doing development locally, you might not want this |
594 | to happen. In that case, the <emphasis>Local Yocto Project</emphasis> | 597 | change to happen. |
598 | In that case, the "Local Yocto Project" | ||
595 | release might be the right choice. | 599 | release might be the right choice. |
596 | </para> | 600 | </para> |
597 | 601 | ||
598 | <para> | 602 | <para> |
599 | However, the <emphasis>Local Yocto Project</emphasis> release | 603 | However, the "Local Yocto Project" release |
600 | will not provide you with any compatible layers, other than the | 604 | will not provide you with any compatible layers, other than the |
601 | three core layers that come with the Yocto Project: | 605 | three core layers that come with the Yocto Project: |
602 | <itemizedlist> | 606 | <itemizedlist> |
@@ -616,7 +620,7 @@ | |||
616 | <para> | 620 | <para> |
617 | If you want to build any other layers, you will need to | 621 | If you want to build any other layers, you will need to |
618 | manually import them into your Toaster project, using the | 622 | manually import them into your Toaster project, using the |
619 | <emphasis>Import layer</emphasis> page. | 623 | "Import layer" page. |
620 | <imagedata fileref="figures/import-layer.png" align="center" width="9in" /> | 624 | <imagedata fileref="figures/import-layer.png" align="center" width="9in" /> |
621 | </para> | 625 | </para> |
622 | 626 | ||