Clean more Berlios URls off web pages and docs.

andersson · Oct 1, 2011 · 770c4e4 · 770c4e4
1 parent cf18e52
commit 770c4e4
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 128 deletions.
diff --git a/.gitignore b/.gitignore
@@ -105,6 +105,7 @@ www/gpspipe.html
 www/gpsprof.html
 www/hacking.html
 www/hardware.html
+www/hardware-head.html
 www/index.html
 www/installation.html
 www/libgps.html

diff --git a/NEWS b/NEWS
@@ -185,7 +185,7 @@
   and returns, 'rtcm104v2' rather than 'rtcm104'; this is design forward
   for when RTCM104v3 is fully working.
 
-* Sun Feb 17 2008 Chris Kuethe <ckuethe@mail.berlios.de> - 2.37
+* Sun Feb 17 2008 Chris Kuethe <ckuethe@mainframe.cx> - 2.37
   The C++ bindings, Garmin USB support, and multiple instances of ntp
   pps thread starting were fixed. Handling of odd PPS signals was
   improved. The eye candy in the PHP visualizers was fixed.
@@ -263,7 +263,7 @@
 
 * Wed Jul  6 2005 Eric S. Raymond <[email protected]> - 2.28-1
   The 2.27 source tarball somehow got truncated on upload.
-  Due to procedural mechanics at berlios.de, shipping a new release
+  Due to procedural mechanics at Berlios, shipping a new release
   seems to be the least painful way to recover.  This release is
   identical to 2.27 except the roadmap stuff has been added to TODO.
 

diff --git a/README b/README
@@ -96,7 +96,7 @@ included:
    * Support for multiple devices.
    * Other test tools -- gpsfake, gpscat, gpsmon.
 
-Chris Kuethe <ckuethe@mail.berlios.de> maintains the OpenBSD port, shipped
+Chris Kuethe <ckuethe@mainframe.cx> maintains the OpenBSD port, shipped
 the 2.34 release, is our SiRF and low-level protocols expert, and does a 
 lot of general hacking and support.  He has release authority.
 

diff --git a/gps.xml b/gps.xml
@@ -345,9 +345,7 @@ Chris Kuethe <email>[email protected]</email> (gpxlogger), Chen
 Wei <email>[email protected]</email> (gegps).
 </para>
 
-<para>This manual page by Eric S. Raymond <email>[email protected]</email>.
-There is a project page, with <application>xgps</application>
-screenshots, at <ulink url="http://gpsd.berlios.de/">berlios.de</ulink>.</para>
+<para>This manual page by Eric S. Raymond <email>[email protected]</email></para>
 
 </refsect1>
 

diff --git a/gpsd_json.xml b/gpsd_json.xml
@@ -2277,9 +2277,7 @@ the members of the corresponding JSON object type.</para>
 
 <refsect1 id='maintainer'><title>AUTHOR</title>
 
-<para>The protocol was designed and documented by Eric S. Raymond.  It
-is maintained by the <ulink url="http://gpsd.berlios.de/">GPSD
-project</ulink>.</para>
+<para>The protocol was designed and documented by Eric S. Raymond.</para>
 </refsect1>
 
 </refentry>
diff --git a/srec.xml b/srec.xml
@@ -302,9 +302,7 @@ indicating the starting execution address.  </para></listitem>
 
 <para>From an anonymous web page, itself claiming to have been derived
 from an old Unix manual page. Now maintained by the GPSD
-project, which added endianness clarifications.
-There is a project page for <application>gpsd</application> <ulink
-url="http://gpsd.berlios.de/">here</ulink>.</para>
+project, which added endianness clarifications.</para>
 
 </refsect1>
 </refentry>
diff --git a/www/README b/www/README
@@ -1,10 +1,7 @@
-This subdirectory contains the web pages for the berlios.de repository.
+This subdirectory contains the project web pages.
 
 To upload them after modifying, run "./upload'.  You must have xmlto,
 the docbook DTD (Ver 4.1.2) and asciidoc (Ver 8.5.1+) installed for
 this to work.
 
-Note: The PDFs on the site are not in the code repository, they'd
-just bulk it up.  Be careful not to delete them.
-
 
diff --git a/www/future.html b/www/future.html
@@ -79,14 +79,6 @@ <h2 id="new_protocol">The new GPSD protocol</h2>
 <p>For more on specific tasks planned for upcoming releases, see our
 <a href="TODO">TODO file</a>.</p>
 
-<h2 id="hosting">Changing hosting sites</h2>
-
-<p>We're presently (April 2010) hosted at <a
-href="http://developer.berlios.de">berlios.de</a>, but find that it
-has become extremely flaky of late (logins failing due to broken SSL
-certs is the most recent symptom).  We plan to change sites some time
-in 2010.</p>
-
 <h2 id="dbus">Delegating DBUS support to geoclue</h2>
 
 <p>We're going to stop shipping DBUS notifications directly at some point.  

diff --git a/www/hardware-head.html → www/hardware-head.html.in b/www/hardware-head.html → www/hardware-head.html.in
@@ -74,7 +74,7 @@
 <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>
@@ -88,8 +88,8 @@
 <font size="-1" color="#000000">Web</font>
 </td>
 <td>
