expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-25 08:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added easy hg guide

Browse Source
This commit is contained in:
Martin 2012-08-14 19:01:16 +02:00
parent 75ba419792
commit 6e7b4d6b2a
2 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
handbook/index.htm
View File

@ -2,8 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Cambridge University Caving Club Expedition Handbook. 2001 Edition
</title>
<title>Cambridge University Caving Club Expedition Handbook. 2001 Edition</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
@ -71,7 +70,7 @@ wasted in the past through inadequate recording. It isn't very much extra work,
<dd>Description of seting up and putting away the Solar Powered battery charging system at the stonebridge</dd>
<dt><a href="update.htm">Updating the website</a></dt>
<dd>This tells you how to use CVS to download and update the master copy of the
<dd>This tells you how to use HG to download and update the master copy of the
website.</dd>
<dt><a href="stool.htm">On a matter of stooling</a></dt>
@ -102,14 +101,5 @@ wasted in the past through inadequate recording. It isn't very much extra work,
<hr />
<ul id="links">
<li><a href="../infodx.htm">Index to info/topics pages</a></li>
<li><a href="../indxal.htm">Full Index to area 1623</a></li>
<li><a href="../areas.htm">Area/subarea descriptions</a>
<ul><li> <a href="../1626/index.html">Adjacent area 1626</a></li> </ul>
</li>
<li> <a href="../index.htm">Back to Expedition Intro page</a></li>
<li> <a href="../../index.htm">Back to CUCC Home page</a></li>
</ul>
</body>
</html>

61
handbook/update.htm
View File

@ -4,36 +4,37 @@
<title>CUCC Expedition Handbook: Updating the website</title>
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Updating the website - HOWTO</h1>
<p>Please refer to <a href="http://www.srcf.ucam.org/caving/wiki/Expo_website_manual" target="_blank">the latest web updating guide in CUCC website</a></p>
<hr />
<p>DExpo data is kept in a number of different locations.</p>
<dl> <dt>Loser</dt> <dd>Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser</dd> <dt>Expoweb</dt> <dd>Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb</dd> <dt>Tunnel data</dt> <dd>Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata</dd> <dt>Troggle</dt> <dd>Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle</dd> <dt>Scanned notes</dt> <dd>Scans of survey notes and drawn up surveys. Can be got via rsync.</dd> </dl>
<p>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.</p>
<p>If you run windows, you are recommended to install <a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>, which nicely interfaces with windows explorer.</p>
<h2>Get the repositories</h2>
<h3>Mercurial</h3>
<h4>Linux</h4>
<p>hg clone RepositoryURL</p>
<h4>Windows</h4>
<p>Install<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>. In windows explorer right click, select Tortoise Hg .. and click Clone repository. <br />Set the source path to RepositoryURL <br />Set the destination to somewhere on your local harddisk. <br />Press clone.</p>
<h3>RSync</h3>
<h4>Linux</h4>
<p>rsync -av expoimages expo@seagrass.goatchurch.org.uk:</p>
<h4>Windows</h4>
<p>Not sure yet</p>
<h2>The website conventions bit</h2>
<p>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.</p>
<p>... and it's not written yet, either :-)</p>
<ul>
<li>Structure</li>
<li>Info for each cave &ndash; automatically generated by <tt>make-indxal4.pl</tt></li>
<li>Contents lists &amp; relative links for multi-article publications like journals. Complicated by expo articles being in a separate hierarchy.</li>
<li>Translations</li>
<li>Other people's work - the noinfo hierarchy.</li>
<li>Style guide for writing cave descriptions: correct use of boldface (<em>once</em> 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.) </li>
</ul>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Updating the website - HOWTO</h1>
<p>Simple <a href = "checkin.htm">instructions</a> for updating website</p>
<p>Please refer to <a href="http://www.srcf.ucam.org/caving/wiki/Expo_website_manual" target="_blank">the latest web updating guide in CUCC website</a></p>
<hr />
<p>DExpo data is kept in a number of different locations.</p>
<dl> <dt>Loser</dt> <dd>Contains the survex data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/loser</dd> <dt>Expoweb</dt> <dd>Contains the current website. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/expoweb</dd> <dt>Tunnel data</dt> <dd>Contains the tunnel data. Mercurial repository ssh://expo@seagrass.goatchurch.org.uk/tunneldata</dd> <dt>Troggle</dt> <dd>Contains the unfinished Django based website. Mercurial repository https://goatchurch@troggle.googlecode.com/hg/ troggle</dd> <dt>Scanned notes</dt> <dd>Scans of survey notes and drawn up surveys. Can be got via rsync.</dd> </dl>
<p>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.</p>
<p>If you run windows, you are recommended to install <a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>, which nicely interfaces with windows explorer.</p>
<h2>Get the repositories</h2>
<h3>Mercurial</h3>
<h4>Linux</h4>
<p>hg clone RepositoryURL</p>
<h4>Windows</h4>
<p>Install<a href="http://bitbucket.org/tortoisehg/stable/wiki/Home">Tortoise Hg</a>. In windows explorer right click, select Tortoise Hg .. and click Clone repository. <br />Set the source path to RepositoryURL <br />Set the destination to somewhere on your local harddisk. <br />Press clone.</p>
<h3>RSync</h3>
<h4>Linux</h4>
<p>rsync -av expoimages expo@seagrass.goatchurch.org.uk:</p>
<h4>Windows</h4>
<p>Not sure yet</p>
<h2>The website conventions bit</h2>
<p>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.</p>
<p>... and it's not written yet, either :-)</p>
<ul>
<li>Structure</li>
<li>Info for each cave &ndash; automatically generated by <tt>make-indxal4.pl</tt></li>
<li>Contents lists &amp; relative links for multi-article publications like journals. Complicated by expo articles being in a separate hierarchy.</li>
<li>Translations</li>
<li>Other people's work - the noinfo hierarchy.</li>
<li>Style guide for writing cave descriptions: correct use of boldface (<em>once</em> 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.) </li>
</ul>
<hr />
</body>
</html>