From: Markus Armbruster Date: Sat, 25 May 2013 15:01:05 +0000 (+0200) Subject: Put URIs and e-mail addresses in X-Git-Tag: v4.3.32~100 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=bb8169ba3a1e15f2190b8638d3cf7534f1b0877b Put URIs and e-mail addresses in Also end URIs with '/' where appropriate. Refrain from touching scripts/ and Stephen Crane's LWP authorship note. Signed-off-by: Markus Armbruster --- diff --git a/CREDITS b/CREDITS index fb4520886..226862fee 100644 --- 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 (UCSD/BSD) + Jeff Bailey (KSU (1.04) Distribution of BSD) + Thomas Ruschak (Chainsaw) + Ken Stevens (3.0.x) + Steve McClure (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 +or e-mail . 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 +Jeff Anton +Markus Armbruster +Jeff Bailey 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 Jorge Diaz -Drake Diedrich (dld@debian.org) +Drake Diedrich Yaser Doleh Ed Down -Phill Everson (everson@compsci.bristol.ac.uk) +Phill Everson Scott Ferguson -Robert Forsman (thoth@beach.cis.ufl.edu) +Robert Forsman Bill Frolick Steven Grady Keith Graham -Jim Griffith (griffith@scam.Berkeley.EDU) -Steven Grimm (koreth@ucscb.UCSC.EDU) +Jim Griffith +Steven Grimm Karl Hagen -Doug Hay (Doug_Hay@tsb.ca) +Doug Hay 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 +Lewis R. Jansen +Mike St. Johns 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 +Ron Kuris +Nick Lai Phil Lapsley Curtis Larsen -Robert A. Larson (blarson@skat.usc.edu) +Robert A. Larson Jonathan Lee Craig Leres -Dan Logcher (dan@i-kinetics.com) -Pat Loney (overlord@multi.usr.ch) -Shelley Louie (slouie@cory.berekely.edu) +Dan Logcher +Pat Loney +Shelley Louie Steve McClure -Chris Metcalf (metcalf-christopher@yale.arpa) +Chris Metcalf Sasha Mikheev Kevin Morgan Richard Moss -Keith Muller (muller@sdcc7.ucsd.edu) -Chuck Musciano (chuck@trantor.harris-atd.com) +Keith Muller +Chuck Musciano Dave Nye Kevin O'Connor -Jeff Okamoto (okamoto%hpccc@hplabs.hp.com) +Jeff Okamoto Marc Olzheim -Julian Onions (jpo@computer-science.nottingham.ac.uk) +Julian Onions Jim Ortlieb -Dave Pare (mr-frog@smarttouch.com) +Dave Pare Gregory Paris -Kurt Pires (kjpires@ic.berkeley.edu) +Kurt Pires 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 +Jim Reuter +James Risner +Thomas Ruschak Edward M. Rynes -David Muir Sharnoff (muir@cogsci.berkeley.edu) +David Muir Sharnoff Alex Shatsky Walter Smith -Ken Stevens (KStevens@GlobeandMail.ca) +Ken Stevens Michael Straub Tom Tedrick Sam Tetherow -Yannick Tremblay (yt1@eng.cam.ac.uk) +Yannick Tremblay Janjaap van Velthooven Ville Virrankoski -Peter Vukovich (peterv@monet.berkeley.edu) -Jeff Wallace (jeffw@scam.berkeley.edu) +Peter Vukovich +Jeff Wallace Sverker Wiberg Mike Wise -John Yockey (johny@verinet.com) +John Yockey Chad Zabel diff --git a/README b/README index c5035470b..490b5307b 100644 --- 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 or via SourceForge -http://sourceforge.net/projects/empserver (registration required). + (registration required). For more information or help, try rec.games.empire on Usenet, or send e-mail to 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 . Have fun! diff --git a/doc/coding b/doc/coding index 64cc15bc8..66e9d4f6b 100644 --- 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 +. See also doc/contributing. diff --git a/doc/unicode b/doc/unicode index 8d3602923..e467c8f4c 100644 --- 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 +. Requirements for Unicode Support in Empire diff --git a/info/Bugs.t b/info/Bugs.t index b8a6b8f23..4061a1edc 100644 --- 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 or via SourceForge -http://sourceforge.net/projects/empserver (registration required). + (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 b3e0a2291..f899ed30c 100644 --- 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 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 4b5fac675..837b1349d 100644 --- 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 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 +Jeff Anton +Markus Armbruster +Phill Everson +Steven Grimm +Lewis R. Jansen +Mike St. Johns +Ron Koenderink +Nick Lai +Shelley Louie +Steve McClure +Chris Metcalf +Dave Muir Sharnoff +Keith Muller +Chuck Musciano +Jeff Okamoto +Julian Onions +Kurt Pires +Jim Reuter +Peter Vukovich +Jeff Wallace +John Yockey diff --git a/src/client/README b/src/client/README index d4bc9a8c9..402c0e2ad 100644 --- 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 or via SourceForge -http://sourceforge.net/projects/empserver (registration required). + (registration required). For more information or help, try rec.games.empire on Usenet, or send e-mail to 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 . Have fun! diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c index 813d9d23e..63642fe9e 100644 --- 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"); + ".\n\n"); pr("%s", legal); return RET_OK; }