From c20cdf677f2e8cf918426a91774b7bc972c8af0b Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Fri, 13 Jul 2012 14:57:18 -0700
Subject: documentation: Fixed the links to the BitBake Documentation page.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
(From yocto-docs rev: ddee80872afc567b9381387980f257b337f29ea1)

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  | 2 +-
 documentation/dev-manual/dev-manual-model.xml  | 4 ++--
 documentation/dev-manual/dev-manual-newbie.xml | 2 +-
 documentation/dev-manual/dev-manual-start.xml  | 2 +-
 documentation/poky-ref-manual/ref-bitbake.xml  | 4 ++--
 documentation/poky-ref-manual/resources.xml    | 2 +-
 documentation/poky.ent                         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'documentation')

diff --git a/documentation/dev-manual/dev-manual-intro.xml b/documentation/dev-manual/dev-manual-intro.xml
index 7caa6eb720..460603b1f6 100644
--- a/documentation/dev-manual/dev-manual-intro.xml
+++ b/documentation/dev-manual/dev-manual-intro.xml
@@ -174,7 +174,7 @@
                     BitBake</ulink>:</emphasis> The tool used by the OpenEmbedded build systm 
                     to process project metadata.</para></listitem>
                 <listitem><para><emphasis>
-                    <ulink url='http://bitbake.berlios.de/manual/'>
+                    <ulink url='&BITBAKE_DOCS_URL;'>
                     BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
                     </para></listitem>
                 <listitem><para><emphasis>
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index ef5c64b678..c70aba313e 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -194,7 +194,7 @@
                 <listitem><para><emphasis>Build the image</emphasis>:  The OpenEmbedded build system 
                     uses the BitBake tool to build images based on the type of image you want to create.  
                     You can find more information on BitBake 
-                    <ulink url='http://bitbake.berlios.de/manual/'>here</ulink>.</para>
+                    <ulink url='&BITBAKE_DOCS_URL;'>here</ulink>.</para>
                     <para>The build process supports several types of images to satisfy different needs.  
                     See the 
                     "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>" appendix 
@@ -499,7 +499,7 @@
                         build system uses the BitBake 
                         tool to build images based on the type of image you want to create.  
                         You can find more information on BitBake 
-                        <ulink url='http://bitbake.berlios.de/manual/'>here</ulink>.</para>
+                        <ulink url='&BITBAKE_DOCS_URL;'>here</ulink>.</para>
                         <para>The build process supports several types of images to satisfy different needs.  
                         See the appendix
                         "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>" in 
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 0ebc01fe40..bf343b4605 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -213,7 +213,7 @@
                 sections.</para></listitem>
             <listitem><para><emphasis>BitBake:</emphasis> The task executor and scheduler used by 
                 the OpenEmbedded build system to build images. 
-                For more information on BitBake, see the <ulink url='http://bitbake.berlios.de/manual/'>
+                For more information on BitBake, see the <ulink url='&BITBAKE_DOCS_URL;'>
                 BitBake documentation</ulink>.</para></listitem>
             <listitem>
                 <para id='build-directory'><emphasis>Build Directory:</emphasis>
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml
index f644ed004f..5ba7b0bf3b 100644
--- a/documentation/dev-manual/dev-manual-start.xml
+++ b/documentation/dev-manual/dev-manual-start.xml
@@ -33,7 +33,7 @@
 
     <para>
         You can use the OpenEmbedded build system, which uses 
-        <ulink url='http://bitbake.berlios.de/manual/'>BitBake</ulink>, to develop complete Linux 
+        <ulink url='&BITBAKE_DOCS_URL;'>BitBake</ulink>, to develop complete Linux 
         images and associated user-space applications for architectures based on ARM, MIPS, PowerPC, 
         x86 and x86-64.  
         While the Yocto Project does not provide a strict testing framework,
diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index 6c24452d54..46dc8a73d4 100644
--- a/documentation/poky-ref-manual/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
@@ -186,7 +186,7 @@
         <para>
             Dependencies are defined through several variables.
             You can find information about variables BitBake uses in the 
-            <ulink url='http://bitbake.berlios.de/manual/'>BitBake manual</ulink>. 
+            <ulink url='&BITBAKE_DOCS_URL;'>BitBake manual</ulink>. 
             At a basic level, it is sufficient to know that BitBake uses the 
             <filename><link linkend='var-DEPENDS'>DEPENDS</link></filename> and 
             <filename><link linkend='var-RDEPENDS'>RDEPENDS</link></filename> variables when 
@@ -393,7 +393,7 @@ Options:
             Fetchers are usually triggered by entries in 
             <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename>. 
             You can find information about the options and formats of entries for specific 
-            fetchers in the <ulink url='http://bitbake.berlios.de/manual/'>BitBake manual</ulink>.
+            fetchers in the <ulink url='&BITBAKE_DOCS_URL;'>BitBake manual</ulink>.
         </para>
 
         <para>
diff --git a/documentation/poky-ref-manual/resources.xml b/documentation/poky-ref-manual/resources.xml
index 9e1ae69a0a..98f3ec9dcb 100644
--- a/documentation/poky-ref-manual/resources.xml
+++ b/documentation/poky-ref-manual/resources.xml
@@ -83,7 +83,7 @@
                 Poky derives from and contributes back to the OpenEmbedded project.</para></listitem>
             <listitem><para><emphasis><ulink url='http://developer.berlios.de/projects/bitbake/'>
                 BitBake</ulink>:</emphasis> The tool used to process metadata.</para></listitem>
-            <listitem><para><emphasis><ulink url='http://bitbake.berlios.de/manual/'>
+            <listitem><para><emphasis><ulink url='&BITBAKE_DOCS_URL;'>
                 BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
                 </para></listitem>
             <listitem><para><emphasis><ulink url='http://pimlico-project.org/'>Pimlico</ulink>:</emphasis>
diff --git a/documentation/poky.ent b/documentation/poky.ent
index e342da6e79..f37370dc79 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -17,7 +17,7 @@
 <!ENTITY OE_DOCS_URL "http://docs.openembedded.org">
 <!ENTITY OH_HOME_URL "http://o-hand.com">
 <!ENTITY BITBAKE_HOME_URL "http://developer.berlios.de/projects/bitbake/">
-<!ENTITY BITBAKE_DOCS_URL "http://docs.openembedded/bitbake/html/">
+<!ENTITY BITBAKE_DOCS_URL "http://docs.openembedded.org/bitbake/html/">
 <!ENTITY ECLIPSE_MAIN_URL "http://www.eclipse.org/downloads">
 <!ENTITY ECLIPSE_DL_URL "http://download.eclipse.org">
 <!ENTITY ECLIPSE_DL_PLUGIN_URL "&YOCTO_DL_URL;/releases/eclipse-plugin/&DISTRO;">
-- 
cgit v1.2.3-54-g00ecf