<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -36,15 +36,15 @@ master_doc = 'index'
 
 # General substitutions.
 project = 'Disco'
-copyright = '2008, Nokia / Data Insight'
+copyright = '2008, Nokia Corporation and the Disco project'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '0.1'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:</diff>
      <filename>doc/conf.py</filename>
    </modified>
    <modified>
      <diff>@@ -35,14 +35,6 @@ References
    py/index
    external
 
-Developers
-----------
-
-.. toctree::
-   :maxdepth: 1
-
-   devsetup
-
 Indices and tables
 ------------------
 </diff>
      <filename>doc/index.rst</filename>
    </modified>
    <modified>
      <diff>@@ -2,14 +2,15 @@
 What is Disco?
 ==============
 
-Disco is an implementation of the Map-Reduce framework [MapReduce]_ for
-distributed computing. As the original framework, which was publicized
-by Google, Disco supports parallel computations over large data sets on
-unreliable cluster of computers. This makes it a perfect tool for
-analyzing and processing large datasets without having to bother about
-difficult technical questions related to distributed computing, such
-as communication protocols, load balancing, locking, job scheduling or
-fault tolerance, which are taken care by Disco.
+Disco is an implementation of the `Map-Reduce framework
+&lt;http://en.wikipedia.org/wiki/MapReduce&gt;`_ for distributed computing. As
+the original framework, which was publicized by Google, Disco supports
+parallel computations over large data sets on unreliable cluster of
+computers. This makes it a perfect tool for analyzing and processing large
+datasets without having to bother about difficult technical questions
+related to distributed computing, such as communication protocols, load
+balancing, locking, job scheduling or fault tolerance, which are taken
+care by Disco.
 
 Disco, standing on the shoulders of the solid Map-Reduce model, is
 suitable and already used for various data mining tasks, large-scale
@@ -20,12 +21,12 @@ Batteries included
 ------------------
 
 In contrast to a well-known open-source implementation of the Map-Reduce
-framework, Hadoop [Hadoop]_, that is implemented in Java, the Disco core
-is written in Erlang [Erlang]_, a functional language that is designed
-for building robust fault-tolerant distributed applications. Users of
-Disco typically write jobs in Python, which makes it possible to express
-even complex algorithms or data processing tasks often only in tens of
-lines of code.
+framework, `Hadoop &lt;http://hadoop.apache.org&gt;`_, that is implemented in
+Java, the Disco core is written in `Erlang &lt;http://www.erlang.org&gt;`_,
+a functional language that is designed for building robust fault-tolerant
+distributed applications. Users of Disco typically write jobs in Python,
+which makes it possible to express even complex algorithms or data
+processing tasks often only in tens of lines of code.
 
 For instance, the following fully working example computes word 
 frequencies in a large text corpus using 100 CPUs in parallel:
@@ -64,14 +65,16 @@ interface for status monitoring.
 High-performance computing made easy
 ------------------------------------
 
-Disco is a good match for a cluster of commodity Linux servers. New nodes
-can be added to the system on the fly, by a single click on the Web
-interface. If a server crashes, active jobs are automatically re-routed
-to other servers without any interruptions. Together with an automatic
-provisioning mechanism, such as Fully Automatic Installation for Debian
-[Fai]_, even a large HPC cluster can be maintained with only a minimal
-amount of manual work. As a proof of concept, the Data Insight team at
-NRC Palo Alto maintains a 240-core cluster running Disco using this setup.
+Disco is a good match for a cluster of commodity Linux servers. New
+nodes can be added to the system on the fly, by a single click on
+the Web interface. If a server crashes, active jobs are automatically
+re-routed to other servers without any interruptions. Together with
+an automatic provisioning mechanism, such as the `Fully Automatic
+Installation for Debian &lt;http://www.informatik.uni-koeln.de/fai/&gt;`_,
+even a large HPC cluster can be maintained with only a minimal amount
+of manual work. As a proof of concept, `Nokia Research Center in Palo
+Alto &lt;http://research.nokia.com&gt;`_ maintains a 240-core cluster running
+Disco using this setup.
 
 
 Main features
@@ -102,14 +105,3 @@ Main features
 
 - Easy to integrate to larger applications using the standard Disco module
   and the Web APIs.
-
-References
-----------
-
-.. [MapReduce] http://en.wikipedia.org/wiki/MapReduce
-.. [Hadoop] http://hadoop.apache.org/
-.. [Erlang] http://www.erlang.org/
-.. [Fai] http://www.informatik.uni-koeln.de/fai/ 
-
-Contact person: ville.h.tuulos@nokia.com
-</diff>
      <filename>doc/intro.rst</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>doc/devsetup.rst</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>361c138670a5e61a69fee95cf7c1f6c4e21a44a3</id>
    </parent>
  </parents>
  <author>
    <name>Ville Tuulos</name>
    <email>tuulos@nxfront.nokiapaloalto.com</email>
  </author>
  <url>http://github.com/tuulos/disco/commit/fc2b6e7938425ee1e27bb00fbcc00b882bdd60f5</url>
  <id>fc2b6e7938425ee1e27bb00fbcc00b882bdd60f5</id>
  <committed-date>2008-08-30T20:24:29-07:00</committed-date>
  <authored-date>2008-08-30T20:24:29-07:00</authored-date>
  <message>Minor fixes and rearrangements</message>
  <tree>9d398beaa9c34a91ea05ed60a7099e3b3f96b993</tree>
  <committer>
    <name>Ville Tuulos</name>
    <email>tuulos@nxfront.nokiapaloalto.com</email>
  </committer>
</commit>
