diff --git a/br-alm/i/tc1977.jpg b/br-alm/i/tc1977.jpg index 7d04aaf09..3c8a26b2e 100644 Binary files a/br-alm/i/tc1977.jpg and b/br-alm/i/tc1977.jpg differ diff --git a/br-alm/i/tc77a.jpg b/br-alm/i/tc77a.jpg index 5efa6bab0..d074d5039 100644 Binary files a/br-alm/i/tc77a.jpg and b/br-alm/i/tc77a.jpg differ diff --git a/handbook/update.htm b/handbook/update.htm index 9ffca3111..67f5d0832 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -52,7 +52,7 @@ omissions.

The problem with having more than one or two people do the work is that it generates increasing amounts of email to ensure that people don't update old versions of pages, and throw away someone else's recent work. The solution to -all this is to put the entire site into a system called "Concurrent Version +all this is to put the entire site into a system called "Concurrent Versions System" under which lots of people can make changes, all of which are safely merged together without losing any changes. Just occasionally, the system will detect that two people have changed the same bit of text in conflicting @@ -77,7 +77,7 @@ site, or whatever).

Software requirements

-

You need a system which has a CVS client and supports SSL, so that you can +

You need a system which has a CVS client and supports SSH, so that you can log in without sending a password in clear text over the internet. You need an editor with which you are happy to edit web pages. Ideally this will NOT be one of the commercial WYSIWYG web editors which add whole loads of @@ -89,7 +89,7 @@ text editors with extensions that make editing html easier. The easiest way to get all this is to have a Linux machine, since most distributions have all the tools you need ready built in. The rest of this page assumes that you are doing all this on a recent Linux system. There are a few -useful links for those using Mac, RISC OS or even Windows machines along +useful links for those using Mac, RISC OS or Windows machines along with the links to more detailed documentation at the end of this page. The cvs machine itself is a Linux box, and some of the commands you need to use involve typing at the command line on that machine, @@ -100,15 +100,16 @@ so some familiarity with Unix/Linux will make you feel more at home. these via email, the first thing you will need to do is change the password, using ssh:
-ssh @cvs.survex.com passwd +ssh username@cvs.survex.com passwd -

this is three parts "ssh" says to open an SSL connection -"@cvs.survex.com" says which user on what machine to connect to +

(where username is the username given to you). +This command is in three parts: "ssh" says to open an encrypted connection +"username@cvs.survex.com" says which user on what machine to connect to, "passwd" is the command you are going to execute on that machine, as that user, in this case a command to change your password.

this will ask for the existing password to open the connection to the cvs -machine (this allows the "ssh @cvs.survex.com" to happen), then +machine (this allows the "ssh username@cvs.survex.com" to happen), then ask for it again (to validate the passwd command). Then you need to type your new password twice (second time to confirm that you really typed what you thought the first time), and should then tell you that the password was @@ -147,8 +148,8 @@ Host cvs.survex.com
that the directory ~/.ssh may not exist on the remote machine. To create it and copy the key:
-ssh @cvs.survex.com mkdir ~/.ssh
-scp ~/.ssh/id_dsa.pub @cvs.survex.com:.ssh/authorized_keys2
+ssh username@cvs.survex.com mkdir ~/.ssh
+scp ~/.ssh/id_dsa.pub username@cvs.survex.com:.ssh/authorized_keys2

