From 6cdb356826d8aec19b9180433d4452feb46d48d7 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Tue, 15 Mar 2016 10:31:34 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../toaster-manual-setup-and-use.xml | 40 ++++++++++++---------- 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'documentation/toaster-manual') 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 @@ If you used virtualenv, which is recommended, to set up the Toaster system dependencies, you need be sure the virtual environment is activated. - To activate this environment, use the following: + To activate this environment, use the following command: $ source venv/bin/activate @@ -179,7 +179,7 @@ You can use a production instance of Toaster to share the Toaster instance with remote users, multiple users, or both. - The production instance is also the setup that can cope with + The production instance is also the setup that can handle heavier loads on the web service. Use the instructions in the following sections to set up Toaster to run builds through the Toaster web interface. @@ -559,44 +559,48 @@
- A Note on the Local Yocto Project Release + Additional Information About the Local Yocto Project Release - This note only applies if you have set up Toaster - for local development, as explained in - - section 3.1. + This section only applies if you have set up Toaster + for local development, as explained in the + "Starting Toaster for Local Development" + section. + When you create a project in Toaster, you will be asked to - provide a name and to select a Yocto Project release. One - of the release options you will find is called - Local Yocto Project. + provide a name and to select a Yocto Project release. + One of the release options you will find is called + "Local Yocto Project". - When you select the Local Yocto Project - release, Toaster will run your builds using the local Yocto + When you select the "Local Yocto Project" release, Toaster + will run your builds using the local Yocto Project clone you have in your computer: the same clone - you are using to run Toaster. Unless you manually update + you are using to run Toaster. + Unless you manually update this clone, your builds will always use the same Git revision. If you select any of the other release options, Toaster will fetch the tip of your selected release from the upstream - Yocto Project - repository every time you run a build. This effectively + Yocto Project repository + every time you run a build. + Fetching this tip effectively means that if your selected release is updated upstream, the Git revision you are using for your builds will change. If you are doing development locally, you might not want this - to happen. In that case, the Local Yocto Project + change to happen. + In that case, the "Local Yocto Project" release might be the right choice. - However, the Local Yocto Project release + However, the "Local Yocto Project" release will not provide you with any compatible layers, other than the three core layers that come with the Yocto Project: @@ -616,7 +620,7 @@ If you want to build any other layers, you will need to manually import them into your Toaster project, using the - Import layer page. + "Import layer" page. -- cgit v1.2.3-54-g00ecf