===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/lyrics.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- www/lyrics.html	2005/04/19 11:45:48	1.54
+++ www/lyrics.html	2005/04/19 12:03:26	1.55
@@ -185,7 +185,7 @@
 Puffathy (little girl voice) by Anita Miotti, monkeys and laughing by Ty
 Semaka,
 guitar by Reed Shimozawa, drums, bass and all other sounds programmed by
-Jonathan Lewis.  Co-Arranged by Ty Semaka & Jonathan Lewis.
+Jonathan Lewis.  Co-Arranged by Ty Semaka & Jonathan Lewis.
 Recorded, mixed and mastered by Jonathan Lewis at Moxam Studios
 (1-403-233-0350).
 
@@ -367,7 +367,7 @@
 <td valign="top" width="28%">
 <a href="orders.html">[Order OpenBSD 3.5 or other items]</a><br>
 OpenBSD 3.5 CD2 track 2 is an<br>
-uncompressed copy of this skit & song.<br>
+uncompressed copy of this skit &amp; song.<br>
 <a href="ftp://ftp.openbsd.org/pub/OpenBSD/songs/song35.mp3">MP3 version of song (5:21 minutes, 9.7MB)</a><br>
 <a href="ftp://ftp.openbsd.org/pub/OpenBSD/songs/song35.ogg">OGG version of song (5:21 minutes, 6.8MB)</a><br>
 <br>
@@ -442,7 +442,7 @@
 and Apple), but the community outrage was so overpowering that they
 backed down.  Some standards groups use this policy, while others
 avoid it -- the one differentiation being the amount of corporate
-participation. In the IETF, the pro-RAND agents work for AT&T,
+participation. In the IETF, the pro-RAND agents work for AT&amp;T,
 Alcatel, IBM, Cisco, Microsoft, and other large companies.  Since IETF
 is an open forum, they can blend in as the populace, and vote just
 like all others, except against the community.
@@ -800,7 +800,7 @@
 obligations.  Many articles in the <a href=press.html>press</a> followed regarding
 this sudden manuevre.  Apparently this hoopla happened
 because an OpenBSD-related article in the Canadian
-newspaper The Globe & Mail had quoted Theo de Raadt
+newspaper The Globe &amp; Mail had quoted Theo de Raadt
 making anti-war statements regarding Iraq and the
 theft of oil.
 <p>
@@ -937,7 +937,7 @@
 Co-Arrangement, Lyrics, and Main Vocals by Ty Semaka.
 <br>
 Back-vocals by Bob Beck, Calvin Beck, Theo de Raadt, Alan Kolodziejzyk,
-Jonathan Lewis & Peter Valchev.
+Jonathan Lewis &amp; Peter Valchev.
 <br>
 Rap #1 by Richard Sixto.
 Guitar by Chantal Vitalis.
@@ -1225,6 +1225,6 @@
 <a href=index.html><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a>
 <a href="mailto:www@openbsd.org">
 Public Discussion Forum about contents of these web pages: www@openbsd.org</a>
-<br><small>$OpenBSD: lyrics.html,v 1.54 2005/04/19 11:45:48 tom Exp $</small>
+<br><small>$OpenBSD: lyrics.html,v 1.55 2005/04/19 12:03:26 tom Exp $</small>
 </body>
 </html>