Factor out or remove URLs. No code changes yet except in gpsd.php (now .in).

This was the easy part. Remaining removals will require more decisions.
author: Eric S. Raymond <esr@thyrsus.com> 2011-10-01 18:26:31 -0400
committer: Eric S. Raymond <esr@thyrsus.com> 2011-10-01 18:26:31 -0400
commit: 282122c022d42765b491a11ced84b1749469c726 (patch)
tree: 9073a8a76bfd266aa7b23590ae24ab2aa644e6bd /www
parent: a98e65e54178c39d6b15d64f87c9c560149bbac5 (diff)
download: gpsd-282122c022d42765b491a11ced84b1749469c726.tar.gz
13 files changed, 43 insertions, 149 deletions
diff --git a/www/excellence.html b/www/excellence.html
index 8ee35c55..e2d71570 100644
--- a/www/excellence.html
+++ b/www/excellence.html
@@ -74,10 +74,10 @@ software authors to write essays on how their projects drive out
 bad code, offering $500 dollar prizes.</p>
 
 <p>I sat down to write an essay about GPSD in the same vein of high
-drollery as the Alliance's site, then realized that <a
-href="http://gpsd.berlios.de/">GPSD</a> actually has a serious case to
-make.  We really do drive out bad code, in both direct and indirect
-ways, and we supply examples of good practice for emulation.</p>
+drollery as the Alliance's site, then realized that GPSD actually has
+a serious case to make.  We really do drive out bad code, in both
+direct and indirect ways, and we supply examples of good practice for
+emulation.</p>
 
 <p>GPSD is a service daemon and device multiplexer that is the
 open-source world's basic piece of infrastructure for communicating
@@ -242,8 +242,3 @@ real hardware is vital to fully learn their quirks.</p>
 <script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
 </body>
 </html>
-<!--
-Local Variables:
-compile-command: "(scp excellence.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/faq.html b/www/faq.html.in
index fb5e7bea..39c550b7 100644
--- a/www/faq.html
+++ b/www/faq.html.in
@@ -1,4 +1,5 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!-- @MASTER@ -->
 <html>
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -169,12 +170,10 @@ have a real <code>gpsd</code> bug.</p>
 
 <p>If you are using an old version of <code>gpsd</code>, it is
 possible your bug has already been fixed.  Download the latest public
-version from the <a
-href='http://developer.berlios.de/projects/gpsd/'>project page</a> and
-test it.  To be really helpful, check out the <a
-href='https://developer.berlios.de/git/?group_id=2116'>git
-head</a> and test that.  We don't mind getting bug reports that say
-"I saw version foo had the following bug, but you've fixed it."</p>
+version from the <a href='@MAINPAGE@'>project page</a> and test it.
+To be really helpful, check out the <a href='@REPOVIEW@'>git head</a>
+and test that.  We don't mind getting bug reports that say "I saw
+version foo had the following bug, but you've fixed it."</p>
 
 <h3>5. Capture a log that triggers the problem</h3>
 
@@ -215,11 +214,8 @@ all, is the firmware version.  You will want that for your report.</p>
 
 <h3 id="logformat">8. Annotate the capture log and send us a copy</h3>
 
-<!-- Note: his is also linked on the hardware page -->
 <p>We'll describe the annotation steps here for completeness, but the
-easiest way to do this is with <a
-href="https://www.mainframe.cx/cgi-bin/gps_report.cgi">our web
-form</a>
+easiest way to do this is with <a href="@WEBFORM">our web form</a>
 
 <p>A logfile should consist of an identifying header followed by a
 straight unencoded dump of receiver data, whether NMEA or binary. The
@@ -317,9 +313,8 @@ far more helpful to us and will get your bug fixed faster, so we'll
 describe that procedure here.</p>
 
 <ol>
-<li><p>Follow <a
-href='http://developer.berlios.de/git/?group_id=2116'>these
-instructions</a> to check out a copy of the software.</p></li>
+<li><p>Follow <a href='@CLONEREPO@'>these instructions</a> to clone
+a copy of the source repository.</p></li>
 
 <li><p>Use <a
 href="http://www.kernel.org/pub/software/scm/git/docs/git-bisect.html">git
@@ -341,10 +336,10 @@ too long to fit, let the daemon run for a few minutes and issue an "I"
 command to it.  Alternatively, running the daemon at -D 4 may reveal
 the version.</p>
 
-<h3>13. Report it on the Berlios bugtracker</h3>
+<h3>13. Report it on the GPSD bugtracker</h3>
 
 <p>There is a <a
-href="http://developer.berlios.de/bugs/?group_id=2116">gpsd bug tracker</a>.
+href="@BUGTRACKER">GPSD bug tracker</a>.
 Use that.  If your bug narrative does not fit the tracker template well,
 it's acceptable to send an email report to the gpsd-dev list.</p>
 </blockquote>
