Put URIs and e-mail addresses in <angle brackets>

Also end URIs with '/' where appropriate.

Refrain from touching scripts/ and Stephen Crane's LWP authorship
note.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/CREDITS b/CREDITS
index fb45208865d0e2d8433e1e71011e05bf2b9cccd7..226862fee6f2fba2433a4b0ba723b0a02cd3ea31 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -20,11 +20,11 @@ in time (October, 1998) there have been 5 major stages identified,
 each with a leading author.  They are as follows (with successsive
 projects building on the projects before it):
 
-  Dave Pare (mr-frog@smarttouch.com) (UCSD/BSD)
-  Jeff Bailey (bailey@mcs.kent.edu) (KSU (1.04) Distribution of BSD)
-  Thomas Ruschak (ts@ecn.purdue.edu) (Chainsaw)
-  Ken Stevens (KStevens@GlobeandMail.ca) (3.0.x)
-  Steve McClure (ionica@empire.cx) (Wolfpack)
+  Dave Pare <mr-frog@smarttouch.com> (UCSD/BSD)
+  Jeff Bailey <bailey@mcs.kent.edu> (KSU (1.04) Distribution of BSD)
+  Thomas Ruschak <ts@ecn.purdue.edu> (Chainsaw)
+  Ken Stevens <KStevens@GlobeandMail.ca> (3.0.x)
+  Steve McClure <ionica@empire.cx> (Wolfpack)
 
 It is due to these above people pulling projects together that the
 Empire server has gotten to where it is today.
@@ -46,8 +46,8 @@ Also see the "History" info file for a more detailed listing of
 the history of Empire.
 
 Currently (June, 2003), Empire development is being led by the
-Wolfpack team.  You can find them at "http://www.wolfpackempire.com"
-or e-mail "wolfpack@wolfpackempire.com".
+Wolfpack team.  You can find them at <http://www.wolfpackempire.com/>
+or e-mail <wolfpack@wolfpackempire.com>.
 
 In addition, the people below are recognized as having either given
 code to the above authors, submitted patches, helped on various
@@ -70,10 +70,10 @@ address if you'd like it included.
 
 ---
 
-James Anderson (jwa@k.cs.cmu.edu)
-Jeff Anton (anton@postgres.berkeley.edu)
-Markus Armbruster (armbru@pond.sub.org)
-Jeff Bailey (bailey@mcs.kent.edu)
+James Anderson <jwa@k.cs.cmu.edu>
+Jeff Anton <anton@postgres.berkeley.edu>
+Markus Armbruster <armbru@pond.sub.org>
+Jeff Bailey <bailey@mcs.kent.edu>
 Mark Ballinger
 Jan van Beethoven
 Paul Byrne
@@ -82,75 +82,75 @@ Bill Canning
 Trannie Carter
 Sean Casey
 David Davis
-Aaron Dewell (dewell@greatland.net)
+Aaron Dewell <dewell@greatland.net>
 Jorge Diaz
-Drake Diedrich (dld@debian.org)
+Drake Diedrich <dld@debian.org>
 Yaser Doleh
 Ed Down
-Phill Everson (everson@compsci.bristol.ac.uk)
+Phill Everson <everson@compsci.bristol.ac.uk>
 Scott Ferguson
-Robert Forsman (thoth@beach.cis.ufl.edu)
+Robert Forsman <thoth@beach.cis.ufl.edu>
 Bill Frolick
 Steven Grady
 Keith Graham
-Jim Griffith (griffith@scam.Berkeley.EDU)
-Steven Grimm (koreth@ucscb.UCSC.EDU)
+Jim Griffith <griffith@scam.Berkeley.EDU>
+Steven Grimm <koreth@ucscb.UCSC.EDU>
 Karl Hagen
-Doug Hay (Doug_Hay@tsb.ca)
+Doug Hay <Doug_Hay@tsb.ca>
 Ken Huisman
-Ray Hyatt (Ray.Hyatt@gmail.com)
-Lewis R. Jansen (lrj@helios.tn.cornell.edu)
-Mike St. Johns (stjohns@edn-vax.arpa)
+Ray Hyatt <Ray.Hyatt@gmail.com>
+Lewis R. Jansen <lrj@helios.tn.cornell.edu>
+Mike St. Johns <stjohns@edn-vax.arpa>
 Beorn Johnson
 William S. Kaster
 Jeremy Kennebel
 Kevin Klemmick
