DExpo data is kept in a number of different locations.
+
Loser
Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser
Expoweb
Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb
Tunnel data
Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata
Troggle
Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle
Scanned notes
Scans of survey notes and drawn up surveys. Can be got via rsync.
+
Mercurial is a distributed revision control system. On expo this means that many people can edit and merge their changes with each other either when they can access the internet. Mercurial is over the top for scanned survey notes, which do not get modified, so they are kept as a plain directory of files.
+
If you run windows, you are recommended to install Tortoise Hg, which nicely interfaces with windows explorer.
+
Get the repositories
+
Mercurial
+
Linux
+
hg clone RepositoryURL
+
Windows
+
InstallTortoise Hg. In windows explorer right click, select Tortoise Hg .. and click Clone repository. Set the source path to RepositoryURL Set the destination to somewhere on your local harddisk. Press clone.
This is likely to change with structural change to the site, with style changes which we expect to implement and with the method by which the info is actually stored and served up.
+
... and it's not written yet, either :-)
+
+
Structure
+
Info for each cave – automatically generated by make-indxal4.pl
+
Contents lists & relative links for multi-article publications like journals. Complicated by expo articles being in a separate hierarchy.
+
Translations
+
Other people's work - the noinfo hierarchy.
+
Style guide for writing cave descriptions: correct use of boldface (once for each passage name, at the primary definition thereof; other uses of the name should be links to this, and certainly should not be bold.)
+
-Expo data is kept in a number of different locations.
-
-
-
Loser
-
Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser
-
Expoweb
-
Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb
-
Tunnel data
-
Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata
-
Troggle
-
Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle
-
Scanned notes
-
Scans of survey notes and drawn up surveys. Can be got via rsync.
-
-
-
Mercurial is a distributed revision control system. On expo this means that
-many people can edit and merge their changes with each other either when they can access
-the internet. Mercurial is over the top for scanned survey notes, which do not get modified, so
-they are kept as a plain directory of files.
-
-
If you run windows, you are recommended to install
-Tortoise Hg, which nicely interfaces with
-windows explorer.
-
-
Get the repositories
-
Mercurial
-
Linux
-hg clone RepositoryURL
-
Windows
-InstallTortoise Hg.
-
-In windows explorer right click, select Tortoise Hg .. and click Clone repository.
- Set the source path to RepositoryURL
- Set the destination to somewhere on your local harddisk.
- Press clone.
-
-
This is likely to change with structural change to the site, with style
-changes which we expect to implement and with the method by which the
-info is actually stored and served up.
-
-
... and it's not written yet, either :-)
-
-
-
Structure
-
Info for each cave – automatically generated by make-indxal4.pl
-
Contents lists & relative links for multi-article publications like
- journals. Complicated by expo articles being in a separate hierarchy.
-
Translations
-
Other people's work - the noinfo hierarchy.
-
Style guide for writing cave descriptions: correct use of boldface
-(once for each passage name, at the primary definition thereof; other
-uses of the name should be links to this, and certainly should not be bold.)
-
diff --git a/photos/thumbs/andyw_thumbnail_image.jpg b/photos/thumbs/andyw_thumbnail_image.jpg
index 66630317c..015e5148d 100755
Binary files a/photos/thumbs/andyw_thumbnail_image.jpg and b/photos/thumbs/andyw_thumbnail_image.jpg differ
diff --git a/photos/thumbs/clive_george_thumbnail_image.jpg b/photos/thumbs/clive_george_thumbnail_image.jpg
index 8bd9d77f5..2765f7379 100755
Binary files a/photos/thumbs/clive_george_thumbnail_image.jpg and b/photos/thumbs/clive_george_thumbnail_image.jpg differ
diff --git a/photos/thumbs/julian_shilton_thumbnail_image.jpg b/photos/thumbs/julian_shilton_thumbnail_image.jpg
index 6dcd70113..c20f2d0df 100755
Binary files a/photos/thumbs/julian_shilton_thumbnail_image.jpg and b/photos/thumbs/julian_shilton_thumbnail_image.jpg differ
diff --git a/photos/thumbs/nialp_thumbnail_image.jpg b/photos/thumbs/nialp_thumbnail_image.jpg
index 1e139c610..d118fd847 100755
Binary files a/photos/thumbs/nialp_thumbnail_image.jpg and b/photos/thumbs/nialp_thumbnail_image.jpg differ
diff --git a/photos/thumbs/nickt_thumbnail_image.jpg b/photos/thumbs/nickt_thumbnail_image.jpg
index 2c275f272..b120d38d5 100755
Binary files a/photos/thumbs/nickt_thumbnail_image.jpg and b/photos/thumbs/nickt_thumbnail_image.jpg differ
diff --git a/photos/thumbs/rmt_thumbnail_image.jpg b/photos/thumbs/rmt_thumbnail_image.jpg
index 8eb66acc1..65575be89 100755
Binary files a/photos/thumbs/rmt_thumbnail_image.jpg and b/photos/thumbs/rmt_thumbnail_image.jpg differ
diff --git a/photos/thumbs/sandeep_thumbnail_image.jpg b/photos/thumbs/sandeep_thumbnail_image.jpg
index bb664d1fb..a64db05ac 100755
Binary files a/photos/thumbs/sandeep_thumbnail_image.jpg and b/photos/thumbs/sandeep_thumbnail_image.jpg differ
diff --git a/photos/thumbs/tonyr_thumbnail_image.jpg b/photos/thumbs/tonyr_thumbnail_image.jpg
index 68ea44810..53f293287 100755
Binary files a/photos/thumbs/tonyr_thumbnail_image.jpg and b/photos/thumbs/tonyr_thumbnail_image.jpg differ
diff --git a/photos/thumbs/wook91_thumbnail_image.jpg b/photos/thumbs/wook91_thumbnail_image.jpg
index d0871d4cf..b215ec25d 100755
Binary files a/photos/thumbs/wook91_thumbnail_image.jpg and b/photos/thumbs/wook91_thumbnail_image.jpg differ
diff --git a/update.htm b/update.htm
index 214be4063..c7bb72189 100644
--- a/update.htm
+++ b/update.htm
@@ -1,144 +1,15 @@
-
+
-
CUCC's Austria expeditions: Recent changes
-
-
Recent updates to the archive
-
-
This archive is constantly being updated as the current year's work
-is integrated into the whole, and as "catching up" on old documentation
-proceeds. This page is to tell you what's been changed or added recently.
-Only significant changes are recorded - there are too many minor updates
-to links, typos and the like to list here. The change log only started
-in March 1996, and info on older and fairly small changes will be expired
-after a while to avoid the file getting too big :-(
-
-
(Initials: AERW - Andy Waddington; W - Wookey; MRS - Mark Shinwell; MJG -
-Martin Green; DL - David Loeffler)
-
+
Recent updates to the archive
+
This archive is constantly being updated as the current year's work is integrated into the whole, and as "catching up" on old documentation proceeds. This page is to tell you what's been changed or added recently. Only significant changes are recorded - there are too many minor updates to links, typos and the like to list here. The change log only started in March 1996, and largely stopped being maintained after 2005 as we relied on the VCS for such logging.
+
(Initials: AERW - Andy Waddington; W - Wookey; MRS - Mark Shinwell; MJG - Martin Green; DL - David Loeffler); JT - Julian Todd; AC - Aaron Curtis; AZ - Aiora Zabala
+
+
2011 AZ
Website CSS given major makeover
2011.09 JT/W
Expo updates synced to website
2011.04 W/MJG
Troggle properly integrated with website
2009.04 W
Migration to seagrass completed, with troggle integration
2008.08 JT/W
Website migrated to mercurial and seagrass server
2006-2008
Plenty of updates occured regarding expo 06, 07 and 08 - they just weren't recorded here!
Checked in Becka's description of the Subsoil level in 204. QMs in this, the survey, and the original descriptions have been correlated as far as possible (which is most of it except Stoneware and Earthenware III, and parts of Fat Worm where there isn't any data to correlate).
2005.05.17 DL
Yet again updating this site becomes my preferred revision-avoidance strategy. Added a table listing length, depth and extent of all the caves we have data for in the dataset. Other miscellaneous updates: entrance photos and surveys for various recent minor finds; rigging guide for Gaffered to the Walls series in 204.
After an interval of several years it is again possible to obtain survey data from this site. At present only the caves we are currently exploring have survey data publically available (Steinbrückenhöhle, Hauchhöhle, and Eislufthöhle – look at the bottom of the description pages), but it is planned to include more in the near future. (CUCC users knowing the password may naturally access the entire dataset as a .3d file or as a .tar.gz archive of .svx files; this includes data contributed by ARGE and other organisations which we are not in a position to freely redistribute.)
2004.08.20 MRS
Merged in everything from Expo 2004. Currently this is very short on descriptions as these haven't yet been written.
2004.04.23 DL
General update, occasioned by having nothing else to do except revision. Updated Expedition Handbook to reflect current practice in tagging of new caves, entering survey data, etc. Changed lots of pages so they validate as XHTML 1.0 Strict. Applied Mark's funky CSS stylesheet to whole site. Also resurrected this updates page by grovelling through the last three years' CVS logs.
2004.04.19 DL
Ran a link checker on the site, which found all sorts of errors. Corrected the easy ones! Lots of stuff still broken, particularly in Eishöhle description.
2004.03.07 DL
Added a bunch of rigging guides for the deep stuff in 204.
Updated Expo members list again. Added Mike Cox and Wayne Sheldon (2001), who I had been unaware of the existence of but who appear in *team directives in files in the dataset. Also edited the HTML rather (there were no </tr> tags).
2003.09.24 DL
Updated Expo members list to include 2003 participants.
2003.07.04 AERW
Added 1996 + 1997 expo reports from TeX version of CU 1999
Added some approximation to the personnel list from 2001 and 2002 to the table of Expo members
2003.01.30 DL
dplong.htm - Updated Deep + Long Caves list. I had been worrying about this, as I haven't found any up-to-date data on deep caves outside the world's top 150, so I didn't want to delete the older but more comprehensive data. Then I realised it was demonstrably crap, as it labelled two different caves as the world's 320th deep (Eislufthohle and another one somewhere). So out it went. Unfortunately we are only in this list once now that the entry for KH is subsumed into Stellerweg.
2003.01.20 DL
Added a statement of goals for 2003, and updated Expedition Primer to link to those rather than the objectives from several years ago.
2002.12.10 MRS
Updated 204 pages with descriptions from Expo 2002.
Added 2001 log book. Updated Fixed Aids List for Eishöhle. Added 2002 index and goals page. Entered caves listed in the back of 1998, 1999, 2001 logbooks.
-
-
-
2006-2008
-
Plenty of updates occured regarding expo 06, 07 and 08 - they
- just weren't recorded here!
Checked in Becka's description of the Subsoil level in 204. QMs in this,
-the survey, and the original descriptions have been correlated as far as
-possible (which is most of it except Stoneware and Earthenware III, and parts
-of Fat Worm where there isn't any data to correlate).
-
2005.05.17 DL
-
Yet again updating this site becomes my preferred revision-avoidance
-strategy. Added a table listing length, depth and
-extent of all the caves we have data for in the dataset. Other miscellaneous
-updates: entrance photos and surveys for various recent minor finds; rigging guide for Gaffered to the
-Walls series in 204.
After an interval of several years it is again possible to obtain survey
-data from this site. At present only the caves we are currently exploring
-have survey data publically available (Steinbrückenhöhle, Hauchhöhle, and Eislufthöhle – look at the bottom of the
-description pages), but it is planned to include more in the near future. (CUCC
-users knowing the password may naturally access the entire dataset as a .3d file or as a .tar.gz
-archive of .svx files; this includes data contributed by ARGE and other
-organisations which we are not in a position to freely redistribute.)
-
2004.08.20 MRS
-
Merged in everything from Expo 2004. Currently this is very short on
-descriptions as these haven't yet been written.
-
-
2004.04.23 DL
-
General update, occasioned by having nothing else to do except revision.
-Updated Expedition Handbook to reflect current practice in tagging of new
-caves, entering survey data, etc. Changed lots of pages so they validate as
-XHTML 1.0 Strict. Applied Mark's funky CSS stylesheet to whole site. Also
-resurrected this updates page by grovelling through the last three years' CVS
-logs.
-
-
2004.04.19 DL
-
Ran a link checker on the site, which found all sorts of errors. Corrected
-the easy ones! Lots of stuff still broken, particularly in Eishöhle
-description.
Updated Expo members list again. Added Mike Cox and
-Wayne Sheldon (2001), who I had been unaware of the existence of but who appear
-in *team directives in files in the dataset. Also edited the HTML rather (there
-were no </tr> tags).
-
-
2003.09.24 DL
Updated Expo members
-list to include 2003 participants.
-
-
2003.07.04 AERW
-
Added 1996 + 1997 expo reports from TeX version of CU 1999
Added some approximation to the personnel list from 2001 and 2002 to the
-table of Expo members
-
-
2003.01.30 DL
-
dplong.htm - Updated Deep + Long Caves list. I
-had been worrying about this, as I haven't found any up-to-date data on deep
-caves outside the world's top 150, so I didn't want to delete the older but
-more comprehensive data. Then I realised it was demonstrably crap, as it
-labelled two different caves as the world's 320th deep (Eislufthohle and
-another one somewhere). So out it went. Unfortunately we are only in this list
-once now that the entry for KH is subsumed into Stellerweg.
-
-
2003.01.20 DL
-
Added a statement of goals for 2003, and updated Expedition Primer to link to those rather than the
-objectives from several years ago.
-
-
2002.12.10 MRS
-
Updated 204 pages with descriptions
-from Expo 2002.
Added 2001 log book. Updated Fixed Aids List for Eishöhle. Added 2002 index and
-goals page. Entered caves listed in the back of 1998, 1999, 2001 logbooks.