@@ -354,10 +349,10 @@ it's acceptable to send an email report to the gpsd-dev list.</p>
 <p>On a Linux machine, the <code>gpsd</code> daemon normally takes
 between 0.1 and 0.6 seconds to handshake with your hardware.  After
 that you will receive GPS reports within a second of when the sensor
-issues them.  GPSD itself adds <a
-href="http://gpsd.berlios.de/performance.html">almost no measurable
-latency</a>, but RS-232 transmission time to <code>gpsd</code> can be
-more significant; you can cut this time by increasing the baud rate.</p>
+issues them.  GPSD itself adds <a href="performance.html">almost no
+measurable latency</a>, but RS-232 transmission time to
+<code>gpsd</code> can be more significant; you can cut this time by
+increasing the baud rate.</p>
 
 <p>Longer handshake delays have been reported from other platforms.
 Under OpenBSD, time to handshake with some binary GPSes (including
@@ -823,8 +818,3 @@ at steadily less than 1% on a low-power, low-speed ARM SBC.</p>
 <script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
 </body>
 </html>
-<!--
-Local Variables:
-compile-command: "(scp faq.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/hacking.html b/www/hacking.html.in
index ae602ac8..6bb74be4 100644
--- a/www/hacking.html
+++ b/www/hacking.html.in
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- @MASTER@ -->
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -1358,9 +1359,8 @@ at state 2 -- you must notify the dev list.</p>
 the following order:</p>
 
 <dl>
-<dt>1. Check the <a
-href="http://developer.berlios.de/bugs/?group_id=2116">Berlios bug
-tracker</a> for release blockers.</dt>  <dd></dd>
+<dt>1. Check the <a href="@BUGTRACKER@">bug tracker</a> for
+release blockers.</dt>  <dd></dd>
 
 <dt>2. Issue the pre-release heads-up</dt>
 <dd>About 48 hours before release, announce that it's coming so people
@@ -1399,10 +1399,10 @@ gpsd.spec.in is up-to-date and properly timestamped.</dd>
 </ol>
 </dd>
 
-<dt>9. Ship to Berlios</dt>
-<dd>Make the tarball (scons dist) and upload to berlios.de (scons upload-ftp),
-and do Berlios's
-<a href="https://developer.berlios.de/project/admin/?group_id=2116">release procedure</a>.</dd>
+<dt>9. Ship to our hosting site</dt>
+<dd>Make the tarball (scons dist), upload it to @SITENAME@,
+(scons upload-ftp), and do <a href="@ADMIN@">release
+procedure</a>.</dd>
 
 <dt>10. Tag the release in git</dt>
 <dd>Do this:
diff --git a/www/hall-of-shame.html b/www/hall-of-shame.html
index 3bc87a50..3d76dd4d 100644
--- a/www/hall-of-shame.html
+++ b/www/hall-of-shame.html
@@ -152,9 +152,3 @@ way to query the offset.</p></li>
 <script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
 </body>
 </html>
-
-<!--
-Local Variables:
-compile-command: "(scp hall-of-shame.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/hardware-head.html b/www/hardware-head.html
index 547fdd25..4d1abac2 100644
--- a/www/hardware-head.html
+++ b/www/hardware-head.html
@@ -175,7 +175,6 @@ bug), poor ratings reflect problems not in <tt>gpsd</tt> but rather in
 device design and firmware so badly botched that <tt>gpsd</tt> cannot
 compensate.</p>
 
-<!-- Note: The CGI lives offsite because Berlios blocks outbound mail --> 
 <p>This table is generated from a capability database in the
 <code>gpsd</code> source tree. Please help us enrich the database with
 new devices by filling out <a
@@ -185,8 +184,3 @@ form</a>.</p>
 <div>&nbsp;</div>
 
 <!-- hardware-head.html ends here -->
-<!--
-Local Variables:
-compile-command: "(make hardware.html; scp hardware.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/hardware-tail.html b/www/hardware-tail.html
index 1f0c6d61..dbada9ef 100644
--- a/www/hardware-tail.html
+++ b/www/hardware-tail.html
@@ -211,9 +211,3 @@ serial data accurate to about 250mS.</p>
 <script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
 </body>
 </html>
-
-<!--
-Local Variables:
-compile-command: "(make hardware.html; scp hardware.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/index.html.in b/www/index.html.in
index 9f59a803..0c55e684 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -203,10 +203,10 @@ version) rather than the latest released stable version.</p>
 <dd>The main project page</dd>
 
 <dt><a
-href="http://developer.berlios.de/project/showfiles.php?group_id=2116">Releases</a>
+href="@DOWNLOAD@">Releases</a>
 <dd>Where to get release tarballs</dd>
 
