Author: ianh
Date: Tue May 17 18:02:23 2011
New Revision: 1104441

URL: http://svn.apache.org/viewvc?rev=1104441&view=rev
Log:
for SteveL.
-added the ™ entities to the opening title and paragraph, and some more 
text on the opening paragraphs.
-added the media award news

Modified:
    hadoop/site/author/src/documentation/content/xdocs/index.xml

Modified: hadoop/site/author/src/documentation/content/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/hadoop/site/author/src/documentation/content/xdocs/index.xml?rev=1104441&r1=1104440&r2=1104441&view=diff
==============================================================================
--- hadoop/site/author/src/documentation/content/xdocs/index.xml (original)
+++ hadoop/site/author/src/documentation/content/xdocs/index.xml Tue May 17 
18:02:23 2011
@@ -12,21 +12,41 @@
   <body> 
 
     <section>
-      <title>What Is Hadoop?</title>
+      <title>What Is Apache&trade; Hadoop&trade;?</title>
 
       <p>
-     The Apache Hadoop project develops open-source software for reliable, 
scalable, distributed computing. 
-     Hadoop includes these subprojects:
+      
+      The Apache&trade; Hadoop&trade; project develops open-source software for
+      reliable, scalable, distributed computing.
+
+      </p>
+      
+      <p>
+      
+      The Apache&trade; Hadoop&trade; software library is a framework that
+      allows for the distributed processing of large data sets across clusters
+      of computers using a simple programming model. It is designed to scale up
+      from single servers to thousands of machines, each offering local
+      computation and storage. Rather than rely on hardware to deliver
+      high-avaiability, the library itself is designed to detect and handle
+      failures at the application layer, so delivering a highly-availabile
+      service on top of a cluster of computers, each of which may be prone to
+      failures.
+      
+      </p>
+      
+      <p>
+      The project includes these subprojects:
       </p>
 
       <ul>
       <li><a href="ext:common"><strong>Hadoop Common</strong></a>: 
       The common utilities that support the other Hadoop subprojects. </li>
 
-      <li><a href="ext:hdfs"><strong>HDFS</strong></a>: 
-      A distributed file system that provides high throughput access to 
application data.  </li>
+      <li><a href="ext:hdfs"><strong>Hadoop Distributed File System 
(HDFS)</strong></a>: 
+      A distributed file system that provides high-throughput access to 
application data.  </li>
       
-      <li><a href="ext:mr"><strong>MapReduce</strong></a>: 
+      <li><a href="ext:mr"><strong>Hadoop MapReduce</strong></a>: 
       A software framework for distributed processing of large data sets on 
compute clusters.  </li>
       </ul>
       
@@ -73,12 +93,27 @@
 
     <section>
     <title>News</title>
-      
+
+     
+     <section>
+       <title>March 2011 - Apache Hadoop takes top prize at Media Guardian 
Innovation Awards</title>
+       <p>
+       
+       The Hadoop project won the "innovator of the year"award from the UK's
+       Guardian newspaper, where it was described as "had the potential as a
+       greater catalyst for innovation than other nominees including WikiLeaks
+       and the iPad."
+       
+       </p>
+       <p>See <a 
href="http://www.guardian.co.uk/technology/2011/mar/25/media-guardian-innovation-awards-apache-hadoop";>
+       The Guardian web site</a>
+     </section>
+     
      <section>
      <title>January 2011 - ZooKeeper Graduates</title>
      <p>Hadoop's ZooKeeper subproject has graduated to become a
      top-level Apache project.</p>
-     <p>ZooKeeper can now be found
+     <p>Apache ZooKeeper can now be found
      at <a 
href="http://zookeeper.apache.org/";>http://zookeeper.apache.org/</a></p>
      </section>
 
@@ -86,7 +121,7 @@
      <title>September 2010 - Hive and Pig Graduate</title>
      <p>Hadoop's Hive and Pig subprojects have graduated to become
      top-level Apache projects.</p>
-     <p>Hive can now be found
+     <p>Apache Hive can now be found
      at <a href="http://hive.apache.org/";>http://hive.apache.org/</a></p>
      <p>Pig can now be found
      at <a href="http://pig.apache.org/";>http://pig.apache.org/</a></p>
@@ -96,9 +131,9 @@
      <title>May 2010 - Avro and HBase Graduate</title>
      <p>Hadoop's Avro and HBase subprojects have graduated to become
      top-level Apache projects.</p>
-     <p>Avro can now be found
+     <p>Apache Avro can now be found
      at <a href="http://avro.apache.org/";>http://avro.apache.org/</a></p>
-     <p>HBase can now be found
+     <p>Apache HBase can now be found
      at <a href="http://hbase.apache.org/";>http://hbase.apache.org/</a></p>
      </section>
       
@@ -106,11 +141,11 @@
      <title>July 2009 - New Hadoop Subprojects</title>
      <p>Hadoop is getting bigger! </p>
      <ul>
-                <li>Hadoop Core is renamed Hadoop Common.</li>
-                <li>MapReduce and the Hadoop Distributed File System (HDFS) 
are now separate subprojects.</li>
-                <li>Avro and Chukwa are new Hadoop subprojects.</li>
-        </ul>
-        <p></p>
+       <li>Hadoop Core is renamed Hadoop Common.</li>
+       <li>MapReduce and the Hadoop Distributed File System (HDFS) are now 
separate subprojects.</li>
+       <li>Avro and Chukwa are new Hadoop subprojects.</li>
+     </ul>
+     <p></p>
      <p>See the summary descriptions for all subprojects above. Visit the 
individual sites for more detailed information.</p>
      </section>
       
@@ -121,10 +156,10 @@
      
      <section>
      <title>November 2008 - ApacheCon US</title>
-        <p>In case you missed it.... <a 
href="http://us.apachecon.com/c/acus2008/";>ApacheCon US 2008</a> </p>
+     <p>In case you missed it.... <a 
href="http://us.apachecon.com/c/acus2008/";>ApacheCon US 2008</a> </p>
      </section>
 
-        <section>
+     <section>
      <title>July 2008 - Hadoop Wins Terabyte Sort Benchmark</title>
      <p>
      <a 
href="http://developer.yahoo.com/blogs/hadoop/2008/07/apache_hadoop_wins_terabyte_sort_benchmark.html";>Hadoop
 Wins Terabyte Sort Benchmark</a>: 


Reply via email to