(note the nasty American spelling here - easy to mistype if you're English)-: Those commands will ask for your password again, but that should be the last @@ -165,11 +166,11 @@ commands on your own machine, so get out of that command line with

To use the CVS commands on your local machine (for checking out pages to edit and commiting them back) you need to tell cvs where the archive -is. You can include a "-d @cvs.survex.com:/export/cvs" with +is. You can include a "-d username@cvs.survex.com:/export/cvs" with cvs commands (useful if you use cvs on more than one repository), but it is usually easier to add
-export CVSROOT=@cvs.survex.com:/export/cvs +export CVSROOT=username@cvs.survex.com:/export/cvs

to some script that will be executed before you want to use cvs. Easiest would usually be ~/.bashrc (assuming your default shell is bash). Also diff --git a/images/2012nd.jpg b/images/2012nd.jpg index 0d0f69724..f3f9ed15e 100644 Binary files a/images/2012nd.jpg and b/images/2012nd.jpg differ diff --git a/newcaves/i/9603.jpg b/newcaves/i/9603.jpg index d352eeb27..35abacdde 100644 Binary files a/newcaves/i/9603.jpg and b/newcaves/i/9603.jpg differ diff --git a/newcaves/i/9605.jpg b/newcaves/i/9605.jpg index 87b3436f2..5bdeb4a5a 100644 Binary files a/newcaves/i/9605.jpg and b/newcaves/i/9605.jpg differ diff --git a/noinfo/1626/5.htm b/noinfo/1626/5.htm index 521bdff45..e5a8fe187 100644 --- a/noinfo/1626/5.htm +++ b/noinfo/1626/5.htm @@ -12,20 +12,35 @@

Altitude: 865m
-Location: Above Rettenbachtal (north side).
-Easily reached on foot from Blaa-Alm, even when drunk -

A resurgence cave of major importance, visited by CUCC in 1976. Krenmayr -gives it 278m long, seasonally active, very roomy water cave. The associated -perennial resurgence is Naglbrünndl, putting out 50-100 l/s. +Location: Above Rettenbachtal (north side); about 20-25 minutes +on foot from Blaa-Alm. -

Entrance is at the head of a large stream bed (carries major flow in -flood), and is reminiscent of Sleets Gill. The tube descends at 60° to -a short walk round a pool to a short greasy climb. One soon emerges in the -huge main passage, floored at the lower end by vast amounts of very -unpleasant mud. The sump is reached by a right turn over some fine -stratified sand, but CUCC's interest lay in some holes in the roof at the top -end, with the hope of a high-level continuation. +

A resurgence cave of major importance, visited by CUCC in 1976 and 2002. +Krenmayr gives it 278m long, seasonally active, very roomy water cave. The +associated perennial resurgence is Naglbrünndl, putting out 50-100 l/s. + +

Continue past the Blaa-Alm +hostelry on the track to a crossroads of paths. Take the path to the right and +then bear downhill and to the left at a fork by a small wooden hut. +Follow the track until you end up walking parallel to the river; keep a +lookout on the right for a small bridge across the river. Cross the bridge +and take a small path to the left, which arrives at a further (smaller!) +bridge over a stream. Just before the bridge, ascend up the hillside to +the right through the undergrowth, keeping the large rocky gully to your +right and the stream to your left. After a few minutes you will arrive +at the resurgence (under tree-roots) to the left. At this point, cross +into the gully on the right and climb up to the very top to reach the +cave. + +

Entrance is at the head of a large, steeply-inclined stream bed (carries +major flow in flood), and is reminiscent of Sleets Gill. A short climb +(protection advisable; two hangers in situ; rope of unknown vintage present in +2002) leads to a tube. This descends at 45° to a short walk round a pool +to a short greasy climb. One soon emerges in the huge main passage, floored at +the lower end by vast amounts of very unpleasant mud. The sump is reached by a +right turn over some fine stratified sand, but CUCC's interest lay in some +holes in the roof at the top end, with the hope of a high-level continuation.

The mud eventually runs out to be replaced by more and more inclined slabs, which were very easy on the way up. The gradient steadily increases diff --git a/others/muenchen/en/841642.htm b/others/muenchen/en/841642.htm index 9ebaa610f..d260e61c4 100644 --- a/others/muenchen/en/841642.htm +++ b/others/muenchen/en/841642.htm @@ -362,8 +362,9 @@ des Dachsteins.

Wilfried's group measured the passage into the Schwarzmooskogelhöhle in the subsequent time, the outside-surveying extended us known -extreme-points of the system to that, the Lamperlhöhle found in August, -that is only one receipt knowner long ago into the +extreme-points of the system to that, the Lamperlhöhle found in +August [this could well be entrance 40g], +that is only one receipt known long ago into the Schwarzmooskogelhöhle, used as has turned out later, the "shaft under the larch", that still gives occasion to big hopes, tried to find the upper entrance of the snow-cone of the Schneevulkanhalle and discovered the @@ -378,13 +379,13 @@ wollten diesmal mitkommen, außerdem noch Oliver Pirner und Mario Taucher, ein in München lebender Höhlenforscher aus dem Ausseer Land. Diesmal war vom 21 bis zum 23 Oktober 1983. -

Gradually, the message of the discovery of the giant chamber seeped -through in the Schwarzmooskogel on and on. It was as one has thrown a stone -into a motionless lake, that now evoked ever bigger circles. Originally also -Wilfried wanted to go too again, but it became nothing with him/it from it. -Willi Hermann and Herbert Wimmer wanted to come along this time, furthermore -still Oliver Pirner and Mario Tauchers, a caver from the Ausseer country -living in Munich. Was from the 21 up to the 23 October 1983 this time. +

Gradually, the news spread of the discovery of the giant chamber +under the Schwarzmooskogel. It was as if one had thrown a stone +into a still lake, now causing ever bigger ripples. Originally, +Wilfried wanted to go again, but nothing came of it. +Willi Hermann and Herbert Wimmer wanted to come along this time, together +with Oliver Pirner and Mario Tauchers, a caver from the Ausseer country +living in Munich. This time we went from 21-23 October 1983.

Am abend auf der Hütte waren wir anfangs die einzigen Gäste und durften in der wohligen Küche sitzen. Später kamen noch zwei diff --git a/smkridge/161/i/bldaly.jpg b/smkridge/161/i/bldaly.jpg index b0033fa63..ede4dd8eb 100644 Binary files a/smkridge/161/i/bldaly.jpg and b/smkridge/161/i/bldaly.jpg differ diff --git a/smkridge/161/i/boltin.jpg b/smkridge/161/i/boltin.jpg index 715aa19c4..3b077f642 100644 Binary files a/smkridge/161/i/boltin.jpg and b/smkridge/161/i/boltin.jpg differ diff --git a/smkridge/161/i/dh1-03.jpg b/smkridge/161/i/dh1-03.jpg index b9de48edb..16d86c2dd 100644 Binary files a/smkridge/161/i/dh1-03.jpg and b/smkridge/161/i/dh1-03.jpg differ diff --git a/smkridge/161/i/dh1-13.jpg b/smkridge/161/i/dh1-13.jpg index ca33d5b0d..84f2247ba 100644 Binary files a/smkridge/161/i/dh1-13.jpg and b/smkridge/161/i/dh1-13.jpg differ diff --git a/smkridge/161/i/dh1-17.jpg b/smkridge/161/i/dh1-17.jpg index 088a35d67..b71764211 100644 Binary files a/smkridge/161/i/dh1-17.jpg and b/smkridge/161/i/dh1-17.jpg differ diff --git a/smkridge/161/i/dh1-21.jpg b/smkridge/161/i/dh1-21.jpg index 431036bc4..702985b67 100644 Binary files a/smkridge/161/i/dh1-21.jpg and b/smkridge/161/i/dh1-21.jpg differ diff --git a/smkridge/161/i/dh2-03.jpg b/smkridge/161/i/dh2-03.jpg index f3eddb9d3..0c027a0d9 100644 Binary files a/smkridge/161/i/dh2-03.jpg and b/smkridge/161/i/dh2-03.jpg differ diff --git a/smkridge/161/i/dh2-22.jpg b/smkridge/161/i/dh2-22.jpg index b4fc11b33..81689f4c6 100644 Binary files a/smkridge/161/i/dh2-22.jpg and b/smkridge/161/i/dh2-22.jpg differ diff --git a/smkridge/161/i/dh2-31.jpg b/smkridge/161/i/dh2-31.jpg index 726e0b863..539f924ec 100644 Binary files a/smkridge/161/i/dh2-31.jpg and b/smkridge/161/i/dh2-31.jpg differ diff --git a/smkridge/161/i/dh_dns.jpg b/smkridge/161/i/dh_dns.jpg index 9c5eae7a2..5481324a3 100644 Binary files a/smkridge/161/i/dh_dns.jpg and b/smkridge/161/i/dh_dns.jpg differ diff --git a/smkridge/204/204.shtml b/smkridge/204/204.shtml index 1a3b0a764..6fa020648 100644 --- a/smkridge/204/204.shtml +++ b/smkridge/204/204.shtml @@ -61,6 +61,7 @@ href="../161/top.htm">161 entrances.

Exploration and surveys

Question mark list. +

Completed question mark list.

On-line surveys: