From 5e2b0aaf12ece4d701550cfda441eaaa38b89113 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@helixcode.com>
Date: Sat, 30 Dec 2000 05:21:26 +0000
Subject: down with ldap-servers.xml, up with addressbook-sources.xml.

2000-12-29  Chris Toshok  <toshok@helixcode.com>

	* ldap-servers.xml, addressbook-sources.xml: down with
	ldap-servers.xml, up with addressbook-sources.xml.

	* Makefile.am (default_DATA): same.

svn path=/trunk/; revision=7197
---
 default_user/ChangeLog               |  7 ++++++
 default_user/Makefile.am             |  2 +-
 default_user/addressbook-sources.xml | 43 ++++++++++++++++++++++++++++++++++++
 default_user/ldapservers.xml         | 43 ------------------------------------
 4 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100644 default_user/addressbook-sources.xml
 delete mode 100644 default_user/ldapservers.xml

diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index 7f728d3a22..366c657fe1 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-29  Chris Toshok  <toshok@helixcode.com>
+
+	* ldap-servers.xml, addressbook-sources.xml: down with
+	ldap-servers.xml, up with addressbook-sources.xml.
+
+	* Makefile.am (default_DATA): same.
+
 2000-10-25  Iain Holmes  <iain@helixcode.com>
 
 	* local/Makefile.am: Added executive-summary again.
diff --git a/default_user/Makefile.am b/default_user/Makefile.am
index a7455498a8..a02792aae3 100644
--- a/default_user/Makefile.am
+++ b/default_user/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = local
 
 defaultdir = $(datadir)/evolution/default_user
-default_DATA = ldapservers.xml shortcuts.xml
+default_DATA = addressbook-sources.xml shortcuts.xml
 
 EXTRA_DIST = $(default_DATA)
 
diff --git a/default_user/addressbook-sources.xml b/default_user/addressbook-sources.xml
new file mode 100644
index 0000000000..52a52a001c
--- /dev/null
+++ b/default_user/addressbook-sources.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<addressbooks>
+  <contactserver>
+      <name>Bigfoot</name>
+      <description>Bigfoot</description>
+      <host>ldap.bigfoot.com</host>
+      <port>389</port>
+      <rootdn></rootdn>
+      <scope>one</scope>
+  </contactserver>
+  <contactserver>
+      <name>InfoSpace</name>
+      <description>Infospace</description>
+      <host>ldap.infospace.com</host>
+      <port>389</port>
+      <rootdn></rootdn>
+      <scope>one</scope>
+  </contactserver>
+  <contactserver>
+      <name>Netcenter</name>
+      <description>Netcenter Member Directory</description>
+      <host>memberdir.netscape.com</host>
+      <port>389</port>
+      <rootdn>ou=member_directory,o=netcenter.com</rootdn>
+      <scope>one</scope>
+  </contactserver>
+  <contactserver>
+      <name>WhoWhere</name>
+      <description>WhoWhere</description>
+      <host>ldap.whowhere.com</host>
+      <port>389</port>
+      <rootdn></rootdn>
+      <scope>one</scope>
+  </contactserver>
+  <contactserver>
+      <name>Yahoo!</name>
+      <description>Yahoo! People Search</description>
+      <host>ldap.yahoo.com</host>
+      <port>389</port>
+      <rootdn></rootdn>
+      <scope>one</scope>
+  </contactserver>
+</addressbooks>
diff --git a/default_user/ldapservers.xml b/default_user/ldapservers.xml
deleted file mode 100644
index 46620d21a9..0000000000
--- a/default_user/ldapservers.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<contactservers>
-  <contactserver>
-      <name>Bigfoot</name>
-      <description>Bigfoot</description>
-      <host>ldap.bigfoot.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>InfoSpace</name>
-      <description>Infospace</description>
-      <host>ldap.infospace.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>Netcenter</name>
-      <description>Netcenter Member Directory</description>
-      <host>memberdir.netscape.com</host>
-      <port>389</port>
-      <rootdn>ou=member_directory,o=netcenter.com</rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>WhoWhere</name>
-      <description>WhoWhere</description>
-      <host>ldap.whowhere.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-  <contactserver>
-      <name>Yahoo!</name>
-      <description>Yahoo! People Search</description>
-      <host>ldap.yahoo.com</host>
-      <port>389</port>
-      <rootdn></rootdn>
-      <scope>one</scope>
-  </contactserver>
-</contactservers>
-- 
cgit v1.2.3