-Ron Koenderink (rkoenderink@yahoo.ca)
-Ron Kuris (rk@unify.com)
-Nick Lai (lai@cs.ucla.edu)
+Ron Koenderink <rkoenderink@yahoo.ca>
+Ron Kuris <rk@unify.com>
+Nick Lai <lai@cs.ucla.edu>
 Phil Lapsley
 Curtis Larsen
-Robert A. Larson (blarson@skat.usc.edu)
+Robert A. Larson <blarson@skat.usc.edu>
 Jonathan Lee
 Craig Leres
-Dan Logcher (dan@i-kinetics.com)
-Pat Loney (overlord@multi.usr.ch)
-Shelley Louie (slouie@cory.berekely.edu)
+Dan Logcher <dan@i-kinetics.com>
+Pat Loney <overlord@multi.usr.ch>
+Shelley Louie <slouie@cory.berekely.edu>
 Steve McClure
-Chris Metcalf (metcalf-christopher@yale.arpa)
+Chris Metcalf <metcalf-christopher@yale.arpa>
 Sasha Mikheev
 Kevin Morgan
 Richard Moss
-Keith Muller (muller@sdcc7.ucsd.edu)
-Chuck Musciano (chuck@trantor.harris-atd.com)
+Keith Muller <muller@sdcc7.ucsd.edu>
+Chuck Musciano <chuck@trantor.harris-atd.com>
 Dave Nye
 Kevin O'Connor
-Jeff Okamoto (okamoto%hpccc@hplabs.hp.com)
+Jeff Okamoto <okamoto%hpccc@hplabs.hp.com>
 Marc Olzheim
-Julian Onions (jpo@computer-science.nottingham.ac.uk)
+Julian Onions <jpo@computer-science.nottingham.ac.uk>
 Jim Ortlieb
-Dave Pare (mr-frog@smarttouch.com)
+Dave Pare <mr-frog@smarttouch.com>
 Gregory Paris
-Kurt Pires (kjpires@ic.berkeley.edu)
+Kurt Pires <kjpires@ic.berkeley.edu>
 Brett Reid
-Bernhard Reiter (breiter@mathematik.Uni-Osnabrueck.DE)
-Jim Reuter (reuter@decwrl.dec.com)
-James Risner (risemp@openworldinc.com)
-Thomas Ruschak (ts@ecn.purdue.edu)
+Bernhard Reiter <breiter@mathematik.Uni-Osnabrueck.DE>
+Jim Reuter <reuter@decwrl.dec.com>
+James Risner <risemp@openworldinc.com>
+Thomas Ruschak <ts@ecn.purdue.edu>
 Edward M. Rynes
-David Muir Sharnoff (muir@cogsci.berkeley.edu)
+David Muir Sharnoff <muir@cogsci.berkeley.edu>
 Alex Shatsky
 Walter Smith
-Ken Stevens (KStevens@GlobeandMail.ca)
+Ken Stevens <KStevens@GlobeandMail.ca>
 Michael Straub
 Tom Tedrick
 Sam Tetherow
-Yannick Tremblay (yt1@eng.cam.ac.uk)
+Yannick Tremblay <yt1@eng.cam.ac.uk>
 Janjaap van Velthooven
 Ville Virrankoski
-Peter Vukovich (peterv@monet.berkeley.edu)
-Jeff Wallace (jeffw@scam.berkeley.edu)
+Peter Vukovich <peterv@monet.berkeley.edu>
+Jeff Wallace <jeffw@scam.berkeley.edu>
 Sverker Wiberg
 Mike Wise
-John Yockey (johny@verinet.com)
+John Yockey <johny@verinet.com>
 Chad Zabel

diff --git a/README b/README
index c5035470bdc050dd1ba99540b0cc62ccb207c7ef..490b5307ba1a3a0ccbf8cc113d13b926f32695ea 100644 (file)
--- a/README
+++ b/README
@@ -90,11 +90,11 @@ Naturally, there's more to running a real game than that, but that's
 beyond the scope of this file.
 
 Please report bugs to <wolfpack@wolfpackempire.com> or via SourceForge
