Format addresses consistently, and properly.

This commit is contained in:
Chris Costello 2001-06-28 04:57:44 +00:00
parent ac7869eee1
commit d920d5d661
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=9743

View file

@ -17,7 +17,7 @@
<corpauthor>The FreeBSD Documentation Project</corpauthor> <corpauthor>The FreeBSD Documentation Project</corpauthor>
<pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.236 2001/06/28 04:25:58 chris Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.237 2001/06/28 04:37:20 chris Exp $</pubdate>
<copyright> <copyright>
<year>1995</year> <year>1995</year>
@ -432,42 +432,47 @@
<para>FreeBSD is also available via CDROM, from the following <para>FreeBSD is also available via CDROM, from the following
place(s):</para> place(s):</para>
<address>BSDi <address>
<street>4041 Pike Lane, Suite F</street> <otheraddr>BSDi</otheraddr>
<city>Concord</city>, <state>CA</state> <street>4041 Pike Lane, Suite F</street>
<postcode>94520</postcode> <city>Concord</city>, <state>CA</state> <postcode>94520</postcode>
<country>USA</country> <country>USA</country>
Orders: <phone>+1 800 786-9907</phone>
<phone>Orders: +1 800 786-9907</phone> Questions: <phone>+1 925 674-0783</phone>
<phone>Questions: +1 925 674-0783</phone> Fax: <fax>+1 925 674-0821</fax>
<fax>FAX: +1 925 674-0821</fax> Email: <email>orders@osd.bsdi.com</email>
<otheraddr>email: <ulink URL="mailto:orders@osd.bsdi.com">BSDi Orders address</ulink></otheraddr> WWW: <otheraddr><ulink URL="http://www.osd.bsdi.com/">BSDi Home page</ulink></otheraddr>
<otheraddr>WWW: <ulink URL="http://www.osd.bsdi.com/">BSDi Home page</ulink></otheraddr></address> </address>
<para>In Australia, you may find it at:</para> <para>In Australia, you may find it at:</para>
<address>Advanced Multimedia Distributors <address>
<street>Factory 1/1 Ovata Drive</street> <otheraddr>Advanced Multimedia Distributors</otheraddr>
<city>Tullamarine, Melbourne</city> <street>Factory 1/1 Ovata Drive</street>
<state>Victoria</state> <city>Tullamarine, Melbourne</city> <state>Victoria</state>
<country>Australia</country> <country>Australia</country>
<phone>Voice: +61 3 9338 6777</phone> Voice: <phone>+61 3 9338 6777</phone>
</address>
<otheraddr>CDROM Support BBS</otheraddr> <address>
<street>17 Irvine St</street> <otheraddr>CDROM Support BBS</otheraddr>
<city>Peppermint Grove</city>, <state>WA</state> <street>17 Irvine St</street>
<postcode>6011</postcode> <city>Peppermint Grove</city>, <state>WA</state>
<phone>Voice: +61 9 385-3793</phone> <postcode>6011</postcode>
<fax>Fax: +61 9 385-2360</fax></address> Voice: <phone>+61 9 385-3793</phone>
Fax: <fax>+61 9 385-2360</fax>
</address>
<para>And in the UK:</para> <para>And in the UK:</para>
<address>The Public Domain &amp; Shareware Library <address>
<street>Winscombe House, Beacon Rd</street> <otheraddr>The Public Domain &amp; Shareware Library</otheraddr>
<city>Crowborough</city> <street>Winscombe House, Beacon Rd</street>
<state>Sussex. TN6 1UL</state> <city>Crowborough</city>
<phone>Voice: +44 1892 663-298</phone> <state>Sussex. TN6 1UL</state>
<fax>Fax: +44 1892 667-473</fax></address> Voice: <phone>+44 1892 663-298</phone>
Fax: <fax>+44 1892 667-473</fax>
</address>
</answer> </answer>
</qandaentry> </qandaentry>