-<dt><a href="http://developer.berlios.de/git/?group_id=2116">Browse Code</a></dt>
+<dt><a href="@VIEWREPO@">Browse Code</a></dt>
 <dd>Developer access to master git repository</dd>
 
 <dt><a
@@ -224,27 +224,22 @@ line.</p>
 <p>There are four project mailing lists:</p>
 
 <ul>
-<li><a
-href="http://lists.berlios.de/mailman/listinfo/gpsd-announce">gpsd-announce</a>
+<li><a href="@MAILMAN@/gpsd-announce">gpsd-announce</a>
 is for release announcements and project news.</li>
-<li><a
-href="http://lists.berlios.de/mailman/listinfo/gpsd-users">gpsd-users</a>
+<li><a href="@MAILMAN@/gpsd-users">gpsd-users</a>
 is for questions and technical support on <code>gpsd</code>, including support
 for application builders using <code>gpsd</code> as a component.</li>
-
-<li><a
-href="http://lists.berlios.de/mailman/listinfo/gpsd-dev">gpsd-dev</a>
+<li><a href="@MAILMAN@/gpsd-dev">gpsd-dev</a>
 is for <code>gpsd</code> developers.</li>
-
-<li><a
-href="https://lists.berlios.de/mailman/listinfo/gpsd-commit-watch">gpsd-commit-watch</a>
+<li><a href="@MAILMAN@/gpsd-commit-watch">gpsd-commit-watch</a>
 sends automatic broadcast notifications of commits to the <code>gpsd</code>
 repository.</li>
 
-<li>We also have searchable archives at <a href="http://marc.info">MARC</a>:
-<a href="http://marc.info/?l=gpsd-users">gpsd-users</a>,
-<a href="http://marc.info/?l=gpsd-dev">gpsd-dev</a> and 
-<a href="http://marc.info/?l=gpsd-commit-watch">gpsd-commit-watch</a>.</li>
+<li>There are searchable archives of the old GPSD mailing lists from
+Berlios at <a href="http://marc.info">MARC</a>: <a
+href="http://marc.info/?l=gpsd-users">gpsd-users</a>, <a
+href="http://marc.info/?l=gpsd-dev">gpsd-dev</a> and <a
+href="http://marc.info/?l=gpsd-commit-watch">gpsd-commit-watch</a>.</li>
 </ul>
 
 <h1 id='documentation'>Documentation</h1>
@@ -417,9 +412,7 @@ of the setup steps and caveats will be the same.</p>
 href="http://code.google.com/p/qtgpsc/">Qt-based client</a>, basically
 <code>xgps</code> with a Qt look and feel.
 
-<p>We supply a Gentoo Linux ebuild script in the source distribution.</p>
-
-<p>You can find Debian-unstable packages 
+0<p>You can find Debian-unstable packages 
 <a href='http://packages.debian.org/unstable/misc/gpsd'>here</a>.</p>
 
 <p>There's a Perl client library <a
@@ -510,7 +503,7 @@ Here</a>.</font></td></tr></table></td></tr></table></noscript>
 <img src="http://www.google.com/logos/Logo_25wht.gif" border="0" alt="Google" align="middle"></img></a>
 </td>
 <td nowrap="nowrap">
-<input type="hidden" name="domains" value="gpsd.berlios.de"></input>
+<input type="hidden" name="domains" value="@SITESEARCH@"></input>
 <input type="text" name="q" size="31" maxlength="255" value=""></input>
 <input type="submit" name="sa" value="Search"></input>
 </td></tr>
@@ -524,8 +517,8 @@ Here</a>.</font></td></tr></table></td></tr></table></noscript>
 <font size="-1" color="#000000">Web</font>
 </td>
 <td>
-<input type="radio" name="sitesearch" value="gpsd.berlios.de"></input>
-<font size="-1" color="#000000">gpsd.berlios.de</font>
+<input type="radio" name="sitesearch" value="@SITESEARCH@"></input>
+<font size="-1" color="#000000">@SITESEARCH@</font>
 </td>
 </tr>
 </table>
diff --git a/www/main.css b/www/main.css
index 58defc05..89a4bc97 100644
--- a/www/main.css
+++ b/www/main.css
@@ -111,8 +111,3 @@ div.strike {
 	font-size:small;
 	text-indent: 0;
 }
-/*
-Local Variables:
-compile-command: "(scp main.css esr@shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
-*/
diff --git a/www/references.html b/www/references.html
index f5ac2523..21525d7d 100644
--- a/www/references.html
+++ b/www/references.html
@@ -524,9 +524,3 @@ Formulary</a></dt>
 <script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
 </body>
 </html>
-
-<!--
-Local Variables:
-compile-command: "(scp references.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
diff --git a/www/upload.in b/www/upload.in
index 19069216..e1b7ee61 100755
--- a/www/upload.in
+++ b/www/upload.in
@@ -6,7 +6,6 @@
 # No CGI copy yet, hosting site won't let us send mail
 #
 webdir=@UPLOADTO@
