changeset 84:5dcee0493d8f

Merged.
author Martin Geisler <mg@daimi.au.dk>
date Thu, 28 Feb 2008 15:05:18 +0100
parents 744297c0766d (current diff) 5fc0bb9bc397 (diff)
children b792a9a76767 30a96565d586
files
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/doc/index.txt	Thu Feb 28 15:00:53 2008 +0100
+++ b/doc/index.txt	Thu Feb 28 15:05:18 2008 +0100
@@ -3,7 +3,9 @@
  VIFF Documentation
 ====================
 
-Here you will find some resources about VIFF.
+Here you will find some resources about VIFF. You can follow the links
+at the top for pages on special topics, or you can look at the API
+documentation and presentations linked below.
 
 API Documentation
 ~~~~~~~~~~~~~~~~~
@@ -11,6 +13,12 @@
 * The API documentation not only describes the API, but also tries to
   give a overview of the VIFF architecture.
 
+  .. note::
+
+     The online API documentation reflects the current development
+     version of VIFF. You might therefore prefer the API documentation
+     bundled with each release.
+
   Available `online`__.
 
   .. __: http://viff.dk/api/
--- a/index.txt	Thu Feb 28 15:00:53 2008 +0100
+++ b/index.txt	Thu Feb 28 15:05:18 2008 +0100
@@ -162,7 +162,7 @@
   Shares can be made using Shamir sharing or PRSS. Includes a suite of
   unit tests and example programs.
 
-Please see the `installation guide`_, and the `VIFF API
+Please see the `installation guide`_ and the `VIFF API
 documentation`__ in addition to the documentation included in the
 files above.