lots of fixes from Markus

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1293 4e78687f-474d-0410-85f9-8d5e500ac6b2

1 files changed, 31 insertions, 30 deletions

diff --git a/html/index.html b/html/index.html
index b402c9de..ba49a478 100644
--- a/html/index.html
+++ b/html/index.html
@@ -9,7 +9,8 @@ This web page relates to the PROJ.4 Cartographic Projections library originally
 written by Gerald Evenden then of the USGS.  The primary version of this
 web page can be found at <a href="http://www.remotesensing.org/proj">
 http://www.remotesensing.org/proj</a>, and mirrored at
-<a href="http://proj.maptools.org">proj.maptools.org</a>.<p>
+<a href="http://proj.maptools.org">http://proj.maptools.org</a>.
+<p>
 
 <!---------------------------------------------------------------------------->
 <h2>Download</h2>
@@ -25,32 +26,32 @@ Password: <enter>
 </pre>
 
 The following files are available from the 
-<a href="ftp://ftp.remotesensing.org/pub/proj">proj ftp directory</a>
+<a href="ftp://ftp.remotesensing.org/proj">proj ftp directory</a>
 or <a href="http://proj.maptools.org/dl">http mirror</a>.<p>
 
 <ul>
-<li> <a href="ftp://ftp.remotesensing.org/pub/proj/proj-4.4.9.tar.gz">
+<li> <a href="ftp://ftp.remotesensing.org/proj/proj-4.4.9.tar.gz">
 proj-4.4.9.tar.gz</a> or
-<a href="ftp://ftp.remotesensing.org/pub/proj/proj-4.4.9.zip">proj-4.4.9.zip
+<a href="ftp://ftp.remotesensing.org/proj/proj-4.4.9.zip">proj-4.4.9.zip
 </a>: Current source release.<p>
 
-<li> <a href="ftp://ftp.remotesensing.org/pub/proj/proj446_win32_bin.zip">
+<li> <a href="ftp://ftp.remotesensing.org/proj/proj446_win32_bin.zip">
 proj446_win32_bin.zip</a>: Prebuilt Win32 executables, DLL including 
 NAD27 grid shift files.<p>
 
 <li> 
-<a href="ftp://ftp.remotesensing.org/pub/proj/proj-datumshift-1.3.zip">
+<a href="ftp://ftp.remotesensing.org/proj/proj-datumshift-1.3.zip">
 proj-datumshift-1.3.zip</a>: 
 US, Canadian and New Zealand datum shift grids - unzip in the nad directory before 
 configuring to add NAD27/NAD83 and NZGD49 datum conversion.<p>
 
 <li> 
-<a href="ftp://ftp.remotesensing.org/pub/proj/proj-4.4.8-1.i386.rpm">
+<a href="ftp://ftp.remotesensing.org/proj/proj-4.4.8-1.i386.rpm">
 proj-4.4.8-1.i386.rpm</a>: Binary distribution for Intel Linux (glibc 2.1).
 The <a href="http://mappinghacks.com/rpm/">Mapping Hacks RPM Repository</a> 
 may have more current PROJ.4 RPMs for Fedora Core. The
-<a href="http://www.gdf-hannover.de/software/suse/">GDF Hannover RPM 
-Repository</a> offers PROJ.4 RPMs for SuSe.<p>
+<a href="http://www.gdf-hannover.de/software">GDF Hannover RPM 
+Repository</a> offers PROJ.4 RPMs for SuSe and Mandrake/Mandriva. <p>
 
 <li> 
 <a href="http://packages.debian.org/unstable/science/proj.html">
@@ -60,10 +61,10 @@ PROJ.4 in a Debian Package</a>.<p>
 <a href="http://www.triplexware.huckfinn.de/geogfix.html#proj">
 PROJ.4 Ported to the Delphi (Borland C++) environment</a>.<p>
 
