diff --git a/docs/website/administration.php b/docs/website/administration.php
index f1dc4599..7e7c9526 100644
--- a/docs/website/administration.php
+++ b/docs/website/administration.php
@@ -73,11 +73,11 @@ have a backup person, so you also want A2 to be able to do that.</p>
 <p>In this case you might only set up a single principal for the resources, and have
  multiple calendars, one for each resource.</p>
 <pre>
-A1  ==>> is a member of    ==> G
-A2  ==>> is a member of    ==> G
-R1  ==>> grants write privilege to ==> G
-R2  ==>> grants write privilege to ==> G
-R3  ==>> grants write privilege to ==> G
+A1  ==&gt;&gt; is a member of    ==&gt; G
+A2  ==&gt;&gt; is a member of    ==&gt; G
+R1  ==&gt;&gt; grants write privilege to ==&gt; G
+R2  ==&gt;&gt; grants write privilege to ==&gt; G
+R3  ==&gt;&gt; grants write privilege to ==&gt; G
 P1  is a different principal with no specifically granted privilege
 </pre>
 <p>P1 will be able to see all of the scheduled events for R1, R2 and R3, but will
@@ -91,28 +91,28 @@ create and modify all the events.</p>
 <p>In this case you should create a group "G", which all team members are
 members of, and each team member will grant whatever privileges they wish to that group.</p>
 <pre>
-P1  ==>> is a member of  ==> G
-P1  ==>> grants read privilege to ==> G
-P2  ==>> is a member of  ==> G
-P2  ==>> grants read privilege to ==> G
-P3  ==>> is a member of  ==> G
-P3  ==>> grants write privilege to ==> G
-P4  ==>> is a member of  ==> G
-P4  ==>> grants read-free-busy privilege to ==> G
+P1  ==&gt;&gt; is a member of  ==&gt; G
+P1  ==&gt;&gt; grants read privilege to ==&gt; G
+P2  ==&gt;&gt; is a member of  ==&gt; G
+P2  ==&gt;&gt; grants read privilege to ==&gt; G
+P3  ==&gt;&gt; is a member of  ==&gt; G
+P3  ==&gt;&gt; grants write privilege to ==&gt; G
+P4  ==&gt;&gt; is a member of  ==&gt; G
+P4  ==&gt;&gt; grants read-free-busy privilege to ==&gt; G
 </pre>
 
 <h4>A team can modify each others calendars</h4>
 <p>Similar to above, you should create a group "G", which all team members are
 members of, and each team member will grant <em>write</em> privileges to that group.</p>
 <pre>
-P1  ==>> is a member of  ==> G
-P1  ==>> grants write privilege to ==> G
-P2  ==>> is a member of  ==> G
-P2  ==>> grants write privilege to ==> G
-P3  ==>> is a member of  ==> G
-P3  ==>> grants write privilege to ==> G
-P4  ==>> is a member of  ==> G
-P4  ==>> grants write privilege to ==> G
+P1  ==&gt;&gt; is a member of  ==&gt; G
+P1  ==&gt;&gt; grants write privilege to ==&gt; G
+P2  ==&gt;&gt; is a member of  ==&gt; G
+P2  ==&gt;&gt; grants write privilege to ==&gt; G
+P3  ==&gt;&gt; is a member of  ==&gt; G
+P3  ==&gt;&gt; grants write privilege to ==&gt; G
+P4  ==&gt;&gt; is a member of  ==&gt; G
+P4  ==&gt;&gt; grants write privilege to ==&gt; G
 </pre>
 
 <p>Also see the Permissions page on the DAViCal Wiki: <a href="http://wiki.davical.org/w/Permissions" title="The Permissions page on the DAViCal Wiki">http://wiki.davical.org/w/Permissions</a>.</p>
diff --git a/docs/website/index.php b/docs/website/index.php
index ac5908d2..a3ef2143 100644
--- a/docs/website/index.php
+++ b/docs/website/index.php
@@ -10,7 +10,7 @@ the maintenance of shared remote calendars through CalDAV including Mozilla Cale
 (Sunbird/Lightning), Evolution, Mulberry, Chandler, and various other closed-source products
 such as Apple's iCal and iPhone. </p>
 <h2>Features</h2>
-<ul>DAViCal:
+DAViCal:<ul>
 <li>is <a href="http://www.gnu.org/philosophy/open-source-misses-the-point.html">Free Software</a> licensed under the <a href="http://www.gnu.org/licenses/gpl.html">General Public License</a>.</li>
 <li>uses an SQL database for storage of event data</li>
 <li>supports backward-compatible access via WebDAV in read-only or read-write mode (not recommended)</li>
@@ -22,7 +22,7 @@ and writing the same calendar entries over time, and scheduling of meetings with
 
 <h1>Overview of Installation and Use</h1>
 <h2>Prerequisites</h2>
-<ul>To install and use DAViCal you will need:
+To install and use DAViCal you will need:<ul>
 <li>a PostgreSQL database server</li>
 <li>a web server which can run PHP version 5</li>
 </ul>
@@ -45,7 +45,7 @@ a page on the wiki which will sometimes have newer information.</p>
 <p>If you can't find your answer there, then the IRC channel #davical on <a href="http://irc.oftc.net/">irc.oftc.net</a> is
 a great next port of call.  Many problems can be solved quickly with a short on-line chat.</p>
 <p>Almost as good as the IRC channel is the <a href="https://lists.sourceforge.net/mailman/listinfo/rscds-general">DAViCal General Mailing List</a>.</p>
-<ul>Other places to try include:
+Other places to try include:<ul>
 <li>The sourceforge forums.</li>
 <li>Googling your problem.</li>
 </ul>
@@ -54,14 +54,14 @@ through the author's company <a href="http://www.morphoss.com/products/davical/s
 
 <h1>Credits</h1>
 <p>DAViCal CalDAV Server was conceived and written by <a href="http://andrew.mcmillan.net.nz/">Andrew McMillan</a>.</p>
-<ul>Translations of the administration interface have been done by:
+Translations of the administration interface have been done by:<ul>
 <li>Lorena Paoletti (Spanish)</li>
 <li>Cristina Radalescu (German)</li>
 <li>Guillaume Rosquin &amp; Maxime Delorme (French)</li>
 <li>Nick Khazov (Russian)</li>
 <li>Eelco Maljaars (Dutch)</li>
 </ul>
-<ul>Other contributors:
+Other contributors:<ul>
 <li>Maxime Delorme (CSS, LDAP, SyncML, French translations)</li>
 <li>Andrew Ruthven (Various enhancements)</li>
 </ul>
@@ -70,7 +70,7 @@ through the author's company <a href="http://www.morphoss.com/products/davical/s
 <p>We welcome contributions from interested people.  You don't need to be able to write code - there are lots of
 small tasks around the project that can be done.
 CalDAV server:</p>
-<ul>Here are some things you could do that will help us to concentrate on making DAViCal a better:
+Here are some things you could do that will help us to concentrate on making DAViCal a better:<ul>
 <li>writing documentation</li>
 <li>helping people on IRC, on the mailing list or sf.net forums</li>
 <li>translating the DAViCal interface to another language</li>
diff --git a/docs/website/installation.php b/docs/website/installation.php
index 7d048317..6cc30415 100644
--- a/docs/website/installation.php
+++ b/docs/website/installation.php
@@ -44,7 +44,7 @@ You'll have to add this overlay to your system:</p>
 <pre>
 emerge layman
 layman -f -a sunrise
-echo "source /usr/portage/local/layman/make.conf" >> /etc/make.conf
+echo "source /usr/portage/local/layman/make.conf" &gt;&gt; /etc/make.conf
 </pre>
 
 <p>From there, you can keep the overlay in sync with the command:</p>
@@ -113,7 +113,7 @@ user which will be created for the web application fo connect as.</p>
 
 <p>In a simple installation, where you do not have untrusted
 users on your database server, and your database is on the same
-computer as the web server, the following lines (at the very top
+computer as the web server, the following lines (at the very <em>top</em>
 of the pg_hba.conf file) should be enough:</p>
 
 <pre>
@@ -191,24 +191,24 @@ single virtual host.</p>
 <pre>
 #
 # Virtual Host def for Debian packaged DAViCal
-&lt;VirtualHost 123.4.56.78 >
+&lt;VirtualHost 123.4.56.78 &gt;
   DocumentRoot /usr/share/davical/htdocs
   DirectoryIndex index.php index.html
   ServerName davical.example.net
   ServerAlias calendar.example.net
   Alias /images/ /usr/share/davical/htdocs/images/
-  &lt;Directory /usr/share/davical/htdocs/>
+  &lt;Directory /usr/share/davical/htdocs/&gt;
       AllowOverride None
       Order allow,deny
       Allow from all
-  &lt;/Directory>
+  &lt;/Directory&gt;
   AcceptPathInfo On
   php_value include_path /usr/share/awl/inc
   php_value magic_quotes_gpc 0
   php_value register_globals 0
-  php_value error_reporting "E_ALL & ~E_NOTICE"
+  php_value error_reporting "E_ALL &amp; ~E_NOTICE"
   php_value default_charset "utf-8"
-&lt;/VirtualHost>
+&lt;/VirtualHost&gt;
 </pre>
 
 <p>Replace 123.4.56.78 with your own IP address, of course (you can
@@ -236,13 +236,13 @@ and is a regular PHP file which sets (or overrides) some specific variables.</p>
 
 <pre>
 &lt;?php
-//  $c->domain_name = "calendar.example.net";
-//  $c->sysabbr     = 'DAViCal';
-//  $c->admin_email = 'admin@example.net';
-//  $c->system_name = "Example DAViCal Server";
-//  $c->enable_row_linking = true;
+//  $c-&gt;domain_name = "calendar.example.net";
+//  $c-&gt;sysabbr     = 'DAViCal';
+//  $c-&gt;admin_email = 'admin@example.net';
+//  $c-&gt;system_name = "Example DAViCal Server";
+//  $c-&gt;enable_row_linking = true;
 
-  $c->pg_connect[] = 'dbname=davical port=5432 user=davical_app';
+  $c-&gt;pg_connect[] = 'dbname=davical port=5432 user=davical_app';
 
 </pre>