-#cgidir=shell.berlios.de:/home/groups/gpsd/cgi-bin
 
 # Ensure all derived HTML and checksums are up to date.
 (cd ..; scons website)
@@ -29,7 +28,6 @@ else
     else
         scp $eligible $webdir && touch .upload-stamp
     fi
-    #scp gps_report.cgi $cgidir
 fi
 
 # End
diff --git a/www/upstream-bugs.html b/www/upstream-bugs.html
index 4dc58249..adb318e8 100644
--- a/www/upstream-bugs.html
+++ b/www/upstream-bugs.html
@@ -381,10 +381,6 @@ Apple and is reported fixed.</p>
 </div>
 
 <hr>
-<script language="JavaScript" src="datestamp.js" type="text/javascript"></script><!--
-Local Variables:
-compile-command: "(scp upstream-bugs.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
+<script language="JavaScript" src="datestamp.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/www/wishlist.html b/www/wishlist.html
index d17dea44..e08c9d9e 100644
--- a/www/wishlist.html
+++ b/www/wishlist.html
@@ -279,6 +279,7 @@ purchased.</p>
 
 <div>&nbsp;</div>
 
+<div>
 <table border="1" cellpadding="2" cellspacing="2">
   <tbody>
     <tr align="center">
@@ -317,58 +318,9 @@ purchased.</p>
 help us get the standards and test hardware we need so we can do a better
 job on behalf of everyone.</p>
 
-<div>&nbsp;</div>
-
-<div style="text-align: center;">
-<span>Search for GPS-related information here:</span>
-<!-- SiteSearch Google -->
-<form method="get" action="http://www.google.com/custom" target="_top">
-  <table bgcolor="#ffffff" border="0">
-    <tbody>
-      <tr>
-        <td align="left" height="32" nowrap="nowrap" valign="top"><a
- href="http://www.google.com/"> <img
- src="http://www.google.com/logos/Logo_25wht.gif" alt="Google"
- align="middle" border="0"></a></td>
-        <td nowrap="nowrap"> <input name="domains"
- value="gpsd.berlios.de" type="hidden"><input name="q" size="31"
- maxlength="255" value="" type="text"> <input name="sa" value="Search"
- type="submit"></td>
-      </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td nowrap="nowrap">
-        <table>
-          <tbody>
-            <tr>
-              <td> <input name="sitesearch" value="" type="radio"><font
- color="#000000" size="-1">Web</font> </td>
-              <td> <input name="sitesearch" value="gpsd.berlios.de"
- checked="checked" type="radio"><font color="#000000" size="-1">gpsd.berlios.de</font>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <input name="client" value="pub-1458586455084261" type="hidden">
-        <input name="forid" value="1" type="hidden"><input name="ie"
- value="ISO-8859-1" type="hidden"> <input name="oe" value="ISO-8859-1"
- type="hidden"><input name="flav" value="0000" type="hidden"> <input
- name="sig" value="BCQudoNGuH3P6MJe" type="hidden"><input name="cof"
- value="GALT:#008000;GL:1;DIV:#336699;VLC:663399;AH:center;BGC:FFFFFF;LBGC:336699;ALC:0000FF;LC:0000FF;T:000000;GFNT:0000FF;GIMP:0000FF;FORID:1"
- type="hidden"> <input name="hl" value="en" type="hidden"></td>
-      </tr>
-    </tbody>
-  </table>
-</form>
-<!-- SiteSearch Google -->
-</div>
 </div>
 
 <hr>
-<script language="JavaScript" src="datestamp.js" type="text/javascript"></script><!--
-Local Variables:
-compile-command: "(scp wishlist.html shell.berlios.de:/home/groups/gpsd/htdocs)"
-End:
--->
+<script language="JavaScript" src="datestamp.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/www/writing-a-driver.xml b/www/writing-a-driver.xml
index 1782cb1a..ab624354 100644
--- a/www/writing-a-driver.xml
+++ b/www/writing-a-driver.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE article PUBLIC
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY homepage      "http://gpsd.berlios.de">
 ]>
 <article>
 <title>Notes on Writing a GPSD Driver</title>
author	Eric S. Raymond <esr@thyrsus.com>	2011-10-01 18:26:31 -0400
committer	Eric S. Raymond <esr@thyrsus.com>	2011-10-01 18:26:31 -0400
commit	282122c022d42765b491a11ced84b1749469c726 (patch)
tree	9073a8a76bfd266aa7b23590ae24ab2aa644e6bd /www
parent	a98e65e54178c39d6b15d64f87c9c560149bbac5 (diff)
download	gpsd-282122c022d42765b491a11ced84b1749469c726.tar.gz