From ffb5db2c578cb117ff06f49db51c2b7f629902c1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 18 Mar 2010 15:50:08 +0000
Subject: handbook: Clean up OpenedHand references

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 handbook/introduction.xml  |  7 +++----
 handbook/poky-handbook.xml | 26 +++++++++-----------------
 handbook/resources.xml     |  7 ++++++-
 3 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'handbook')

diff --git a/handbook/introduction.xml b/handbook/introduction.xml
index 312406dd80..6155820002 100644
--- a/handbook/introduction.xml
+++ b/handbook/introduction.xml
@@ -69,8 +69,7 @@
 
     <para>
 
-    Poky has a growing open source community backed up by commercial support
-provided by the principal developer and maintainer of Poky, <ulink url="http://o-hand.com/">OpenedHand Ltd</ulink>.
+    Poky has a growing open source community and is also backed up by commercial organisations including <ulink url="http://www.intel.com/">Intel Corporation</ulink>.
 
     </para>
 </section>
@@ -154,8 +153,8 @@ provided by the principal developer and maintainer of Poky, <ulink url="http://o
         <ulink url='http://debian.o-hand.com'/>
         for instructions on doing this) and then run <command>
         "apt-get install qemu poky-depends poky-scripts"</command> which will
-        automatically install all these dependencies. OpenedHand can also provide
-        VMware images with Poky and all dependencies pre-installed if required.
+        automatically install all these dependencies. Virtualisation images with 
+        Poky and all dependencies can also easily be built if required.
     </para>
 
     <para>
diff --git a/handbook/poky-handbook.xml b/handbook/poky-handbook.xml
index dd709d7994..3b04bc983a 100644
--- a/handbook/poky-handbook.xml
+++ b/handbook/poky-handbook.xml
@@ -22,47 +22,39 @@
             <author>
                 <firstname>Richard</firstname> <surname>Purdie</surname>
                 <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
+                    <orgname>Intel Corporation</orgname>
                 </affiliation>
-                <email>richard@openedhand.com</email>
+                <email>richard@linux.intel.com</email>
             </author>
 
             <author>
                 <firstname>Tomas</firstname> <surname>Frydrych</surname>
                 <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
+                    <orgname>Intel Corporation</orgname>
                 </affiliation>
-                <email>tf@openedhand.com</email>
             </author>
 
             <author>
                 <firstname>Marcin</firstname> <surname>Juszkiewicz</surname>
-                <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
-                </affiliation>
-                <email>hrw@openedhand.com</email>
             </author>
             <author>
                 <firstname>Dodji</firstname> <surname>Seketeli</surname>
-                <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
-                </affiliation>
-                <email>dodji@openedhand.com</email>
             </author>
         </authorgroup>
 
         <revhistory>
             <revision>
-                <revnumber>3.1</revnumber>
-                <date>15 February 2008</date>
-                <revremark>Poky 3.1 (Pinky) Documentation Release</revremark>
+                <revnumber>3.2+git</revnumber>
+                <date>18 March 2010</date>
+                <revremark>Poky Master Documentation</revremark>
             </revision>
         </revhistory>
 
     <copyright>
-      <year>2007</year>
+      <year>2007-2010</year>
+      <year>2008</year>
       <year>2008</year>
-      <holder>OpenedHand Limited</holder>
+      <holder>Intel Corporation</holder>
     </copyright>
 
     <legalnotice>
diff --git a/handbook/resources.xml b/handbook/resources.xml
index 6d06364ae5..7f4785fdae 100644
--- a/handbook/resources.xml
+++ b/handbook/resources.xml
@@ -58,8 +58,13 @@ poky+subscribe &lt;at&gt; openedhand &lt;dot&gt; com
         </para></listitem>
         <listitem><para>
             <ulink url='http://www.openedhand.com/'>OpenedHand</ulink> - The
-            company behind Poky.
+            original company behind Poky.
         </para></listitem>
+        <listitem><para>
+            <ulink url='http://www.intel.com/'>Intel Corporation</ulink> - The
+            company who acquired OpenedHand in 2008.
+        </para></listitem>
+
         <listitem><para>
             <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>
             - The upstream generic embedded distribution Poky derives
-- 
cgit v1.2.3-54-g00ecf