[CalendarServer-dev] [CalendarServer] WikiStart modified

[CalendarServer]

Changed page "WikiStart" by wsanchez at apple.com from 17.224.20.215*
Page URL: <http://trac.calendarserver.org/wiki/WikiStart>
Diff URL: <http://trac.calendarserver.org/wiki/WikiStart?action=diff&version=44>
Revision 44

-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: WikiStart
=========================================================================
--- WikiStart (version: 43)
+++ WikiStart (version: 44)
@@ -6,7 +6,7 @@
 
 [http://carddav.calconnect.org/ CardDAV] is an address book client/server protocol designed to allow users to access and share contact data on a server. The CardDAV protocol is being developed by the IETF and is currently an internet draft.
 
-Calendar and Contact Server is presently implemented as two separate servers: [source:CalendarServer Calendar Server] and [source:ContactsServer Contacts Server].  The near-term plan is the merge these into one code base.
+Calendar and Contact Server is presently implemented as two separate servers: [source:CalendarServer Calendar Server] and [source:ContactsServer Contacts Server].  The plan is the merge these into one code base.
 
 The sources are available under the terms of the [http://www.apache.org/licenses/LICENSE-2.0.html Apache License, Version 2.0].
 

-------8<------8<------8<------8<------8<------8<------8<------8<--------

* The IP shown here might not mean anything if the user or the server is
behind a proxy.

--
CalendarServer </>
HTTP/WebDAV/CalDAV Server

This is an automated message. Someone at / added your email
address to be notified of changes on WikiStart. If it was not you, please
report to .