-<li> <a href="ftp://ftp.remotesensing.org/pub/proj/from_kai/PROJ.4.3.3.tar.gz">PROJ.4.3.3.tar.gz</a>:
+<li> <a href="ftp://ftp.remotesensing.org/proj/from_kai/PROJ.4.3.3.tar.gz">PROJ.4.3.3.tar.gz</a>:
 The last PROJ 4.3 release produced by Gerald Evenden (classic PROJ.4).<p>
 
-<li> <a href="ftp://ftp.remotesensing.org/pub/proj/from_kai/">from_kai</a>: 
+<li> <a href="ftp://ftp.remotesensing.org/proj/from_kai/">from_kai</a>: 
 A snapshot of everything on the kai.er.usgs.gov/pub/PROJ.4 directory as
 of March/2000.<p>
 
@@ -72,21 +73,21 @@ of March/2000.<p>
 <h2>Documentation</h2>
 
 <ul>
-<li> <a href="ftp://ftp.remotesensing.org/pub/proj/OF90-284.pdf">
+<li> <a href="ftp://ftp.remotesensing.org/proj/OF90-284.pdf">
 OF90-284.pdf (2.7MB)</a>: The main users manual for PROJ; however, this dates
 from PROJ.3 - the addendums 
-<a href="ftp://ftp.remotesensing.org/pub/proj/PROJ.4.3.pdf">PROJ.4.3.pdf (1MB)</a>,
-<a href="ftp://ftp.remotesensing.org/pub/proj/PROJ.4.3.I2.pdf">PROJ.4.3.I2.pdf (2MB)</a>,
+<a href="ftp://ftp.remotesensing.org/proj/PROJ.4.3.pdf">PROJ.4.3.pdf (1MB)</a>,
+<a href="ftp://ftp.remotesensing.org/proj/PROJ.4.3.I2.pdf">PROJ.4.3.I2.pdf (2MB)</a>,
 and 
-<a href="ftp://ftp.remotesensing.org/pub/proj/SWISS.pdf">SWISS.pdf (78KB)</a>
+<a href="ftp://ftp.remotesensing.org/proj/SWISS.pdf">SWISS.pdf (78KB)</a>
 contain important additional information.<p>
 
 <li> Short of having a new manual set, here is a newly formatted set of documentation:
 <ul>
-<li><a href="ftp://ftp.remotesensing.org/pub/proj/new_docs/OF90-284.pdf">OF90-284.pdf (5MB)</a> 
-<li><a href="ftp://ftp.remotesensing.org/pub/proj/new_docs/proj.4.3.pdf">proj.4.3.pdf (2.4MB)</a>
-<li><a href="ftp://ftp.remotesensing.org/pub/proj/new_docs/proj.4.3.I2.pdf">proj.4.3.I2.pdf (2MB)</a>
-<li><a href="ftp://ftp.remotesensing.org/pub/proj/new_docs/swiss.pdf">swiss.pdf (74KB)</a>
+<li><a href="ftp://ftp.remotesensing.org/proj/new_docs/OF90-284.pdf">OF90-284.pdf (5MB)</a> 
+<li><a href="ftp://ftp.remotesensing.org/proj/new_docs/proj.4.3.pdf">proj.4.3.pdf (2.4MB)</a>
+<li><a href="ftp://ftp.remotesensing.org/proj/new_docs/proj.4.3.I2.pdf">proj.4.3.I2.pdf (2MB)</a>
+<li><a href="ftp://ftp.remotesensing.org/proj/new_docs/swiss.pdf">swiss.pdf (74KB)</a>
 </ul>
 The content is the same as the original set, above, except that these versions have been reformatted to be more legible
 and references within the files are clickable, so it is easier to find your way around. Sadly, they are somewhat
@@ -118,7 +119,8 @@ unsubscription and a web archive can be found at
 <a href="http://remotesensing.org/mailman/listinfo/proj">
 http://remotesensing.org/mailman/listinfo/proj</a>.  
 The PROJ.4 mailing list is also available by NNTP at