-http://sourceforge.net/projects/empserver (registration required).
+<http://sourceforge.net/projects/empserver/> (registration required).
 
 For more information or help, try rec.games.empire on Usenet, or send
 e-mail to <wolfpack@wolfpackempire.com> and we'll try to answer if we
-can.  Also check out our web site at "http://www.wolfpackempire.com".
+can.  Also check out our web site at <http://www.wolfpackempire.com/>.
 
 Have fun!
 

diff --git a/doc/coding b/doc/coding
index 64cc15bc8244d568bb85e377d357cb9d282daba5..66e9d4f6b674f364cae7b9926b607c5e7d55fe8b 100644 (file)
--- a/doc/coding
+++ b/doc/coding
@@ -42,7 +42,7 @@ clarity.
 
 These guidelines don't attempt to be exhaustive.  More complete
 guidelines that are mostly compatible with Empire can be found at
-http://www.jetcafe.org/~jim/c-style.html
+<http://www.jetcafe.org/~jim/c-style.html>.
 
 See also doc/contributing.
 

diff --git a/doc/unicode b/doc/unicode
index 8d3602923f03d7b813ca550278436cdd88d79579..e467c8f4cd52e1f5a2c1b90962929bdece1ef442 100644 (file)
--- a/doc/unicode
+++ b/doc/unicode
@@ -37,7 +37,7 @@ most significant bit clear) in an UTF-8 string always encodes the
 ASCII character, i.e. it is never part of a multibyte sequence.
 
 To learn more, see the Unicode FAQ, currently at
-http://www.cl.cam.ac.uk/~mgk25/unicode.html
+<http://www.cl.cam.ac.uk/~mgk25/unicode.html>.
 
 
 Requirements for Unicode Support in Empire

diff --git a/info/Bugs.t b/info/Bugs.t
index b8a6b8f2326f38e3a88c14262a0b6d4d1071abe8..4061a1edc7f0fa070599fc2e7e67931791acd109 100644 (file)
--- a/info/Bugs.t
+++ b/info/Bugs.t
@@ -4,7 +4,7 @@
 .s1
 Please work with your deity (see \*Qinfo pray\*U) to get bugs reported
 to <wolfpack@wolfpackempire.com> or via SourceForge
-http://sourceforge.net/projects/empserver (registration required).
+<http://sourceforge.net/projects/empserver> (registration required).
 .s1
 NOTE: The following list is perennially incomplete and out of date.
 .s1

diff --git a/info/History.t b/info/History.t
index b3e0a2291fdb84e17c86337f307962713363bf93..f899ed30c1916c6bfee4a76e276a8d00ba581b80 100644 (file)
--- a/info/History.t
+++ b/info/History.t
@@ -187,7 +187,7 @@ the server gets upgraded, their client will still work.  Note that the
 C_SYNC protocol is asynchronous so, in particular, players will be
 able to watch their neighbors sail ships past their coast etc...
 
