diff --git a/docs/website/administration.php b/docs/website/administration.php index 4702f861..d9078546 100644 --- a/docs/website/administration.php +++ b/docs/website/administration.php @@ -98,14 +98,14 @@ P4 ==>> Administers Group ==> G -

Configuring Calendar Clients for RSCDS

-

The RSCDS client setup page on sourceforge has information on how +

Configuring Calendar Clients for DAViCal

+

The DAViCal client setup page on sourceforge has information on how to configure Evolution, Mozilla Calendar (Sunbird & Lightning) and Mulberry to use remotely hosted calendars.

The administrative interface has no facility for viewing or modifying calendar data.

-

Configuring RSCDS

+

Configuring DAViCal

If you can read this then things must be mostly working already.

-

The RSCDS installation page on sourceforge has +

The DAViCal installation page on sourceforge has some further information on how to install and configure this application.

diff --git a/docs/website/inc/page-header.php b/docs/website/inc/page-header.php index f2433937..6fa74c3b 100644 --- a/docs/website/inc/page-header.php +++ b/docs/website/inc/page-header.php @@ -17,10 +17,14 @@ if ( isset($title) ) { echo $title; } else { +<<<<<<< HEAD:docs/website/inc/page-header.php echo "DAViCal CalDAV Server"; +======= + echo "DAViCal"; +>>>>>>> Rename to DAViCal in the documentation.:docs/website/inc/page-header.php } ?> -
DAViCal CalDAV Server
+
A CalDAV Store