From 7adb367e74e1aa5822b3af0bc4a33515a69d77d0 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 7 Sep 2012 08:58:36 -0700
Subject: documentation/dev-manual/dev-manual-model.xml: Updates to plug-in
 install

Edits to test out the lastes version of installing the Yocto Eclipse
plug-in from the latest source.  Small changes to be more complete
on the step-by-step process with regard to being in the right
branch.  Also, inserted 1.3_beta as the version.  This will change
later.

(From yocto-docs rev: 1326916a7d03bdbb0613e6e26a4089b3bd87d204)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-model.xml | 29 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index a55f08a4fb..7537a5c3c9 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -900,24 +900,36 @@
                                 </literallayout>
                                 For this example, the repository is named     
                                 <filename>~/yocto-eclipse</filename>.</para></listitem>
+                            <listitem><para>Be sure you are in the right branch for your Git repository.
+                                For this release set the branch to <filename>1.3_beta</filename>:
+                                <literallayout class='monospaced'>
+     $ git checkout -b 1.3_beta origin/1.3_beta
+                                </literallayout></para></listitem>
                             <listitem><para>Locate the <filename>build.sh</filename> script in the 
                                 Git repository you created in the previous step.
                                 The script is located in the <filename>scripts</filename>.</para></listitem>
                             <listitem><para>Be sure to set and export the <filename>ECLIPSE_HOME</filename> environment
-                                variable to the top-level directory in which you installed the Indigo  
-                                version of Eclipse.
+                                variable to the top-level directory in which you installed your version of Eclipse.
                                 For example, if your Eclipse directory is <filename>$HOME/eclipse</filename>, 
                                 use the following:
                                 <literallayout class='monospaced'>
      $ export ECLIPSE_HOME=$HOME/eclipse
                                 </literallayout></para></listitem>
-                            <listitem><para>Run the <filename>build.sh</filename> script and provide the 
-                                name of the Git branch along with the Yocto Project release you are 
+                            <listitem><para>Be sure you have the right branch in the Poky Git repository
+                                checked out.
+                                For example, the following commands checkout the <filename>1.3_beta</filename>
+                                branch in the local Poky Git repository:
+                                <literallayout class='monospaced'>
+     $ cd ~/poky
+     $ git checkout -b 1.3_beta origin/1.3_beta
+                                </literallayout></para></listitem>
+                            <listitem><para>Move back to your Yocto Eclipse directory and 
+                                run the <filename>build.sh</filename> script.  
+                                Provide the name of the Git branch along with the Yocto Project release you are 
                                 using.
-                                Here is an example that uses the <filename>master</filename> Git repository
-                                and the <filename>1.1M4</filename> release:
+                                Here is an example that uses the <filename>1.3_beta</filename> branches:
                                 <literallayout class='monospaced'>
-     $ scripts/build.sh master 1.1M4 
+     $ scripts/build.sh 1.3_beta 1.3_beta 
                                 </literallayout>
                                 After running the script, the file
                                 <filename>org.yocto.sdk-&lt;release&gt;-&lt;date&gt;-archive.zip</filename>
@@ -930,9 +942,10 @@
                             <listitem><para>Provide anything you want in the "Name" field.</para></listitem>
                             <listitem><para>Click "Archive" and browse to the ZIP file you built 
                                 in step four.  
-                               This ZIP file should not be "unzipped", and must be the 
+                                This ZIP file should not be "unzipped", and must be the 
                                 <filename>*archive.zip</filename> file created by running the 
                                 <filename>build.sh</filename> script.</para></listitem>
+                            <listitem><para>Click through the "Okay" buttons.</para></listitem>
                             <listitem><para>Check the box next to the new entry in the installation window and complete
                         the installation.</para></listitem>
                             <listitem><para>Restart the Eclipse IDE if necessary.</para></listitem>
-- 
cgit v1.2.3-54-g00ecf