-1996 Empire 4.0, Wolfpack (http://www.wolfpackempire.com)
+1996 Empire 4.0, Wolfpack <http://www.wolfpackempire.com/>
 
 A group of people got together to form a new server project.  This project
 is a new project, and is a complete takeoff from the Empire 3.0 server

diff --git a/man/empire.6 b/man/empire.6
index 4b5fac67545ed58ce5fbe2c5db7878424b0ad6ff..837b1349dcadfbc21fefa1ddcb8ea9dcd5b800cc 100644 (file)
--- a/man/empire.6
+++ b/man/empire.6
@@ -85,27 +85,27 @@ Your user name.
 \fIemp_server\fR(6).
 .SH AUTHORS
 .nf
-Primary Author is Dave Pare (mr-frog@scam.berkeley.edu)
+Primary Author is Dave Pare <mr-frog@scam.berkeley.edu>
 Secondary authors/contributors may include:
-James Anderson (jwa@k.cs.cmu.edu)
-Jeff Anton (anton@postgres.berkeley.edu)
-Markus Armbruster (armbru@pond.sub.org)
-Phill Everson (everson@compsci.bristol.ac.uk)
-Steven Grimm (koreth@ucscb.UCSC.EDU)
-Lewis R. Jansen (lrj@helios.tn.cornell.edu)
-Mike St. Johns (stjohns@edn-vax.arpa)
-Ron Koenderink (rkoenderink@yahoo.ca)
-Nick Lai (lai@cs.ucla.edu)
-Shelley Louie (slouie@cory.berekely.edu)
-Steve McClure (ionica@empire.cx)
-Chris Metcalf (metcalf-christopher@yale.arpa)
-Dave Muir Sharnoff (muir@cogsci.berkeley.edu)
-Keith Muller (muller@sdcc7.ucsd.edu)
-Chuck Musciano (chuck@trantor.harris-atd.com)
-Jeff Okamoto (okamoto%hpccc@hplabs.hp.com)
-Julian Onions (jpo@computer-science.nottingham.ac.uk)
-Kurt Pires (kjpires@ic.berkeley.edu)
-Jim Reuter (reuter@decwrl.dec.com)
-Peter Vukovich (peterv@monet.berkeley.edu)
-Jeff Wallace (jeffw@scam.berkeley.edu)
-John Yockey (johny@verinet.com)
+James Anderson <jwa@k.cs.cmu.edu>
+Jeff Anton <anton@postgres.berkeley.edu>
+Markus Armbruster <armbru@pond.sub.org>
+Phill Everson <everson@compsci.bristol.ac.uk>
+Steven Grimm <koreth@ucscb.UCSC.EDU>
+Lewis R. Jansen <lrj@helios.tn.cornell.edu>
+Mike St. Johns <stjohns@edn-vax.arpa>
+Ron Koenderink <rkoenderink@yahoo.ca>
+Nick Lai <lai@cs.ucla.edu>
+Shelley Louie <slouie@cory.berekely.edu>
+Steve McClure <ionica@empire.cx>
+Chris Metcalf <metcalf-christopher@yale.arpa>
+Dave Muir Sharnoff <muir@cogsci.berkeley.edu>
+Keith Muller <muller@sdcc7.ucsd.edu>
+Chuck Musciano <chuck@trantor.harris-atd.com>
+Jeff Okamoto <okamoto%hpccc@hplabs.hp.com>
+Julian Onions <jpo@computer-science.nottingham.ac.uk>
+Kurt Pires <kjpires@ic.berkeley.edu>
+Jim Reuter <reuter@decwrl.dec.com>
+Peter Vukovich <peterv@monet.berkeley.edu>
+Jeff Wallace <jeffw@scam.berkeley.edu>
+John Yockey <johny@verinet.com>

diff --git a/src/client/README b/src/client/README
index d4bc9a8c941ffa582511287888b1e389bc3b3c8f..402c0e2ad6a32e446498fc7c8c3965a1909601ed 100644 (file)
--- a/src/client/README
+++ b/src/client/README
@@ -31,11 +31,11 @@ The client tarball is not meant for development.  Use the complete
 source for that.
 
 Please report bugs to <wolfpack@wolfpackempire.com> or via SourceForge
-http://sourceforge.net/projects/empserver (registration required).
+<http://sourceforge.net/projects/empserver/> (registration required).
 
 For more information or help, try rec.games.empire on Usenet, or send
 e-mail to <wolfpack@wolfpackempire.com> and we'll try to answer if we
-can.  Also check out our web site at "http://www.wolfpackempire.com".
+can.  Also check out our web site at <http://www.wolfpackempire.com/>.
 
 Have fun!
 

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index 813d9d23e35384f66a6cbeefa68ba374bff57c1b..63642fe9e0fdbf2dbf4bbfa0391effed0eda9bae 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -229,10 +229,10 @@ vers(void)
     show_opts(0);
     pr("\n\nSee \"info Options\" for a detailed list of options and descriptions.\n");
     show_custom();
-    pr("\nThe person to annoy if something goes wrong is:\n\t%s\n\t(%s).\n",
+    pr("\nThe person to annoy if something goes wrong is:\n\t%s <%s>.\n",
        privname, privlog);
     pr("\nYou can get your own copy of the source from "
-       "http://www.wolfpackempire.com/\n\n");
+       "<http://www.wolfpackempire.com/>.\n\n");
     pr("%s", legal);
     return RET_OK;
 }