Update dependencies. Rewrite the GOAD vs OAF thing som more to reflect

	* README: Update dependencies. Rewrite the GOAD vs OAF thing som
	more to reflect OAF's new ascendency. Make the fact that you don
	need pilot stuff clearer. Add some new directories to the
	directory layout section.

svn path=/trunk/; revision=3390

2 files changed, 51 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 8449b2ac4b..31ad13811b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-02  Dan Winship  <danw@helixcode.com>
+
+	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
+	more to reflect OAF's new ascendency. Make the fact that you don't
+	need pilot stuff clearer. Add some new directories to the
+	directory layout section.
+
 2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
 
 	* widgets/misc/e-clipped-label.c: Free the finish data.
diff --git a/README b/README
index f8894167f4..fccbe23f8b 100644
--- a/README
+++ b/README
@@ -3,9 +3,8 @@ distributed suite from Helix Code, Inc.
 
 See http://www.helixcode.com/apps/evolution.php3 for more information.
 
-Note that Evolution is still pre-alpha. This means even if you manage
-to compile and run it, you might not be able to figure out how to tell
-it to accidentally delete all of your mail.
+Note that Evolution is still beta. This means it may delete all of
+your mail if you give it the chance.
 
 If you are interested in hacking on Evolution, you should subscribe to
 the Evolution mailing list. Send mail to
@@ -63,10 +62,22 @@ install, and whether to use GOAD or OAF.
 
         GNOME_PATH=/usr/local
 
+   (You need to do this both during compiling AND when you run
+   evolution.)
+
+
+ - GOAD is the "old" (GNOME 1.x series) object activation system. OAF
+   is the new (unreleased, GNOME 2.x series) system.
+
+   As of bonobo 0.14, OAF is the default activation system for Bonobo.
+   If you want to use OAF, you will need to install the oaf package
+   before building Bonobo. If you want to save a little time and stick
+   with GOAD, you should pass the flag "--enable-oaf=no" to bonobo's
+   configure script.
+
+   Note that Nautilus requires OAF, so if you have built or are
+   planning to build Nautilus as well, you should use OAF.
 
- - There is absolutely no reason to build using OAF unless you are
-   also building Nautilus, in which case you should already have it
-   installed.
 
 
 Dependencies
@@ -86,31 +97,40 @@ ftp.gnome.org. The (*)ed packages are available in Helix GNOME.
 
  - gdk-pixbuf - 0.7.0 or later (*)
 
- - ORBit - 0.5.1 (*)
+ - ORBit - 0.5.1 (*) or later from the orbit-stable-0-5 branch in CVS.
+
+ - oaf - 0.3, assuming that you're building with OAF rather than GOAD
+   (see above). Note that if you build the current CVS version of OAF
+   rather than the 0.3 release, you will need a newer version of ORBit
+   than 0.5.1.
 
  - bonobo - Evolution always tracks the latest CVS versions of bonobo.
    Released versions will virtually always be too old (although as of
-   May 10, bonobo 0.11 is recent enough).
+   June 2, bonobo 0.15 is recent enough).
 
    *** Note that bonobo must be installed with the same --prefix as
    *** either gnome-libs or evolution for the Makefiles to work
    *** properly.
 
  - gnome-vfs (released versions are OK currently, but CVS versions are
-   better)
+   better. Note that gnome-vfs from CVS requires OAF.)
 
- - libunicode = 0.4 or later, available 
-   from http://www.pango.org/download.shtml
+ - libunicode - 0.4 or later, available from
+   http://www.pango.org/download.shtml
 
- - gtkhtml - 0.2 or later
+ - gtkhtml - 0.4 or later
 
  - libglade (*)
 
- - pilot-link - only required if you want Pilot support. The pilot
-   support does not currently exist, so this is somewhat hypothetical.
-   (*)
 
- - gnome-pilot - see pilot-link (*)
+At some point in the future, Evolution will have Pilot sync support,
+which will depend on the following libraries. (At the moment, it will
+check to see whether or not you have them, but it will not actually do
+anything with them.)
+
+ - pilot-link (*)
+
+ - gnome-pilot (*)
 
 
 
@@ -118,19 +138,17 @@ ftp.gnome.org. The (*)ed packages are available in Helix GNOME.
 The layout of the source tree is:
 
 addressbook:	the Address Book UI
+art:		graphics used by evolution
 calendar:	the Calendar UI
 camel:		libcamel, a messaging library used by the mailer.
 		Camel is inspired by Sun's JavaMail
 		(http://java.sun.com/products/javamail/) and the
 		IMAPv4 spec (RFC 2060).
-wombat:		Has source code that will load in the addressbook
-		and calendar backend, and will form the server
-		process we'll be using
 composer:	the message composer UI
 data:		the .desktop file for Evolution
+default_user:	initial Evolution config files for new users
 devel-docs:	entirely inadequate documentation
-doc:		more inadequate documentation, and some nice white
-		papers
+doc:		more adequate documentation
 e-util:		utility code used by various parts of Evolution
 filter:		libfilter, a mail filtering library
 libibex:	an indexing library used by the mailer
@@ -141,5 +159,10 @@ mail:		the mail display UI
 shell:		the Evolution shell (the main program that launches
 		the other components)
 tests:		some test programs
+tools:		utilities, notably "killev", a script to kill of all
+		of the Evolution components
 widgets:	widgets used by Evolution, including the shortcut bar,
 		ETable, and EText
+wombat:		Has source code that will load in the addressbook
+		and calendar backend, and will form the server
+		process we'll be using