Ximianize. Also update the README a bit and mention the OAF stable branch.

	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
	a bit and mention the OAF stable branch.

svn path=/trunk/; revision=7450

1 files changed, 35 insertions, 35 deletions

diff --git a/README b/README
index 9f878c6431..adb203aa04 100644
--- a/README
+++ b/README
@@ -1,21 +1,24 @@
 Evolution is the integrated mail, calendar and address book
-distributed suite from Helix Code, Inc.
+distributed suite from Ximian, Inc.
 
-See http://www.helixcode.com/apps/evolution.php3 for more information.
+See http://www.ximian.com/apps/evolution.php3 for more information.
 
 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
-"evolution-request@helixcode.com" with the word "subscribe" in the
-body of the message. If you are planning to work on any part of
+If you are using Evolution, you should subscribe to the Evolution
+mailing list. If you are interested in hacking on it, you should
+subscribe to the Evolution Hackers mailing list. Send mail to
+"evolution-request@ximian.com" or
+"evolution-hackers-request@ximian.com" with the word "subscribe" in
+the body of the message. If you are planning to work on any part of
 Evolution, please send mail to the mailing list first, to avoid
 duplicated effort (and to make sure that you aren't basing your work
 on interfaces that are expected to change).
 
-There is a mailing list archive available at
-http://lists.helixcode.com/archives/public/evolution/
+There are mailing list archives available at
+http://lists.ximian.com/archives/public/evolution/     and
+http://lists.ximian.com/archives/public/evolution-hackers/
 
 There is also an #evolution IRC channel on irc.gnome.org.
 
@@ -52,7 +55,9 @@ First you have to decide whether you want to install Evolution (and
 its dependencies) into the same prefix as the rest of your GNOME
 install, or into a new prefix. Installing everything into the same
 prefix as the rest of your GNOME install will make it much easier to
-build and run programs, but may make it harder to uninstall later.
+build and run programs, and easier to switch between using packages
+and building it yourself, but it may also make it harder to uninstall
+later.
 
 If you want to install into the same prefix as the rest of GNOME,
 type:
@@ -60,15 +65,15 @@ type:
 	gnome-config --prefix
 	gnome-config --sysconfdir
 
-and remember the answers, and pass them to "configure" and "autogen"
+and remember the answers, and pass them to "configure" or "autogen.sh"
 when building the other packages you need. Eg:
 
 	./configure --prefix=/usr --sysconfdir=/etc
 
 
-If you do not do this, you will need to set the GNOME_PATH environment
-variable (and ACLOCAL_FLAGS as well if building from CVS) to include
-the prefix you install into. Eg:
+If you build in another prefix instead, you will need to set the
+GNOME_PATH environment variable (and ACLOCAL_FLAGS as well if building
+from CVS) to include the prefix you install into. Eg:
 
         export GNOME_PATH=/usr/local
 	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
@@ -77,19 +82,7 @@ the prefix you install into. Eg:
 need to set GNOME_PATH both during compiling AND when you run
 evolution. Remember also that if you're installing into an odd prefix
 such as /evolution, that you also need to make sure to put
-${prefix}/bin in your PATH.
-
-If you install Evolution into a different prefix from OAF, you will
-also need to set OAF_INFO_PATH to include the directory where the
-oafinfo files are installed (${prefix}/share/oaf). (OAF will
-eventually obey the GNOME_PATH variable, but it does not do so
-currently.) Eg:
-
-	export OAF_INFO_PATH=/usr/local/share/oaf
-
-If you are already running an oafd, you will need to kill it after
-setting that variable so it gets restarted later with that in its
-environment.
+${prefix}/bin in your PATH and ${prefix}/lib in your LD_LIBRARY_PATH.
 
 
 Dependencies
@@ -97,9 +90,12 @@ Dependencies
 
 All of these libraries are available in GNOME CVS, under the given
 names. Most (but not all) of them are also available as tarballs on
-ftp.gnome.org. The (*)ed packages are available in Helix GNOME
-(http://www.helixcode.com/desktop/).  Other packages may be available
-from the evolution preview mirror.
+ftp.gnome.org. The (*)ed packages are available in Ximian GNOME
+(http://www.ximian.com/desktop/) Other packages may be available from
+the Ximian GNOME evolution preview mirror.
+
+If installing from packages, remember that you need both the runtime
+and -devel packages for each library.
 
  - gnome-xml - 1.8.10 or later in the 1.0 series, but not from the 2.0
    series (If you get this from GNOME CVS, use the tag "LIB_XML_1_X".)
@@ -107,11 +103,13 @@ from the evolution preview mirror.
 
  - gnome-print - 0.20 or later (*)
 
- - gdk-pixbuf - 0.7.0 or later (*)
+ - gdk-pixbuf - 0.8.0 or later (*)
 
- - ORBit - 0.5.5 or later (*)
+ - ORBit - 0.5.5 or later (*) (If you get this from GNOME CVS, use the
+   tag "orbit-stable-0-5".)
 
- - oaf - 0.6.0 or later
+ - oaf - 0.6.0 or later (If you get this from GNOME CVS, use the tag
+   "oaf-stable-0-6")
 
    *** If you are using oaf from CVS, you should use the flag
    *** "--disable-more-warnings" when configure, or it may fail to
@@ -123,7 +121,7 @@ from the evolution preview mirror.
    *** "--disable-more-warnings" when configuring, or it may fail to
    *** build.
 
- - bonobo - 0.29 or later
+ - bonobo - 0.31 or later
 
    *** Note that bonobo must be installed with the same --prefix as
    *** either gnome-libs or evolution for the Makefiles to work
@@ -140,8 +138,8 @@ from the evolution preview mirror.
 
  - libglade (*)
 
-If you want support for PalmPilot syncing, currently experimental so
-please back up your pilot, you will also need to do the following:
+If you want support for PalmPilot syncing (currently experimental so
+please back up your pilot) you will also need to do the following:
 
 1) pilot-link
 cvs -d :pserver:anonymous@cvs.gnu-designs.com:/cvs/openpalm login
@@ -164,6 +162,8 @@ in your evo source dir do ./autogen.sh --prefix=<evo-prefix>
 make
 make install
 
+
+
 The layout of the source tree is:
 
 addressbook:	the Address Book UI