diff --git a/handbook/index.htm b/handbook/index.htm index ae9f07e86..3eaaa820d 100644 --- a/handbook/index.htm +++ b/handbook/index.htm @@ -2,8 +2,7 @@ -Cambridge University Caving Club Expedition Handbook. 2001 Edition - +Cambridge University Caving Club Expedition Handbook. 2001 Edition @@ -71,7 +70,7 @@ wasted in the past through inadequate recording. It isn't very much extra work,
Description of seting up and putting away the Solar Powered battery charging system at the stonebridge
Updating the website
-
This tells you how to use CVS to download and update the master copy of the +
This tells you how to use HG to download and update the master copy of the website.
On a matter of stooling
@@ -102,14 +101,5 @@ wasted in the past through inadequate recording. It isn't very much extra work,
- diff --git a/handbook/update.htm b/handbook/update.htm index 568f4f1e0..fd106913b 100644 --- a/handbook/update.htm +++ b/handbook/update.htm @@ -4,36 +4,37 @@ CUCC Expedition Handbook: Updating the website -

CUCC Expedition Handbook

-

Updating the website - HOWTO

-

Please refer to the latest web updating guide in CUCC website

-
-

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.

-

RSync

-

Linux

-

rsync -av expoimages expo@seagrass.goatchurch.org.uk:

-

Windows

-

Not sure yet

-

The website conventions bit

-

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 :-)

- +

CUCC Expedition Handbook

+

Updating the website - HOWTO

+

Simple instructions for updating website

+

Please refer to the latest web updating guide in CUCC website

+
+

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.

+

RSync

+

Linux

+

rsync -av expoimages expo@seagrass.goatchurch.org.uk:

+

Windows

+

Not sure yet

+

The website conventions bit

+

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 :-)

+