-<input type="radio" name="sitesearch" value="gpsd.berlios.de"  checked="checked"></input>
-<font size="-1" color="#000000">gpsd.berlios.de</font>
+<input type="radio" name="sitesearch" value="@SITESEARCH@"  checked="checked"></input>
+<font size="-1" color="#000000">@SITESEARCH@</font>
 </td>
 </tr>
 </table>
@@ -177,9 +177,7 @@
 
 <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
-href="https://www.mainframe.cx/cgi-bin/gps_report.cgi">this
-form</a>.</p>
+new devices by filling out <a href="@WEBFORM@">this form</a>.</p>
 
 <div>&nbsp;</div>
 

diff --git a/www/history.html b/www/history.html
@@ -124,7 +124,7 @@
 gpsd's protocol or how to unpack its data into a C structure).</p>
 
 <p>Eric's work became the prototype for gpsd-2.0.  In mid-August of
-2004, Eric moved the project to berlios.de with the approval and
+2004, Eric moved the project to Berlios with the approval and
 cooperation of all three of the 1.x maintainers.  (The main reason
 for that choice of hosting site was that it was among the first to 
 offer Subversion, which was new technology at the time and which 
@@ -170,7 +170,12 @@
 href="http://thedailywtf.com/Articles/Bad-Code-Offsets-Open-Web-Innovation.asp">won</a>
 the first Good Code Grant from the Alliance for Code Excellence.</p>
 
-<p>In March 2010 the project moved from Subversion to git.</p>
+<p>In March 2010 the project changed version-control systems, moving
+from Subversion to git. In April 2011, it changed build systems,
+dumped autotools for scons.</p>
+
+<p>In late September 2011, the announcement that the Berlios forge site
+would be shutting down at the end of 2011 forced the project to move.</p>
 
 <p>Further forks of <code>gpsd</code> seem unlikely, as the project is
 now sufficiently large and visible to co-opt most developers who might

diff --git a/www/index.html.in b/www/index.html.in
@@ -209,11 +209,6 @@ href="@DOWNLOAD@">Releases</a>
 <dt><a href="@VIEWREPO@">Browse Code</a></dt>
 <dd>Developer access to master git repository</dd>
 
-<dt><a
-href="http://git.debian.org/?p=users/bzed/mirror/gpsd.git">Debian mirror</a></dt>
-<dd>Debian mirror, updated every 7 minutes.</dd>
-</dl>
-
 <p>If you are using a Debian-based distribution (including Ubuntu) you
 can probably install <code>gpsd</code> through your regular package
 manager or by typing <code>"sudo apt-get gpsd"</code> at the command

diff --git a/www/references.html b/www/references.html
@@ -307,7 +307,7 @@ <h2>Garmin</h2>
 here; comparing them may be useful.  Supported by
 <code>gpsd</code>.</dd>
 
-<dt><a href='vendor-docs/garmin/garmin_simpletext.txt'>Garmin Simple
+<dt><a href='http://www8.garmin.com/support/text_out.html'>Garmin Simple
 Text Protocol</a></dt> <dd>Some digital cameras are alleged to use
 this very simple textual report format.</dd>
 </dl>
@@ -476,51 +476,7 @@ <h1>Other</h1>
 </dl>
 
 </div>
-<div style="text-align: center;">
-<div style="text-align: left; margin: 1em auto; width: 50%;">
-<span>Search for more information here:</span>
-
-<!-- SiteSearch Google -->
-<form method="get" action="http://www.google.com/custom" target="_top">
-<table border="0" bgcolor="#ffffff">
-<tr><td nowrap="nowrap" valign="top" align="left" height="32">
-<a href="http://www.google.com/">
-<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="text" name="q" size="31" maxlength="255" value=""></input>
-<input type="submit" name="sa" value="Search"></input>
-</td></tr>
-<tr>
-<td>&nbsp;</td>
-<td nowrap="nowrap">
-<table>
-<tr>
-<td>
-<input type="radio" name="sitesearch" value="" checked="checked"></input>
-<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>
-</td>
-</tr>
-</table>
-<input type="hidden" name="client" value="pub-1458586455084261"></input>
-<input type="hidden" name="forid" value="1"></input>
-<input type="hidden" name="ie" value="ISO-8859-1"></input>
-<input type="hidden" name="oe" value="ISO-8859-1"></input>
-<input type="hidden" name="flav" value="0000"></input>
-<input type="hidden" name="sig" value="BCQudoNGuH3P6MJe"></input>
-<input type="hidden" 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"></input>
-<input type="hidden" name="hl" value="en"></input>
-</td></tr></table>
-</form>
-<!-- SiteSearch Google -->
-</div>
-</div>
-<hr/>
+
 <script language="JavaScript" src="datestamp.js" type='text/javascript'></script>
 </body>
 </html>
diff --git a/www/upstream-bugs.html b/www/upstream-bugs.html
@@ -333,51 +333,6 @@ <h2 id="macxlibs">Mac OS 10.5 X library packaging problem</h2>
 href="http://openradar.appspot.com/6498632">filed as a bug</a> with
 Apple and is reported fixed.</p>
 
-<p>&nbsp;</p>
-
-<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>