-<a href="news://news.gmane.org/gmane.comp.gis.proj-4.devel">news://news.gmane.org/gmane.comp.gis.proj-4.devel</a>.<p>
+<a href="news://news.gmane.org/gmane.comp.gis.proj-4.devel">news://news.gmane.org/gmane.comp.gis.proj-4.devel</a> and via HTML at 
+<a href="http://news.gmane.org/gmane.comp.gis.proj-4.devel">http://news.gmane.org/gmane.comp.gis.proj-4.devel</a>.<p>
 
 Bugs <a href="http://bugzilla.remotesensing.org/enter_bug.cgi?product=PROJ.4">
 can be entered</a> and 
@@ -131,12 +133,12 @@ be viewed</a> in BugZilla.<p>
 <h2>Plans</h2>
 
 PROJ.4 is in active use by 
-<a href="http://hgeo02.geog.uni-hannover.de/grass/">GRASS</a>, 
+<a href="http://grass.itc.it">GRASS GIS</a>, 
 <a href="http://mapserver.gis.umn.edu/">MapServer</a>, 
 <a href="http://postgis.refractions.net/">PostGIS</a>, 
 <a href="http://thuban.intevation.org/">Thuban</a>, 
 <a href="http://ogdi.sourceforge.net/">OGDI</a> and
-<a href="http://gdal.velocet.ca/projects/opengis/ogrhtml/osr_tutorial.html">
+<a href="http://www.gdal.org/ogr/osr_tutorial.html">
 OGRCoordinateTransformation</a> as well as various other projects (please
 let me know about other projects using PROJ.4!).<p>
 
@@ -150,8 +152,8 @@ pseudo-projection).  The new <b>cs2cs</b> program performs a similar function
 to the <b>proj</b> program, but transforming from any one coordinate system
 to another.  The new <b>pj_transform()</b> is used to access the extended
 coordinate system to coordinate system transformation with datum shifting.
-A mapping file (<b>epsg</b>) has also been introduced mapping most EPSG (
-<a href="http://www.epsg.org">www.epsg.org</a>) coordinate systems to 
+A mapping file (<b>epsg</b>) has also been introduced mapping most EPSG 
+(<a href="http://www.epsg.org">www.epsg.org</a>) coordinate systems to 
 PROJ.4 format.<p>
 
 Future plans for PROJ.4 will hopefully include better online documentation,
@@ -216,21 +218,20 @@ PROJ.4 VB Wrappers</a> from Eric G. Miller. <p>
 <li> <a href="http://gmt.soest.hawaii.edu/">GMT</a> - Generic
 Mapping Tools, includes reprojection services.<p>
 
-<li> <a href="http://users.netonecom.net/~rburtch/geodesy/datums.html">
-Coordinates, Datums and Transformations</a>: An assortment of links and
-information.<p>
+<li> <a href="http://www.progonos.com/furuti/MapProj/CartIndex/cartIndex.html">
+Map projections</a>: An introduction to cartography emphasizing map projections: their properties, applications and basic mathematics.<p>
 
 <li> <a href="http://edc.usgs.gov/pub/software/gctpc/">GCTPC</a>: The
 other widely used projection package from te USGS.<p>
 
-<li> <a href="http://earth-info.nima.mil/GandG/geotrans/index.html">
+<li> <a href="http://earth-info.nga.mil/GandG/geotrans/index.htm">
 Geotrans</a>: a projections and datum shift program from NIMA.<p>
 
-<li> <a href="http://www.geocities.com/CapeCanaveral/1224/mapref.html">MapRef</a>: Assorted general information on projections, and related topics.<p>
+<li> <a href="http://www.mapref.org">MapRef</a>: Assorted general information on projections, and related topics.<p>
 
 <li> <a href="http://www.asprs.org/resources/GRIDS/">Grids & Datums</a>: Clifford J. Mugnier's columns in PE&amp;RS.<p>
 
-<li> <a href="http://earth-info.nima.mil/GandG/pubs.html">NIMA Publications on Geodesy</a>.<p>
+<li> <a href="http://earth-info.nga.mil/GandG/publications/index.htm">NGA (former NIMA) Publications on Geodesy</a>.<p>
 
 </ul>