From 98ae8387e303b2abcaec785225d4a25cbfccd8d3 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Wed, 1 Apr 2015 07:41:42 -0700
Subject: dev-manual: Fixed a few broken links and added Toaster manual to
 list.

(From yocto-docs rev: 77e3a4c704836e599b8ef6b13e68ec783e6d642d)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-intro.xml  | 6 ++++++
 documentation/dev-manual/dev-manual-model.xml  | 6 +++---
 documentation/dev-manual/dev-manual-newbie.xml | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index 634dab52e8..e350882a38 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -146,6 +146,12 @@
                     This manual presents a set of common and generally useful tracing and
                     profiling schemes along with their applications (as appropriate) to each tool.
                     </para></listitem>
+                <listitem><para><emphasis>
+                    <ulink url='&YOCTO_DOCS_TOAST_URL;'>Toaster User Manual</ulink>:</emphasis>
+                    This manual introduces and describes how to set up and use
+                    Toaster, which is a web interface to the Yocto Project's
+                    <link linkend='build-system-term'>OpenEmbedded Build System</link>.
+                    </para></listitem>
                 <listitem><para><emphasis>
                     <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
                     Eclipse IDE Yocto Plug-in</ulink>:</emphasis>
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index a62c67d968..aaee23c5df 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -335,12 +335,12 @@
             <para>
                 Within the figure, the "Kernel.org Branch Point" represents the point in the tree
                 where a supported base kernel is modified from the Linux kernel.
-                For example, this could be the branch point for the <filename>linux-yocto-3.4</filename>
+                For example, this could be the branch point for the <filename>linux-yocto-3.19</filename>
                 kernel.
                 Thus, everything further to the right in the structure is based on the
-                <filename>linux-yocto-3.4</filename> kernel.
+                <filename>linux-yocto-3.19</filename> kernel.
                 Branch points to the right in the figure represent where the
-                <filename>linux-yocto-3.4</filename> kernel is modified for specific hardware
+                <filename>linux-yocto-3.19</filename> kernel is modified for specific hardware
                 or types of kernels, such as real-time kernels.
                 Each leaf thus represents the end-point for a kernel designed to run on a specific
                 targeted device.
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index ada8cd7b0d..2bfedba8f1 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -1597,7 +1597,7 @@
 
         <para>
             You can find general Git information on how to push a change upstream in the
-            <ulink url='http://book.git-scm.com/3_distributed_workflows.html'>Git Community Book</ulink>.
+            <ulink url='http://git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows'>Git Community Book</ulink>.
         </para>
     </section>
 
-- 
cgit v1.2.3-54-g00ecf