Index: documentation/trunk/tutorials/processing/xml-to-index.xsl
===================================================================
--- documentation/trunk/tutorials/processing/xml-to-index.xsl	(revision 14545)
+++ documentation/trunk/tutorials/processing/xml-to-index.xsl	(revision 17494)
@@ -6,6 +6,6 @@
   <xsl:include href="common.xsl"/>
 
-    <!-- set mode to cd/web/wiki depending on where the files will end up -->
-  <xsl:variable name="mode">cd</xsl:variable>
+  <!-- set mode to cd/web/wiki depending on where the files will end up -->
+  <xsl:variable name="mode">wiki</xsl:variable>
 
   <xsl:template match="TutorialList">
@@ -24,4 +24,7 @@
 	  <xsl:apply-templates select="Tutorial[not(@hidden)]"/>
 	</dl>
+	
+	<hr/><div style="text-align:center;"><xsl:apply-templates select="/TutorialList/SupplementaryText/Text[@id='copyright']"/></div>
+	
       </body>
     </html>
Index: documentation/trunk/tutorials/processing/xml-to-many-html.xsl
===================================================================
--- documentation/trunk/tutorials/processing/xml-to-many-html.xsl	(revision 14545)
+++ documentation/trunk/tutorials/processing/xml-to-many-html.xsl	(revision 17494)
@@ -7,5 +7,5 @@
   <xsl:output method="html"/>
   <!-- set mode to cd/web/wiki depending on where the files will end up -->
-  <xsl:variable name="mode">web</xsl:variable>
+  <xsl:variable name="mode">wiki</xsl:variable>
   
   <xsl:template match="Tutorial">
@@ -25,4 +25,7 @@
 	<h2><xsl:apply-templates select="Title/Text"/></h2>
 	<xsl:apply-templates select="Content/*"/>
+	
+	<hr/><div style="text-align:center;"><xsl:apply-templates select="/TutorialList/SupplementaryText/Text[@id='copyright']"/></div>
+	
       </body>
     </html>
Index: documentation/trunk/tutorials/processing/xml-to-one-html.xsl
===================================================================
--- documentation/trunk/tutorials/processing/xml-to-one-html.xsl	(revision 14545)
+++ documentation/trunk/tutorials/processing/xml-to-one-html.xsl	(revision 17494)
@@ -6,5 +6,5 @@
   <xsl:output method="html"/>
   <!-- set mode to cd/web depending on where the files will end up -->
-  <xsl:variable name="mode">web</xsl:variable>
+  <xsl:variable name="mode">wiki</xsl:variable>
 
   <xsl:template match="TutorialList">
@@ -22,4 +22,6 @@
 	</dl>
 	<xsl:apply-templates select="Tutorial[not(@hidden)]"/>
+	
+	<hr/><div style="text-align:center;"><xsl:apply-templates select="SupplementaryText/Text[@id='copyright']"/></div>
       </body>
     </html>
@@ -35,4 +37,5 @@
 
   <xsl:template match="Tutorial">
+    <div style="page-break-before: always;">
     <a name="{@id}"/>
     <h2><xsl:apply-templates select="Title/Text"/></h2>
@@ -42,14 +45,17 @@
       </xsl:call-template>
     </div>
-    <xsl:apply-templates select="Content/*"/>
+    <xsl:apply-templates select="Content/*"/>    
     <br/>
     <br/>
+    </div>
   </xsl:template>
 
   <xsl:template name="supplementary">
     <xsl:param name="mode">web</xsl:param>
+    <!--
     <xsl:call-template name="IndexLink">
       <xsl:with-param name="mode">combined</xsl:with-param>
     </xsl:call-template>
+    -->
     <xsl:apply-templates select="Prerequisite" mode="combined"/>
     <xsl:if test="SampleFiles">
Index: documentation/trunk/tutorials/processing/xml-to-one-workshop.xsl
===================================================================
--- documentation/trunk/tutorials/processing/xml-to-one-workshop.xsl	(revision 14545)
+++ documentation/trunk/tutorials/processing/xml-to-one-workshop.xsl	(revision 17494)
@@ -26,10 +26,15 @@
 	<xsl:apply-templates select="$manifest/Section" mode="index"/>
 	<xsl:apply-templates select="$manifest/Section"/>
+	
+	<div style="text-align:center;"><xsl:apply-templates select="/TutorialList/SupplementaryText/Text[@id='copyright']"/></div>
+	
       </body>
     </html>
-  </xsl:template>
+  </xsl:template>  
+  
   
   <xsl:template match="Section" mode="index">
     <xsl:variable name="secnum" select="@number"/>
+    <div style="page-break-after: always;">    
     <h2><a href="#{@id}"><xsl:value-of select="Heading"/></a></h2>
     <xsl:for-each select="TutorialRef|SplitTutorialRef">
@@ -39,10 +44,16 @@
 	<xsl:if test="self::TutorialRef">
 	  <xsl:apply-templates select="$tutorial/Tutorial[@id=$id]" mode="index">
-	    <xsl:with-param name="number"><xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/></xsl:with-param>
+	    <xsl:with-param name="number">
+              <xsl:value-of select="$pos"/>
+              <!--<xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/>-->
+            </xsl:with-param>
 	  </xsl:apply-templates>
 	</xsl:if>
 	<xsl:if test="self::SplitTutorialRef">
 	  <xsl:apply-templates select="$tutorial/Tutorial[@id=$id]" mode="splitindex">
-	    <xsl:with-param name="number"><xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/></xsl:with-param>
+	    <xsl:with-param name="number">
+              <xsl:value-of select="$pos"/>
+              <!--<xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/>-->
+            </xsl:with-param>
 	    <xsl:with-param name="split" select="@split"/>
 	    <xsl:with-param name="type" select="@type"/>
@@ -53,4 +64,5 @@
       </dl>
     </xsl:for-each>
+    </div>
   </xsl:template>
   
@@ -64,10 +76,18 @@
       <xsl:if test="self::TutorialRef">
 	<xsl:apply-templates select="$tutorial/Tutorial[@id=$id]">
-	  <xsl:with-param name="number"><xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/></xsl:with-param>
+          <xsl:with-param name="number">
+            <!-- for just one section -->
+            <xsl:value-of select="$pos"/>
+            <!-- for more than one sections -->
+	   <!--<xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/>-->
+          </xsl:with-param>
 	</xsl:apply-templates>
       </xsl:if>
       <xsl:if test="self::SplitTutorialRef">
 	<xsl:apply-templates select="$tutorial/Tutorial[@id=$id]" mode="split">
-	  <xsl:with-param name="number"><xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/></xsl:with-param>
+	  <xsl:with-param name="number">
+            <xsl:value-of select="$pos"/>
+            <!--<xsl:value-of select="$secnum"/>.<xsl:value-of select="$pos"/>-->
+          </xsl:with-param>
 	  <xsl:with-param name="split" select="@split"/>
 	  <xsl:with-param name="type" select="@type"/>
@@ -81,8 +101,10 @@
   </xsl:template>
   
-  <xsl:template match="Tutorial">
+  <xsl:template match="Tutorial">    
     <xsl:param name="number"/>
+    <div style="page-break-after: always;">
     <h2><xsl:value-of select="$number"/>. <xsl:apply-templates select="Title/Text"/></h2>
     <xsl:apply-templates select="Content/*"/>
+    </div>
   </xsl:template>
 
@@ -104,4 +126,6 @@
     <xsl:param name="beginnotes"/>
     <xsl:param name="endnotes"/>
+    
+    <div style="page-break-after: always;">
     <h2><xsl:value-of select="$number"/>. <xsl:apply-templates select="Title/Text"/><xsl:value-of select="$titleextra"/></h2>
     <xsl:apply-templates select="$beginnotes"/>
@@ -121,4 +145,5 @@
     </xsl:if>
     <xsl:apply-templates select="$endnotes"/>
+    </div>
   </xsl:template>
 
Index: documentation/trunk/tutorials/xml-source/tutorial_en.xml
===================================================================
--- documentation/trunk/tutorials/xml-source/tutorial_en.xml	(revision 14545)
+++ documentation/trunk/tutorials/xml-source/tutorial_en.xml	(revision 17494)
@@ -3,11 +3,12 @@
      <!ENTITY nbsp "&#160;">
      <!ENTITY rarr "&#8594;">
-     <!ENTITY mdash "&#8212;">
+     <!ENTITY mdash "&#8212;">  
+     <!ENTITY copy "&#169;">   
 ]>
 <TutorialList>
 <Title>
-<Text id="0001">Greenstone tutorial exercises (October 2006)</Text>
+<Text id="0001">Greenstone tutorial exercises (March 2008)</Text>
 </Title>
-<Version current="2.71"/>
+<Version current="2.80"/>
 <SupplementaryText>
 <Text id="title">Greenstone tutorial exercise</Text>
@@ -19,4 +20,5 @@
 <Text id="wiki">Back to wiki</Text>
 <Text id="print">Print version</Text>
+<Text id="copyright">Copyright &copy; 2005 2006 2007 2008 by the <Link url="http://www.nzdl.org">New Zealand Digital Library Project</Link> at <Link url="http://www.waikato.ac.nz">the University of Waikato</Link>, New Zealand<br/>Permission is granted to copy, distribute and/or modify this document under the terms of the <Link url="http://www.gnu.org/licenses/fdl.html">GNU Free Documentation License</Link>, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled <Link url="http://greenstonewiki.cs.waikato.ac.nz/wiki/gsdoc/GNUFDL.html">âGNU Free Documentation License.â</Link></Text>
 </SupplementaryText>
 <Comment>
@@ -39,7 +41,7 @@
 </Heading>
 <NumberedItem>
-<Text id="0085">On inserting the <b>UNAIDS CD-ROM</b>, for many computers installation will begin automatically. If not, "auto-run"&mdash;a configurable setting under Windows&mdash;is disabled on your computer and you need to double-click <i>setup.exe</i> on the CD-ROM.</Text>
+<Text id="0085">On inserting the <b>UNAIDS CD-ROM</b>, for many computers installation will begin automatically. If not, "auto-run"&mdash;a configurable setting under Windows&mdash;is disabled on your computer and you need to double-click <i>Setup.exe</i> on the CD-ROM.</Text>
 <Menu>
-<Text id="0086">My Computer &rarr; UNAIDS20 &rarr; setup.exe</Text>
+<Text id="0086">My Computer &rarr; UNAIDS20 &rarr; Setup.exe</Text>
 </Menu>
 </NumberedItem>
@@ -374,5 +376,5 @@
 <Text id="0193">Installing Greenstone</Text>
 </Title>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Heading>
@@ -446,5 +448,5 @@
 </Bullet>
 <Bullet>
-<Text id="0223">"Welcome to the ImageMagick Setup Wizard Click &lt;<b>Next</b>&gt;</Text>
+<Text id="0223">"Welcome to the ImageMagick Setup Wizard Click &lt;<b>Next</b>&gt;"</Text>
 </Bullet>
 <Bullet>
@@ -485,5 +487,5 @@
 </Title>
 <Prerequisite id="install_greenstone"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -589,9 +591,9 @@
 <Text id="0253">Building a small collection of HTML files</Text>
 </Title>
-<SampleFiles folder="hobbits"/>
-<Version initial="2.60" current="2.71"/>
+<SampleFiles folder="simple_html"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
-<Text id="0254">You will need some HTML files, such as those in the <Path>hobbits</Path> folder in <Path>sample_files</Path>.</Text>
+<Text id="0254">You will need some HTML files, such as those in the <Path>simple_html</Path> folder in <Path>sample_files</Path>.</Text>
 </Comment>
 <Heading>
@@ -601,5 +603,5 @@
 <Text id="0255">Start the Greenstone Librarian Interface:</Text>
 <Menu>
-<Text id="0255a">Start &rarr; All Programs &rarr; Greenstone Digital Library Software v2.71 &rarr; Greenstone Librarian Interface</Text>
+<Text id="0255a">Start &rarr; All Programs &rarr; Greenstone Digital Library Software v2.74 &rarr; Greenstone Librarian Interface</Text>
 </Menu> 
 <Comment>
@@ -615,14 +617,14 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0260">You will create a collection based on a few HTML web pages that describe some Hobbits in <i>Lord of the Rings</i>.</Text>
+<Text id="0260">You will create a collection based on a few HTML web pages from the Tudor collection.</Text>
 <Text id="0261">A window pops up. Fill it out with appropriate values&mdash;for example,</Text>
 <Indent>
-<Text id="0261a"><AutoText key="glidict::CDM.General.Collection_Name"/> About Hobbits<br/></Text>
-<Text id="0261b"><AutoText key="glidict::NewCollectionPrompt.Collection_Description"/> A collection about hobbits.</Text>
+<Text id="0261a"><AutoText key="glidict::CDM.General.Collection_Name"/> Small HTML Collection<br/></Text>
+<Text id="0261b"><AutoText key="glidict::NewCollectionPrompt.Collection_Description"/> A small collection of HTML pages.</Text>
 </Indent>
 <Text id="0262">Leave the setting for <AutoText key="glidict::NewCollectionPrompt.Base_Collection"/> at its default: <AutoText key="glidict::NewCollectionPrompt.NewCollection"/>, and click <AutoText key="glidict::General.OK" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
-<Text id="0264">Next you must gather together the files that will constitute the collection. A suitable set has been prepared ahead of time in <Path>sample_files &rarr; hobbits</Path>. Using the left-hand side of the Librarian Interface's <AutoText key="glidict::GUI.Gather"/> panel, interactively navigate to the <Path>sample_files</Path> folder.</Text>
+<Text id="0264">Next you must gather together the files that will constitute the collection. A suitable set has been prepared ahead of time in <Path>sample_files &rarr; simple_html</Path>. Using the left-hand side of the Librarian Interface's <AutoText key="glidict::GUI.Gather"/> panel, interactively navigate to the <Path>sample_files</Path> folder.</Text>
 </NumberedItem>
 <Heading>
@@ -630,5 +632,5 @@
 </Heading>
 <NumberedItem>
-<Text id="0265">Now drag the <Path>hobbits</Path> folder from the left-hand side and drop it on the right. The progress bar at the bottom shows some activity. Gradually, duplicates of all the files will appear in the collection panel.</Text>
+<Text id="0265">Now drag the <Path>simple_html</Path> folder from the left-hand side and drop it on the right. The progress bar at the bottom shows some activity. Gradually, duplicates of all the files will appear in the collection panel.</Text>
 <Comment>
 <Text id="0266">You can inspect the files that have been copied by double-clicking on the folder in the right-hand side.</Text>
@@ -648,5 +650,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0270">Click the <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/> button to look at the end result. This loads the relevant page into your web browser (starting it up if necessary). Look around the collection and learn about Hobbits!</Text>
+<Text id="0270">Click the <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/> button to look at the end result. This loads the relevant page into your web browser (starting it up if necessary).</Text>
 </NumberedItem>
 <Heading>
@@ -657,5 +659,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0272">Presently there is no manually assigned metadata, but the act of building the collection has extracted metadata from the documents. Double click the <Path>hobbits</Path> folder to expand its content. Then single-click <Path>bilbo.html</Path> to display all its metadata in the right-hand side of the panel. The initial fields, starting <AutoText text="dc." type="quoted"/>, are empty. These are Dublin Core metadata fields for manually entered data.</Text>
+<Text id="0272">Presently there is no manually assigned metadata, but the act of building the collection has extracted metadata from the documents. Double click the <Path>simple_html</Path> folder to expand its content. Then single-click <Path>aragon.html</Path> to display all its metadata in the right-hand side of the panel. The initial fields, starting <AutoText text="dc." type="quoted"/>, are empty. These are Dublin Core metadata fields for manually entered data.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -666,4 +668,12 @@
 </NumberedItem>
 <Heading>
+<Text id="0275">Viewing the internal links and external links</Text>
+</Heading>
+<NumberedItem>
+<Text id="0275a">Hyperlinks in a Greenstone collection work like this. If the link is to a document that is also in the collection, clicking it takes you to that document in the collection. If the link is to a document that is <i>not</i> in the collection, clicking it takes you to that document on the web.</Text>
+<Text id="0257b">Open <Path>boleyn.html</Path> and look for the link to <Path>Katharine of Aragon</Path> (in the 5th paragraph of the <Path>Biography</Path> section). This links to a document inside the collection--<Path>aragon.html</Path>. View this document by clicking the link.  For an external link, click <Path>letters written by Katharine</Path> (in the <Path>Primary Sources</Path> section). This takes you out on to the web. (A warning message is displayed first. You can also get rid of the warning by add <Format>cgiarg shortname=el argdefault=direct
+</Format> in the <Path>Greenstone &rarr; etc &rarr; main.cfg</Path> file)</Text>
+</NumberedItem>
+<Heading> 
 <Text id="0277">Setting up a shortcut in the Librarian interface</Text>
 </Heading>
@@ -678,5 +688,5 @@
 </Title>
 <SampleFiles folder="images"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <NumberedItem>
@@ -700,20 +710,4 @@
 <NumberedItem>
 <Text id="0345">Back in the Librarian Interface, change to the <AutoText key="glidict::GUI.Enrich"/> panel and view the extracted metadata for <Path>Bear.jpg</Path>.</Text>
-</NumberedItem>
-<Heading>
-<Text id="0347">Adding a metadata set to the collection</Text>
-</Heading>
-<Comment>
-<Text id="0346">We now add our own metadata and use it to give users a new way to browse the collection. We use the Dublin Core metadata set.</Text>
-</Comment>
-<NumberedItem>
-<Text id="0348">The collection (image-e) on which <b>backdrop</b> is based uses only extracted metadata. To add another metadata set, go to the <AutoText key="glidict::GUI.Enrich"/> panel of the Librarian Interface and click the <AutoText key="glidict::EnrichPane.ManageMetadataSets" type="button"/> button underneath the file tree. </Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0349a">The window that pops up shows the metadata sets currently used by the collection. To add a new one, click <AutoText key="glidict::MetadataSetDialog.Add" type="button"/>.</Text>
-<Text id="0349b">In the window that pops up, select the Dublin Core metadata set from the list of available sets, and click <AutoText key="glidict::MetadataSetDialog.Add_Set" type="button"/>. Close the <AutoText key="glidict::MetadataSetDialog.Title"/> dialog by clicking <AutoText key="glidict::General.Close" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0351">In the <AutoText key="glidict::GUI.Enrich"/> panel, the metadata for each file now shows the (empty) Dublin Core <AutoText text="dc."/> fields as well as the extracted <AutoText text="ex."/> fields.</Text>
 </NumberedItem>
 <Heading>
@@ -765,5 +759,5 @@
 </Comment>
 <Comment>
-<Text id="0364">Changes in the <AutoText key="glidict::GUI.Format"/> panel take place immediately and you can see the result straightaway by clicking <b>reload</b> (or <b>refresh</b>) in the web browser. If you modify anything in the <AutoText key="glidict::GUI.Gather"/>, <AutoText key="glidict::GUI.Enrich"/> or <AutoText key="glidict::GUI.Design"/> panels, you will need to rebuild the collection.</Text>
+<Text id="0364">Changes in the <AutoText key="glidict::GUI.Format"/> panel take place immediately and you can see the result straightaway by clicking the <AutoText key="glidict::CreatePane.Preview_Collection"/>. If you modify anything in the <AutoText key="glidict::GUI.Gather"/>, <AutoText key="glidict::GUI.Enrich"/> or <AutoText key="glidict::GUI.Design"/> panels, you will need to rebuild the collection.</Text>
 </Comment>
 <Heading>
@@ -813,5 +807,5 @@
 </Title>
 <SampleFiles folder="Word_and_PDF"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -822,5 +816,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0282">Copy all the files from <Path>sample_files &rarr; Word_and_PDF &rarr; Documents</Path> into the collection. You can select multiple files by clicking on the first one and shift-clicking on the last one, and drag them all across together. (This is the normal technique of multiple selection.)</Text>
+<Text id="0282">Copy all the .doc, .rtf, .pdf and .ps files from <Path>sample_files &rarr; Word_and_PDF &rarr; Documents</Path> into the collection. There are 10 files in all: you can select multiple files by clicking on the first one and shift-clicking on the last one, and drag them all across together. (This is the normal technique of multiple selection.)</Text>
 </NumberedItem>
 <NumberedItem>
@@ -840,5 +834,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0289c">The extracted Title metadata for some documents is incorrect. For example, the Titles for <Path>pdf01.pdf</Path> and <Path>word03.doc</Path> (the same document in different formats) have missed out the second line. The Title for <Path>pdf03.pdf</Path> has the wrong text altogether. The PostScript documents (<Path>cluster.ps</Path> and <Path>langmodl.ps</Path> do not have extracted titles: what appears in the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list is just the first few characters of the document).</Text>
+<Text id="0289c">The extracted Title metadata for some documents is incorrect. For example, the Titles for <Path>pdf01.pdf</Path> and <Path>word03.doc</Path> (the same document in different formats) have missed out the second line. The Title for <Path>pdf03.pdf</Path> has the wrong text altogether.</Text>
 </NumberedItem>
 <Heading>
@@ -867,5 +861,5 @@
 </Heading>
 <NumberedItem>
-<Text id="0304">In the Librarian Interface, look at the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, by clicking on this in the list to the left. Here you can add, configure or remove plugins to be used in the collection. There is no need to remove any plugins, but it will speed up processing a little. In this case we have only Word, PDF, RTF, and PostScript documents, and can remove the <AutoText text="ZIPPlug"/>, <AutoText text="TEXTPlug"/>, <AutoText text="HTMLPlug"/>, <AutoText text="EMAILPlug"/>, <AutoText text="ImagePlug"/>, <AutoText text="ISISPlug"/> and <AutoText text="NULPlug"/> plugins. To delete a plugin, select it and click <AutoText key="glidict::CDM.PlugInManager.Remove" type="button"/>. <AutoText text="GAPlug"/> is required for any type of source collection and should not be removed. </Text>
+<Text id="0304">In the Librarian Interface, look at the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, by clicking on this in the list to the left. Here you can add, configure or remove plugins to be used in the collection. There is no need to remove any plugins, but it will speed up processing a little. In this case we have only Word, PDF, RTF, and PostScript documents, and can remove the <AutoText text="ZIPPlug"/>, <AutoText text="TEXTPlug"/>, <AutoText text="HTMLPlug"/>, <AutoText text="EMAILPlug"/>, <AutoText text="ImagePlug"/>, <AutoText text="ISISPlug"/> and <AutoText text="NULPlug"/> plugins. To delete a plugin, select it and click <AutoText key="glidict::CDM.PlugInManager.Remove" type="button"/>. <AutoText text="GAPlug"/> and <AutoText text="MetadataXMLPlug"/> are required for any type of source collection and should not be removed. </Text>
 </NumberedItem>
 <Heading>
@@ -881,7 +875,4 @@
 <Text id="0312">You can add indexes based on any metadata. Add a new index based on <AutoText key="metadata::dc.Creator"/> by clicking <AutoText key="glidict::CDM.IndexManager.New_Index" type="button"/>. Select <AutoText key="metadata::dc.Creator"/> in the list of metadata, and click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>.</Text>
 </NumberedItem>
-<Comment>
-<Text id="0313">The next section is <AutoText key="glidict::CDM.GUI.Subcollections"/>. In this exercise, we will not make any changes to this.</Text>
-</Comment>
 <Heading>
 <Text id="0314">Browsing classifiers</Text>
@@ -902,5 +893,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0321">Check that all the facilities work properly. There should be three full-text indexes, called <i>text</i>, <i>dc.Title,ex.Title</i>, and <i>dc.Creator</i>. The <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list should display all the documents to which you have assigned <AutoText key="metadata::dc.Title"/> metadata (and only those documents). The <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list should show one bookshelf for each author you have assigned as <AutoText key="metadata::dc.Creator"/>, and clicking on that bookshelf should take you to all the documents they authored.</Text>
+<Text id="0321">Check that all the facilities work properly. There should be three full-text indexes, called <i>text</i>, <i>dc.Title</i>, and <i>dc.Creator</i>. The <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list should display all the documents to which you have assigned <AutoText key="metadata::dc.Title"/> metadata (and only those documents). The <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list should show one bookshelf for each author you have assigned as <AutoText key="metadata::dc.Creator"/>, and clicking on that bookshelf should take you to all the documents they authored.</Text>
 </NumberedItem>
 <Heading>
@@ -930,5 +921,110 @@
 <NumberedItem>
 <Text id="0321d-1">If you have already done the <TutorialRef id="enhanced_word"/> exercise, some of the documents will have extracted ex.Creator metadata, and some will have dc.Creator. To use both of these in the Creators classifier, make a similar change to the <AutoText text="AZCompactList"/>: make the <AutoText text="metadata"/> field read <Format><AutoText key="metadata::dc.Creator" type="plain"/><AutoText text=",ex.Creator" type="plain"/></Format>.</Text>
-<Text id="0321d-2">You may notice that <AutoText text="AZCompactList"/> has two options after the <AutoText text="metadata"/> option: <AutoText text="firstvalueonly"/> and <AutoText text="allvalues"/>. Manually added metadata can be used to replace or enhance automatically extracted metadata, and these options control exactly which pieces of metadata a document is classified by.</Text>
+<Text id="0321e"><b>Build</b> the collection again and <b>preview</b> it. Now all of the documents should appear in the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list (and extracted Creators should appear in the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list).</Text>
+</NumberedItem>
+<Comment>
+<Text id="0321d-2">We will play around with the format statements and customize the outlook of this collection in the <TutorialRef id="formatting_word_pdf"/> exercise.</Text>
+</Comment>
+</Content>
+</Tutorial>
+<Tutorial id="formatting_word_pdf">
+<Title>
+<Text id="fw-1">Formatting the Word and PDF collection</Text>
+</Title>
+<Prerequisite id="word_pdf_collection"/>
+<Version initial="2.70w" current="2.80"/>
+<Content>
+<Comment>
+<Text id="fw-1a">In this exercise, we play around with the format statements in the Word and PDF collection.</Text>
+</Comment>
+<NumberedItem>
+<Text id="fw-2">Open the <b>reports</b> collection in the Librarian Interface and go to the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel.</Text>
+</NumberedItem>
+<Heading>
+<Text id="fw-2a">Tidying up the default format statement</Text>
+</Heading>
+<NumberedItem>
+<Text id="fw-3a">In this part of the exercise, we make the format statement simpler without changing the resulting display.</Text>
+<Text id="fw-3">Greenstone's default format statement is complex because it is designed to produce something reasonable under almost any conditions, and also because for practical reasons it needs to be backwards compatible with legacy collections. For this collection, we don't need all of the complexity.</Text>
+<Text id="fw-3a-1">Make sure that the <AutoText text="VList"/> format statement is selected in the list of formats.</Text>
+<Text id="fw-4">The default <AutoText text="VList"/> format statement looks like the following:</Text>
+<Format>
+&lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
+&lt;td valign="top"&gt;[ex.srclink]<highlight>{Or}{[ex.thumbicon],[ex.srcicon]}</highlight>[ex./srclink]&lt;/td&gt;<br/>
+&lt;td valign="top"&gt;[highlight]<br/>
+{Or}{[dc.Title],<highlight>[exp.Title]</highlight>,[ex.Title],Untitled}<br/>
+[/highlight]{If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;
+</Format>
+<Text id="fw-5">This format statement is the default used for any vertical list, such as search results, classifiers, and document table of contents.</Text>
+<Text id="fw-6"><Format>{Or}{[ex.thumbicon],[ex.srcicon]}</Format> chooses <i>ex.thumbicon</i> metadata if its there, otherwise chooses <i>ex.srcicon</i> metadata. If neither are present, nothing is displayed. For this collection there is no <i>ex.thumbicon</i> metadata so the choice is not needed.</Text>
+<Text id="fw-7">Replace <Format>{Or}{[ex.thumbicon],[ex.srcicon]}</Format> (highlighted above) with <Format>[ex.srcicon]</Format>.  </Text>
+<Text id="fw-8">There is no <i>exp.Title</i> metadata, so remove that element from <Format>{Or}{[dc.Title],[exp.Title],[ex.Title],Untitled}</Format>.</Text>
+<Text id="fw-9">The resulting format statement looks like the following:</Text>
+<Format>
+&lt;td valign=top&gt;[link][icon][/link]&lt;/td&gt;<br/>
+&lt;td valign=top&gt;[ex.srclink][ex.srcicon][ex./srclink]&lt;/td&gt;<br/>
+&lt;td valign=top&gt;[highlight]<br/>
+{Or}{[dc.Title],[ex.Title],Untitled}
+[/highlight] {If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;<br/>
+</Format>
+<Text id="fw-10">Preview the collection to make sure the display hasn't changed. You shouldn't notice any difference when looking at search results, classifiers etc. </Text>
+</NumberedItem>
+<Heading>
+<Text id="fw-10a">Linking to Greenstone version or original version of documents</Text>
+</Heading>
+<NumberedItem>
+<Text id="fw-11">For collections with documents that undergo a conversion process during importing (e.g. Word, PDF, PowerPoint documents, but not text, HTML documents), the original file is stored in the collection along with the converted version. The default <AutoText text="VList"/> format statement links to both versions:</Text>
+<Text id="fw-12"><Format>[ex.link][icon][/ex.link]</Format> links to the Greenstone HTML version, while <Format>[ex.srclink][ex.srcicon][/ex.srclink]</Format> links to the original.</Text> 
+<Text id="fw-13">Choose <AutoText text="SearchVList"/> in <AutoText key="glidict::CDM.GUI.Formats"/> by selecting <AutoText text="Search"/> from the <AutoText key="glidict::CDM.FormatManager.Feature"/> drop down list, and <AutoText text="VList"/> from the <AutoText key="glidict::CDM.FormatManager.Part"/> list. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add the <AutoText text="SearchVList"/> format statement into the list of assigned formats. Experiment with removing either of the two links from the format statement.</Text>
+<Text id="fw-13a">To see the results of your changes, preview the collection and do a search. You are making changes to <AutoText text="SearchVList"/>, which means the changes will only apply to search results.</Text>
+<Text id="fw-13b">Storing and displaying the original allows users to see the correct format, but requires the user to have the relevant program installed. It also increases the size of the collection. The Greenstone version can be viewed in a browser, but may not look as nice.</Text>
+</NumberedItem>
+<Heading>
+<Text id="fw-14a">Making bookshelves show how many items they contain</Text>
+</Heading>
+<NumberedItem>
+<Text id="fw-14">Next, we'll customize the format for the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list. Classifier bookshelves have only a few pieces of metadata to display: <Format>[ex.Title]</Format> and <Format>[numleafdocs]</Format>. Whatever metadata the classifier has been built on, the bookshelf label is always stored as <Format>[ex.Title]</Format>. This is why a Creator is printed out for each bookshelf even though <Format>[dc.Creator]</Format> is not specified in the format statement. <Format>[numleafdocs]</Format> is only defined for bookshelves, so this metadata can be used in an <Format>{If}</Format> statement to make bookshelves and documents display differently in the list.</Text> 
+<Text id="fw-15">Make each bookshelf in the Creator classifier show how many entries it contains. In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText text="CL2 AZCompactList"/> classifier which is based on <AutoText key="metadata::dc.Creator"/> metadata from the <AutoText key="glidict::CDM.FormatManager.Feature"/> drop down list, and <AutoText text="VList"/> from the <AutoText key="glidict::CDM.FormatManager.Part"/> list. Click the <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> button to add this format into the list of assigned formats. Note that it gets added as <AutoText text="CL2VList"/> in this list: it is the <AutoText text="VList"/> format for the second (<AutoText text="CL2"/>) classifier.</Text>
+<Text id="fw15a">Append the following text to the bottom of the format statement:</Text>
+<Format>
+{If}{[numleafdocs],&lt;td&gt;&lt;i&gt;([numleafdocs])&lt;/i&gt;&lt;/td&gt;}
+</Format>
+<Text id="fw-16"><b>Preview</b> the collection. Click on the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list and notice that the bookshelves now display how many documents they contain.</Text>
+<Text id="fw-17">This revised format statement has the effect of specifying in brackets how many items are contained within a bookshelf.  Since only bookshelves define <Format>[numleafdocs]</Format>, only they will display this. By modifying <AutoText text="CL2VList"/> instead of <AutoText text="VList"/>, the change will only apply to the second classifier (Creators).</Text>
+</NumberedItem>
+<Heading>
+<Text id="fw-17a">Displaying multi-valued metadata</Text>
+</Heading>
+<NumberedItem>
+<Text id="fw-18">Next we modify the document entries in the Creator classifier to display all authors. Back in <AutoText key="glidict::CDM.GUI.Formats"/>, select the <AutoText text="CL2VList"/> format in the list of assigned formats. After <Format>{If}{[ex.Source],&lt;br&gt;</Format> in the format statement, add <Format>[sibling:dc.Creator]</Format>.</Text>
+<Text id="fw-19"><Format>[ex.Source]</Format> is not defined for bookshelves, so can also be used to differentiate bookshelves and documents.</Text>
+<Text id="fw-20">The resulting format statement looks like:</Text>
+<Format>
+&lt;td valign=top&gt;[link][icon][/link]&lt;/td&gt;<br/>
+&lt;td valign=top&gt;[ex.srclink][ex.srcicon][ex./srclink]&lt;/td&gt;<br/>
+&lt;td valign=top&gt;[highlight]<br/>
+{Or}{[dc.Title],[ex.Title],Untitled}[/highlight]<br/> 
+<highlight>{If}{[ex.Source],&lt;br&gt;[sibling:dc.Creator]</highlight><br/>
+&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;<br/>
+{If}{[numleafdocs],&lt;td&gt;&lt;i&gt;([numleafdocs])&lt;/i&gt;&lt;/td&gt;}
+</Format>
+<Text id="fw-21">This will display the Greenstone link, the link to the original, then the Title. For bookshelves, it will also display how many documents the bookshelf contains. For documents, it will display all the Authors (Creators), and the source document. <Format>[sibling:dc.Creator]</Format> displays all the Creator metadata for the document, separated by a space (<AutoText text=" " type="quoted"/>), while <Format>[dc.Creator]</Format> displays only the first author. Preview the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list and make sure that all authors are displayed for documents.</Text>  
+</NumberedItem>
+<NumberedItem>
+<Text id="fw-22">You can change the separator between the authors. Modify the format statement, and replace <Format>[sibling:dc.Creator]</Format> with <Format>[sibling(All'&lt;br/&gt;'):dc.Creator]</Format>. This will add a new line after each author (<Format>&lt;br/&gt;</Format> specifies a line break in HTML). Preview the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list.</Text>
+<Text id="fw-23">If you have done exercise <TutorialRef id="enhanced_word"/>, the collection will have both dc.Creator and ex.Creator metadata. To display both, you can use </Text>
+<Format>
+[sibling:dc.Creator] [sibling:ex.Creator]
+</Format>
+<Text id="fw-23a">To display dc.Creator if it is present, otherwise display ex.Creator, use</Text>
+<Format>
+{Or}{[sibling:dc.Creator],[sibling:ex.Creator]}
+</Format>
+</NumberedItem>
+<Heading>
+<Text id="0321d-1">Advanced multi-valued metadata</Text>
+</Heading>
+<NumberedItem>
+<Text id="0321d-2">You may notice that the <AutoText text="AZCompactList"/> classifier has two options after the <AutoText text="metadata"/> option: <AutoText text="firstvalueonly"/> and <AutoText text="allvalues"/>. Manually added metadata can be used to replace or enhance automatically extracted metadata, and these options control exactly which pieces of metadata a document is classified by.</Text>
 <Text id="0321d-3">For example, say we have two documents. Document 1 has four Creators specified (dc.Creator = dcA, dc.Creator = dcB, ex.Creator = exA, ex.Creator = exB), while document 2 has three (ex.Creator = exA, ex.Creator = exB, ex.Creator = exC). The following table shows which metadata values each document is classified by, for the different classifier options:</Text>
 <table>
@@ -946,137 +1042,7 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0321e"><b>Build</b> the collection again and <b>preview</b> it. Now all of the documents should appear in the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list (and extracted Creators should appear in the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list).</Text>
-<Text id="0321f">Extracted metadata is unreliable. But it is very cheap! On the other hand, manually assigned metadata is reliable, but expensive. The previous section of this exercise has shown how to aim for the best of both worlds by using extracted metadata but correcting it when it is wrong. While this may not satisfy the professional librarian, it could provide a useful compromise for the music teacher who wants to get their collection together with a minimum of effort.</Text>
-</NumberedItem>
-<Heading>
-<Text id="0295">Branding a collection with an image</Text>
-</Heading>
-<NumberedItem>
-<Text id="0296">Switch back to the <AutoText key="glidict::GUI.Format"/> panel. The first section <AutoText key="glidict::CDM.GUI.General"/> appears. This allows you to modify the values you provided when defining the collection, if desired. You can also brand the collection using a suitable image.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0297">Click on the <AutoText key="glidict::General.Browse" type="button"/> button associated with <AutoText key="glidict::CDM.General.Icon_Collection"/>, and browse to the image <Path>sample_files &rarr; Word_and_PDF &rarr; wrdpdf.gif</Path> on your computer. When you select this image, Greenstone automatically generates an appropriate URL for the image. <b>Preview</b> the collection: you should see the new image at the top left of the page.</Text>
-</NumberedItem>
-</Content>
-</Tutorial>
-<Tutorial id="formatting_word_pdf">
-<Title>
-<Text id="fw-1">Formatting the Word and PDF collection</Text>
-</Title>
-<Prerequisite id="word_pdf_collection"/>
-<Version initial="2.70w" current="2.71"/>
-<Content>
-<Comment>
-<Text id="fw-1a">In this exercise, we play around with the format statements in the Word and PDF collection.</Text>
-</Comment>
-<NumberedItem>
-<Text id="fw-2">Open the <b>reports</b> collection in the Librarian Interface and go to the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel.</Text>
-</NumberedItem>
-<Heading>
-<Text id="fw-2a">Tidying up the default format statement</Text>
-</Heading>
-<NumberedItem>
-<Text id="fw-3a">In this part of the exercise, we make the format statement simpler without changing the resulting display.</Text>
-<Text id="fw-3">Greenstone's default format statement is complex because it is designed to produce something reasonable under almost any conditions, and also because for practical reasons it needs to be backwards compatible with legacy collections. For this collection, we don't need all of the complexity.</Text>
-<Text id="fw-3a-1">Make sure that the <AutoText text="VList"/> format statement is selected in the list of formats.</Text>
-<Text id="fw-4">The default <AutoText text="VList"/> format statement looks like the following:</Text>
-<Format>
-&lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
-&lt;td valign="top"&gt;[ex.srclink]{Or}{[ex.thumbicon],[ex.srcicon]}[ex./srclink]&lt;/td&gt;<br/>
-&lt;td valign="top"&gt;[highlight]<br/>
-{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}<br/>
-[/highlight]{If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;
-</Format>
-<Text id="fw-5">This format statement is the default used for any vertical list, such as search results, classifiers, and document table of contents.</Text>
-<Text id="fw-6"><Format>{Or}{[ex.thumbicon],[ex.srcicon]}</Format> chooses <i>ex.thumbicon</i> metadata if its there, otherwise chooses <i>ex.srcicon</i> metadata. If neither are present, nothing is displayed. For this collection there is no <i>ex.thumbicon</i> metadata so the choice is not needed.</Text>
-<Text id="fw-7">Replace <Format>{Or}{[ex.thumbicon],[ex.srcicon]}</Format> with <Format>[ex.srcicon]</Format>.  </Text>
-<Text id="fw-8">There is no <i>dls.Title</i> metadata, so remove that element from <Format>{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}</Format>.</Text>
-<Text id="fw-9">The resulting format statement looks like the following:</Text>
-<Format>
-&lt;td valign=top&gt;[link][icon][/link]&lt;/td&gt;<br/>
-&lt;td valign=top&gt;[ex.srclink][ex.srcicon][ex./srclink]&lt;/td&gt;<br/>
-&lt;td valign=top&gt;[highlight]<br/>
-{Or}{[dc.Title],[ex.Title],Untitled}[/highlight] {If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;<br/>
-</Format>
-<Text id="fw-10">Preview the collection to make sure the display hasn't changed. You shouldn't notice any difference when looking at search results, classifiers etc. </Text>
-</NumberedItem>
-<Heading>
-<Text id="fw-10a">Linking to Greenstone version or original version of documents</Text>
-</Heading>
-<NumberedItem>
-<Text id="fw-11">For collections with documents that undergo a conversion process during importing (e.g. Word, PDF, PowerPoint documents, but not text, HTML documents), the original file is stored in the collection along with the converted version. The default <AutoText text="VList"/> format statement links to both versions:</Text>
-<Text id="fw-12"><Format>[link][icon][/link]</Format> links to the Greenstone HTML version, while <Format>[srclink][srcicon][/srclink]</Format> links to the original.</Text> 
-<Text id="fw-13">Choose <AutoText text="SearchVList"/> in <AutoText key="glidict::CDM.GUI.Formats"/> by selecting <AutoText text="Search"/> from the <AutoText key="glidict::CDM.FormatManager.Feature"/> drop down list, and <AutoText text="VList"/> from the <AutoText key="glidict::CDM.FormatManager.Part"/> list. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add the <AutoText text="SearchVList"/> format statement into the list of assigned formats. Experiment with removing either of the two links from the format statement.</Text>
-<Text id="fw-13a">To see the results of your changes, preview the collection and do a search. You are making changes to <AutoText text="SearchVList"/>, which means the changes will only apply to search results.</Text>
-<Text id="fw-13b">Storing and displaying the original allows users to see the correct format, but requires the user to have the relevant program installed. It also increases the size of the collection. The Greenstone version can be viewed in a browser, but may not look as nice.</Text>
-</NumberedItem>
-<Heading>
-<Text id="fw-14a">Making bookshelves show how many items they contain</Text>
-</Heading>
-<NumberedItem>
-<Text id="fw-14">Next, we'll customize the format for the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list. Classifier bookshelves have only a few pieces of metadata to display: <Format>[ex.Title]</Format> and <Format>[numleafdocs]</Format>. Whatever metadata the classifier has been built on, the bookshelf label is always stored as <Format>[ex.Title]</Format>. This is why a Creator is printed out for each bookshelf even though <Format>[dc.Creator]</Format> is not specified in the format statement. <Format>[numleafdocs]</Format> is only defined for bookshelves, so this metadata can be used in an <Format>{If}</Format> statement to make bookshelves and documents display differently in the list.</Text> 
-<Text id="fw-15">Make each bookshelf in the Creator classifier show how many entries it contains. In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText text="CL2 AZCompactList"/> classifier which is based on <AutoText key="metadata::dc.Creator"/> metadata from the <AutoText key="glidict::CDM.FormatManager.Feature"/> drop down list, and <AutoText text="VList"/> from the <AutoText key="glidict::CDM.FormatManager.Part"/> list. Click the <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> button to add this format into the list of assigned formats. Note that it gets added as <AutoText text="CL2VList"/> in this list: it is the <AutoText text="VList"/> format for the second (<AutoText text="CL2"/>) classifier.</Text>
-<Text id="fw15a">Append the following text to the bottom of the format statement:</Text>
-<Format>
-{If}{[numleafdocs],&lt;td&gt;&lt;i&gt;([numleafdocs])&lt;/i&gt;&lt;/td&gt;}
-</Format>
-<Text id="fw-16"><b>Preview</b> the collection. Click on the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list and notice that the bookshelves now display how many documents they contain.</Text>
-<Text id="fw-17">This revised format statement has the effect of specifying in brackets how many items are contained within a bookshelf.  Since only bookshelves define <Format>[numleafdocs]</Format>, only they will display this. By modifying <AutoText text="CL2VList"/> instead of <AutoText text="VList"/>, the change will only apply to the second classifier (Creators).</Text>
-</NumberedItem>
-<Heading>
-<Text id="fw-17a">Displaying multi-valued metadata</Text>
-</Heading>
-<NumberedItem>
-<Text id="fw-18">Next we modify the document entries in the Creator classifier to display all authors. Back in <AutoText key="glidict::CDM.GUI.Formats"/>, select the <AutoText text="CL2VList"/> format in the list of assigned formats. After <Format>{If}{[ex.Source],&lt;br&gt;</Format> in the format statement, add <Format>[sibling:dc.Creator]</Format>.</Text>
-<Text id="fw-19"><Format>[ex.Source]</Format> is not defined for bookshelves, so can also be used to differentiate bookshelves and documents.</Text>
-<Text id="fw-20">The resulting format statement looks like:</Text>
-<Format>
-&lt;td valign=top&gt;[link][icon][/link]&lt;/td&gt;<br/>
-&lt;td valign=top&gt;[ex.srclink][ex.srcicon][ex./srclink]&lt;/td&gt;<br/>
-&lt;td valign=top&gt;[highlight]<br/>
-{Or}{[dc.Title],[ex.Title],Untitled}[/highlight]<br/> 
-{If}{[ex.Source],&lt;br&gt;<highlight>[sibling:dc.Creator]</highlight><br/>
-&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;<br/>
-{If}{[numleafdocs],&lt;td&gt;&lt;i&gt;([numleafdocs])&lt;/i&gt;&lt;/td&gt;}
-</Format>
-<Text id="fw-21">This will display the Greenstone link, the link to the original, then the Title. For bookshelves, it will also display how many documents the bookshelf contains. For documents, it will display all the Authors (Creators), and the source document. <Format>[sibling:dc.Creator]</Format> displays all the Creator metadata for the document, separated by a space (<AutoText text=" " type="quoted"/>), while <Format>[dc.Creator]</Format> displays only the first author. Preview the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list and make sure that all authors are displayed for documents.</Text>  
-</NumberedItem>
-<NumberedItem>
-<Text id="fw-22">You can change the separator between the authors. Modify the format statement, and replace <Format>[sibling:dc.Creator]</Format> with <Format>[sibling(All'&lt;br/&gt;'):dc.Creator]</Format>. This will add a new line after each author (<Format>&lt;br/&gt;</Format> specifies a line break in HTML). Preview the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list.</Text>
-<Text id="fw-23">If you have done exercise <TutorialRef id="enhanced_word"/>, the collection will have both dc.Creator and ex.Creator metadata. To display both, you can use </Text>
-<Format>
-[sibling:dc.Creator] [sibling:ex.Creator]
-</Format>
-<Text id="fw-23a">To display dc.Creator if it is present, otherwise display ex.Creator, use</Text>
-<Format>
-{Or}{[sibling:dc.Creator],[sibling:ex.Creator]}
-</Format>
-</NumberedItem>
-<Heading>
-<Text id="fw-24">Opening PDF files with query terms highlighted</Text>
-</Heading>
-<NumberedItem>
-<Text id="fw-24a">Next we'll customize the <AutoText text="SearchVList"/> format statement to highlight the query terms in a PDF file when it is opened from the search result list. This requires Acrobat Reader 7.0 version or higher, and currently only works on a Microsoft Windows platform.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="fw-24c">The search terms are kept in the macro variable <AutoText text="_cgiargq_"/>, and we append <AutoText text="#search=&quot;_cgiargq_&quot;"/> to the end of a PDF file link to pass the query terms to the PDF file.</Text>
-<Text id="fw-24d"><AutoText text="PDFPlug"/> renames each PDF file as <AutoText text="doc.pdf"/> and saves it in a unique directory for that document, so we use</Text>
-<Format>_httpcollection_/index/assoc/[archivedir]/doc.pdf</Format>
-<Text id="fw-24e">to refer to the PDF source file. (However, if you used the <AutoText text="-keep_original_filename"/> option to <AutoText text="PDFPlug"/> when building the collection, the original name of the PDF file is kept, and we use</Text>
-<Format>_httpcollection_/index/assoc/[archivedir]/[Source]</Format>
-<Text id="fw-24f">instead to locate the PDF source file.)</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="fw-24g">Select <AutoText text="SearchVList"/> from the list of assigned formats. We need to test whether the file is a PDF file before linking to doc.pdf, using <Format>{If}{[ex.FileFormat] eq 'PDF',,}</Format>. For PDF files, we use the above format instead of the <Format>[ex.srclink]</Format> and <Format>[ex./srclink]</Format> variables to link to the file.</Text>
-<Text id="fw-24b">The resulting format statement is:</Text>
-<Format>
-&lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
-&lt;td valign="top"&gt;<highlight>{If}{[ex.FileFormat] eq 'PDF', &lt;a
-href=\"_httpcollection_/index/assoc/[archivedir]/doc.pdf#search=&amp;quot;_cgiargq_&amp;quot;\"&gt;[ex.srcicon]&lt;/a&gt;,<br/>[ex.srclink][ex.srcicon][ex./srclink]}</highlight>&lt;/td&gt;<br/>
-&lt;td valign="top"&gt;[highlight]<br/>
-{Or}{[dc.Title],[ex.Title],Untitled}<br/>
-[/highlight]{If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;<br/>
-</Format>
-<Text id="fw-24i">When the PDF icons are clicked in the search results, Acrobat will open the file with the search window open, and the query terms highlighted.</Text>
+<Text id="0322">Now we set the <AutoText text="firstvalueonly"/> option for the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> classifier. Switch to the <AutoText key="glidict::CDM.GUI.Classifiers"/> section of the <AutoText key="glidict::GUI.Design"/> panel, select the <AutoText text="AZCompactList"/> for <AutoText key="metadata::dc.Creator"/> metadata in the <AutoText key="glidict::CDM.ClassifierManager.Assigned"/> box and click <AutoText key="glidict::CDM.ClassifierManager.Configure" type="button"/>. Select the <AutoText text="firstvalueonly"/> option.</Text>
+<Text id="0322a"><b>Rebuild</b> and <b>preview</b> the collection. Now the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list classifies documents based on the first author appearing in the <AutoText key="metadata::dc.Creator"/> metadata.</Text>
+<Text id="0322b">If you set the <AutoText text="metadata"/> field of <AutoText text="AZCompactList"/> to <Format><AutoText key="metadata::dc.Creator" type="plain"/><AutoText text=",ex.Creator" type="plain"/></Format> in the <TutorialRef id="word_pdf_collection"/> exercise, now the <AutoText key="coredm::_Global:labelCreator_" type="italics"/> list will classify based on the first author appearing in either the <AutoText key="metadata::dc.Creator"/> metadata or the <AutoText key="metadata::ex.Creator"/> metadata.</Text>
 </NumberedItem>
 </Content>
@@ -1087,5 +1053,5 @@
 </Title>
 <SampleFiles folder="Word_and_PDF"/>
-<Version initial="2.70" current="2.71"/>
+<Version initial="2.70" current="2.80"/>
 <Content>
 <Text id="ep-2">Greenstone converts PDF files to HTML using third-party software: <AutoText text="pdftohtml.pl" type="italics"/>. This lets users view these documents even if they don't have the PDF software installed. Unfortunately, sometimes the formatting of the resulting HTML files is not so good.</Text>
@@ -1094,5 +1060,5 @@
 <Text id="ep-3a">In the Librarian Interface, start a new collection called "PDF collection" and base it on <AutoText key="glidict::NewCollectionPrompt.NewCollection"/>.</Text>
 <Text id="ep-3b">In the <AutoText key="glidict::GUI.Gather"/> panel, drag just the PDF documents from <Path>sample_files &rarr; Word_and_PDF &rarr; Documents</Path> into the new collection. Also drag in the PDF documents from <Path>sample_files &rarr; Word_and_PDF &rarr; difficult_pdf</Path>.</Text>
-<Text id="ep-3c">Go to the <AutoText key="glidict::GUI.Create"/> panel and build the collection. Examine the output from the build process. You will notice that one of the documents could not be processed. The following messages are shown: "The file pdf05-notext.pdf was recognised but could not be processed by any plugin.", and "5 documents were processed and included in the collection. 1 was rejected".</Text>
+<Text id="ep-3c">Go to the <AutoText key="glidict::GUI.Create"/> panel and build the collection. Examine the output from the build process. You will notice that one of the documents could not be processed. The following messages are shown: "The file pdf05-notext.pdf was recognised but could not be processed by any plugin.", and "3 were processed and included in the collection. 1 was rejected".</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1106,5 +1072,5 @@
 </Comment>
 <NumberedItem>
-<Text id="0335">Use the <AutoText key="glidict::Menu.File_Options"/> item on the <AutoText key="glidict::Menu.File"/> menu to switch to <AutoText key="glidict::Preferences.Mode.Expert"/> mode and then build the collection again. The <AutoText key="glidict::GUI.Create"/> panel looks different in <AutoText key="glidict::Preferences.Mode.Expert"/> mode because it gives more options: locate the <AutoText key="glidict::CreatePane.Build_Collection" type="button"/> button, near the bottom of the window, and click it. Now a message appears saying that the file could not be processed, and why. Amongst all the output, we get the following message: "Error: PDF contains no extractable text. Could not convert pdf05notext.pdf to HTML format". pdftohtml.pl cannot convert a PDF file to HTML if the PDF file has no extractable text.</Text>
+<Text id="0335">Use the <AutoText key="glidict::Menu.File_Options"/> item on the <AutoText key="glidict::Menu.File"/> menu to switch to <AutoText key="glidict::Preferences.Mode.Expert"/> mode and then build the collection again. The <AutoText key="glidict::GUI.Create"/> panel looks different in <AutoText key="glidict::Preferences.Mode.Expert"/> mode because it gives more options: locate the <AutoText key="glidict::CreatePane.Build_Collection" type="button"/> button, near the bottom of the window, and click it. Now a message appears saying that the file could not be processed, and why. Amongst all the output, we get the following message: "Error: PDF contains no extractable text. Could not convert pdf05-notext.pdf to HTML format". pdftohtml.pl cannot convert a PDF file to HTML if the PDF file has no extractable text.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1187,8 +1153,35 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="ep-30">Edit the <AutoText text="DocumentText"/> format statement. PDF files processed as HTML will not have images to display, so we need to make sure they get text displayed instead. Change <Format>[srcicon]</Format> to <Format>{Or}{[srcicon],[Text]}</Format>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="ep-33">Build and preview the collection. All PDF documents should look relatively nice. Try searching this collection. You will be able to search for the PDFs that were converted to HTML (try e.g. <AutoText text="bibliography" type="quoted"/>), but not the ones that were converted to images (try searching for <AutoText text="banana" type="quoted"/> or <AutoText text="METS" type="quoted"/>).</Text>
+<Text id="ep-30">Edit the <AutoText text="DocumentText"/> format statement. PDF files processed as HTML will not have images to display, so we need to make sure they get text displayed instead. Change <Format>[srcicon]</Format> to <Format>{If}{[NoText] eq "1",[srcicon],[Text]}</Format>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="ep-33">Build and preview the collection. All PDF documents should look relatively nice. Try searching this collection. You will be able to search for the PDFs that were converted to HTML (try e.g. <AutoText text="bibliography" type="quoted"/>), but not the ones that were converted to images (try searching for <AutoText text="FAO" type="quoted"/> or <AutoText text="METS" type="quoted"/>).</Text>
+</NumberedItem>
+<Heading>
+<Text id="fw-24">Opening PDF files with query terms highlighted</Text>
+</Heading>
+<NumberedItem>
+<Text id="fw-24a">Next we'll customize the <AutoText text="SearchVList"/> format statement to highlight the query terms in a PDF file when it is opened from the search result list. This requires Acrobat Reader 7.0 version or higher, and currently only works on a Microsoft Windows platform.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="fw-24c">The search terms are kept in the macro variable <AutoText text="_cgiargq_"/>, and we append <AutoText text="#search=&quot;_cgiargq_&quot;"/> to the end of a PDF file link to pass the query terms to the PDF file.</Text>
+<Text id="fw-24d"><AutoText text="PDFPlug"/> renames each PDF file as <AutoText text="doc.pdf"/> and saves it in a unique directory for that document, so we use</Text>
+<Format>_httpcollection_/index/assoc/[archivedir]/doc.pdf</Format>
+<Text id="fw-24e">to refer to the PDF source file. (However, if you used the <AutoText text="-keep_original_filename"/> option to <AutoText text="PDFPlug"/> when building the collection, the original name of the PDF file is kept, and we use</Text>
+<Format>_httpcollection_/index/assoc/[archivedir]/[Source]</Format>
+<Text id="fw-24f">instead to locate the PDF source file.)</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="fw-24g">Select <AutoText text="SearchVList"/> from the list of assigned formats. We need to test whether the file is a PDF file before linking to doc.pdf, using <Format>{If}{[ex.FileFormat] eq 'PDF',,}</Format>. For PDF files, we use the above format instead of the <Format>[ex.srclink]</Format> and <Format>[ex./srclink]</Format> variables to link to the file.</Text>
+<Text id="fw-24b">The resulting format statement is:</Text>
+<Format>
+&lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
+&lt;td valign="top"&gt;<highlight>{If}{[ex.FileFormat] eq 'PDF', &lt;a
+href=\"_httpcollection_/index/assoc/[archivedir]/doc.pdf#search=&amp;quot;_cgiargq_&amp;quot;\"&gt;[ex.srcicon]&lt;/a&gt;,<br/>[ex.srclink][ex.srcicon][ex./srclink]}</highlight>&lt;/td&gt;<br/>
+&lt;td valign="top"&gt;[highlight]<br/>
+{Or}{[dc.Title],[ex.Title],Untitled}<br/>
+[/highlight]{If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;<br/>
+</Format>
+<Text id="fw-24i">When the PDF icons are clicked in the search results, Acrobat will open the file with the search window open, and the query terms highlighted.</Text>
 </NumberedItem>
 </Content>
@@ -1198,5 +1191,5 @@
 <Text id="ew-a">Enhanced Word document handling</Text>
 </Title>
-<Version initial="2.70w" current="2.71"/>
+<Version initial="2.70w" current="2.80"/>
 <Prerequisite id="word_pdf_collection"/>
 <Content>
@@ -1213,5 +1206,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="ew-5"><b>Build</b> the collection. You will notice that the Microsoft Word program is started up for each Word document&mdash;the document is saved as HTML from Word itself, to get a better conversion. <b>Preview</b> the collection. In the <AutoText key="coredm::_Global:labelTitle_"/> list, notice that <Path>word03.doc</Path> and <Path>word06.doc</Path> now have a book icon, rather than a page icon. These now appear with hierarchical structure. But these two are the only ones.</Text>
+<Text id="ew-5"><b>Build</b> the collection. You will notice that the Microsoft Word program is started up for each Word document&mdash;the document is saved as HTML from Word itself, to get a better conversion. <b>Preview</b> the collection. In the <AutoText key="coredm::_Global:labelTitle_"/> list, notice that <Path>word03.doc</Path> and <Path>word06.doc</Path> now have a book icon, rather than a page icon. These now appear with hierarchical structure.</Text>
 <Text id="ew-6">The default behaviour for <AutoText text="WordPlug"/> with <AutoText text="windows_scripting"/> is to section the document based on <AutoText text="Heading 1" type="quoted"/>, <AutoText text="Heading 2" type="quoted"/>, <AutoText text="Heading 3" type="quoted"/> styles. If you open up the <Path>word03.doc</Path> or <Path>word06.doc</Path> documents in Word, you will see that the sections use these Heading styles.</Text> 
 <Text id="ew-7">Note, to view style information in Word, you can select <Menu>Format &rarr; Styles and Formatting</Menu> from the menu, and a side bar will appear on the right hand side. Click on a section heading and the formatting information will be displayed in this side bar.</Text>
@@ -1236,17 +1229,17 @@
 <BulletList>
 <Bullet>
-<Text id="ew-13"><AutoText text="PaperTitle" type="italics"/>: Title of the paper</Text>
-</Bullet>
-<Bullet>
-<Text id="ew-14"><AutoText text="SammaryHeader" type="italics"/> (probably mistyped): Summary section</Text>
-</Bullet>
-<Bullet>
-<Text id="ew-15"><AutoText text="Chapter Title" type="italics"/>: Level 1 section heading</Text>
-</Bullet>
-<Bullet>
-<Text id="ew-16"><AutoText text="SectionHeading" type="italics"/>: Level 2 section heading</Text>
-</Bullet>
-<Bullet>
-<Text id="ew-17"><AutoText text="Reference Heading" type="italics"/>: Reference section</Text>
+<Text id="ew-13"><AutoText text="ManualTitle" type="italics"/>: Title of the manual</Text>
+</Bullet>
+<Bullet>
+<Text id="ew-14"><AutoText text="ChapterTitle" type="italics"/>: Level 1 section heading</Text>
+</Bullet>
+<Bullet>
+<Text id="ew-15"><AutoText text="SectionHeading" type="italics"/>: Level 2 section heading</Text>
+</Bullet>
+<Bullet>
+<Text id="ew-16"><AutoText text="SubsectionHeading" type="italics"/>: Level 3 section heading</Text>
+</Bullet>
+<Bullet>
+<Text id="ew-17"><AutoText text="AppendixTitle" type="italics"/>: Appendix section title</Text>
 </Bullet>
 </BulletList>
@@ -1263,9 +1256,10 @@
 </Format>
 <Text id="ew-12">These header options define which styles should be considered as title, level 1, level 2 and level 3 styles. </Text>
-<Text id="ew-12a">Set the options as follows (spaces in the Word styles are removed when converting to HTML styles, and these options must match the HTML styles):</Text>
-<Format>
-level1_header:(SammaryHeader|ChapterTitle|ReferenceHeading)<br/>
+<Text id="ew-12a">Ensure that the <AutoText text="windows_scripting"/> option is checked, and set the options as follows (spaces in the Word styles are removed when converting to HTML styles, and these options must match the HTML styles):</Text>
+<Format>
+level1_header:(ChapterTitle|AppendixTitle)<br/>
 level2_header: SectionHeading<br/>
-title_header: PaperTitle
+level3_header: SubsectionHeading<br/>
+title_header: ManualTitle
 </Format>
 <Comment>
@@ -1285,11 +1279,11 @@
 </Heading>
 <NumberedItem>
-<Text id="ew-21">If you look at <Path>word06.doc</Path> you will see that it now has two tables of contents. One is generated by Greenstone based on the document's styles, the other was already defined in the Word document. WordPlug can be configured to remove predefined tables of contents and tables of figures. The tables must be defined with Word styles in order for this to work.</Text> 
-</NumberedItem>
-<NumberedItem>
-<Text id="ew-22">To remove the tables of contents and figures from <Path>word06.doc</Path>, switch on the <AutoText text="delete_toc"/> option in <AutoText text="WordPlug"/>. Set the <AutoText text="toc_header"/> option to <Format>(MsoToc1|MsoToc2|MsoToc3|MsoTof)</Format>. In this document, the table of contents and list of figures use these four style names. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>  
-</NumberedItem>
-<NumberedItem>
-<Text id="ew-24"><b>Build</b> and <b>preview</b> the collection. <Path>word06.doc</Path> should now have only one table of contents.</Text>
+<Text id="ew-21">If you look at the HTML versions of <Path>word05.doc</Path> and <Path>word06.doc</Path>, you will see that it now has two tables of contents. One is generated by Greenstone based on the document's styles, the other was already defined in the Word document. WordPlug can be configured to remove predefined tables of contents and tables of figures. The tables must be defined with Word styles in order for this to work.</Text> 
+</NumberedItem>
+<NumberedItem>
+<Text id="ew-22">To remove the tables of contents and figures from <Path>word06.doc</Path> and the table of contents from <Path>word05.doc</Path>, switch on the <AutoText text="delete_toc"/> option in <AutoText text="WordPlug"/>. Set the <AutoText text="toc_header"/> option to <Format>(MsoToc1|MsoToc2|MsoToc3|MsoTof|TOA)</Format>. In this document, the table of contents and list of figures use these four style names. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="ew-24"><b>Build</b> and <b>preview</b> the collection. Both <Path>word05.doc</Path> and <Path>word06.doc</Path> should now have only one table of contents.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1300,5 +1294,5 @@
 </Heading>
 <NumberedItem>
-<Text id="ew-26">Word document properties can be extracted as metadata. By default, only the Title will be extracted. Other properties can be extracted using the <AutoText text="metadata_fields"/>  option.</Text>
+<Text id="ew-26">When the <AutoText text="windows_scripting"/> option is set, word document properties can be extracted as metadata. By default, only the Title will be extracted. Other properties can be extracted using the <AutoText text="metadata_fields"/>  option.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1324,5 +1318,5 @@
 <Text id="0403">Exporting a collection to CD-ROM/DVD</Text>
 </Title>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -1349,6 +1343,9 @@
 </Title>
 <SampleFiles folder="tudor"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
+<Comment>
+<Text id="03881">You will need the files in the <Path>sample_files &rarr; tudor</Path> folder.</Text>
+</Comment>
 <NumberedItem>
 <Text id="0388">Invoke the Greenstone Librarian Interface (from the Windows <i>Start</i> menu) and start a new collection called <b>tudor</b> (use the <AutoText key="glidict::Menu.File"/> menu), based on the default <AutoText key="glidict::NewCollectionPrompt.NewCollection"/>.</Text>
@@ -1380,5 +1377,5 @@
 Title,Author,Page_topic,Content
 </Format>
-<Text id="0393b-1">Make sure that you have copied this exactly, with no spaces. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
+<Text id="0393b-1">Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1419,5 +1416,5 @@
 </Title>
 <Prerequisite id="large_html_collection"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -1532,5 +1529,5 @@
 </Title>
 <Prerequisite id="large_html_collection"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <NumberedItem>
@@ -1540,5 +1537,5 @@
 &lt;td valign=top&gt;[ex.srclink]{Or}{[ex.thumbicon],[ex.srcicon]} [ex./srclink]&lt;/td&gt;<br/>
 &lt;td valign=top&gt;[highlight]<br/>
-{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}<br/>
+{Or}{[dc.Title],[exp.Title],[ex.Title],Untitled}<br/>
 [/highlight]{If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}&lt;/td&gt;
 </Format> 
@@ -1609,5 +1606,5 @@
 &lt;td&gt;[link][icon][/link]&lt;/td&gt;<br/>
 &lt;td&gt;{If}{[numleafdocs],&lt;b&gt;Bookshelf title:&lt;/b&gt; [ex.Title],<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Title:&lt;/b&gt; [ex.Title]}<br/> 
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;b&gt;Title:&lt;/b&gt; [ex.Title]}<br/> 
 &lt;/td&gt;
 </Format> 
@@ -1626,5 +1623,5 @@
 <Text id="st-1">Section tagging for HTML documents</Text>
 </Title>
-<Version initial="2.70w" current="2.71"/>
+<Version initial="2.70w" current="2.80"/>
 <Content>
 <NumberedItem>
@@ -1682,5 +1679,5 @@
 <Text id="0411">Downloading files from the web</Text>
 </Title>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -1692,5 +1689,5 @@
 <NumberedItem>
 <Text id="0414">In a web browser, visit <Link>http://englishhistory.net</Link>, follow the link to <i>Tudor England</i>, and click &lt;<b>Enter</b>&gt;. You should be at the URL</Text>
-<Link>http://englishhistory.net/tudor/contents.html</Link> 
+<Link>http://englishhistory.net/tudor.html</Link> 
 <Text id="0415">This is where we started the downloading process to obtain the files you have been using for the <b>tudor</b> collection. You could do the same thing by copying this URL from the web browser, pasting it into the <AutoText key="glidict::GUI.Download"/> panel, and clicking the <AutoText key="glidict::Mirroring.Download" type="button"/> button. However, several megabytes will be downloaded, which might strain your network resources&mdash;or your patience! For a faster exercise we focus on a smaller section of the site. </Text>
 </NumberedItem>
@@ -1699,5 +1696,5 @@
 <Text id="0415b">Enter this URL</Text>
 <Link>http://englishhistory.net/tudor/citizens/</Link> 
-<Text id="0417">into the <AutoText text="url"/> box. There are several other options that govern how the download process proceeds. To see a description of an option, hover the mouse over it and a tooltip will appear. To copy just the <i>citizens</i> section of the website, switch on the <AutoText text="below"/> option by checking its box. If you don't do this (or if you miss out the terminating "/" in the URL), the downloading process will follow links to other areas of the <i>englishhistory.net</i> website and grab those as well.</Text>
+<Text id="0417">into the <AutoText text="url"/> box. There are several other options that govern how the download process proceeds. To see a description of an option, hover the mouse over it and a tooltip will appear. To copy just the <i>citizens</i> section of the website, switch on the <AutoText text="below"/> option by checking its box and set the <AutoText text="depth"/> option to 1. If you don't do this (or if you miss out the terminating "/" in the URL), the downloading process will follow links to other areas of the <i>englishhistory.net</i> website and grab those as well.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1724,8 +1721,8 @@
 </Title>
 <Prerequisite id="downloading_from_internet"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <NumberedItem>
-<Text id="0424">Open up your <b>webtudor</b> collection, and in the <AutoText key="glidict::GUI.Gather"/> panel inspect the files you dragged into it. The first folder is <Path>englishhistory.net</Path>, which opens up to reveal <Path>tudor</Path>, and so on. The files represent a complete sweep of the pages (and supporting images) that constitute the <i>Tudor citizens</i> section of the <i>englishhistory.net</i> web site. They were downloaded from the web in a way that preserved the structure of the original site. This allows any page's original URL to be reconstructed from the folder hierarchy.</Text>
+<Text id="0424">Open up your <b>tudor</b> collection, and in the <AutoText key="glidict::GUI.Gather"/> panel inspect the files you dragged into it. The first folder is <Path>englishhistory.net</Path>, which opens up to reveal <Path>tudor</Path>, and so on. The files represent a complete sweep of the pages (and supporting images) that constitute the <i>Tudor citizens</i> section of the <i>englishhistory.net</i> web site. They were downloaded from the web in a way that preserved the structure of the original site. This allows any page's original URL to be reconstructed from the folder hierarchy.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1758,18 +1755,21 @@
 </Title>
 <SampleFiles folder="marc"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
-<Text id="0520a">This exercise looks at using fielded searching in a collection. Fielded searching is best used for metadata rich collections. Here we use bibliographic data in MARC format. We also "explode" the database, enabling editing of the metadata with the Librarian Interface.</Text>
-</Comment>
-<NumberedItem>
-<Text id="0521">Start a new collection called <b>Beatles Bibliography</b> which will contain a collection of MARC records on the Beatles, from the US Library of Congress. Enter the requested information and base it on <AutoText key="glidict::NewCollectionPrompt.NewCollection"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0522">In the <AutoText key="glidict::GUI.Gather"/> panel, open the <Path>sample_files &rarr; marc</Path> folder, drag <Path>locbeatles50.marc</Path> into the right-hand pane and drop it there. A popup window asks whether you want to add <AutoText text="MARCPlug" /> to the collection to process this file. Click <AutoText key="glidict::CDM.PlugInManager.QuickAdd" type="button"/>, because this plugin will be needed to process the MARC records.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0523">In the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, remove the plugins <AutoText text="TextPlug" /> to <AutoText text="NULPlug" /> by selecting each one in the <AutoText key="glidict::CDM.PlugInManager.Assigned"/> list and clicking <AutoText key="glidict::CDM.PlugInManager.Remove" type="button"/> (<AutoText text="ZIPPlug" />, <AutoText text="GAPlug" /> and <AutoText text="MARCPlug" /> remain). It is not strictly necessary to remove these redundant plugins, but it is good practice to include only plugins that are needed, to avoid unwanted (and unexpected) side effects.</Text>
-</NumberedItem>
+<Text id="0520a">This exercise looks at using fielded searching in a collection. Fielded searching is best used for metadata rich collections. Here we use bibliographic data in MARC format.</Text>
+</Comment>
+<NumberedItem>
+<Text id="0521">Start a new collection called <b>Papers Bibliography</b> which will contain a collection of example MARC records of the working papers published at the <Link url="http://www.cs.waikato.ac.nz">Computer Science Department</Link>, <Link url="http://www.waikato.ac.nz">Waikato University</Link>. Enter the requested information and base it on <AutoText key="glidict::NewCollectionPrompt.NewCollection"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0522">In the <AutoText key="glidict::GUI.Gather"/> panel, open the <Path>sample_files &rarr; marc</Path> folder, drag <Path>CMSwp-all.marc</Path> into the right-hand pane and drop it there. A popup window asks whether you want to add <AutoText text="MARCPlug" /> to the collection to process this file. Click <AutoText key="glidict::CDM.PlugInManager.QuickAdd" type="button"/>, because this plugin will be needed to process the MARC records.</Text>
+</NumberedItem>
+<!-- don't need to remove the plugins -->
+<!--
+<NumberedItem>
+<Text id="0523">In the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, remove the plugins <AutoText text="TextPlug" /> to <AutoText text="NULPlug" /> by selecting each one in the <AutoText key="glidict::CDM.PlugInManager.Assigned"/> list and clicking <AutoText key="glidict::CDM.PlugInManager.Remove" type="button"/> (<AutoText text="ZIPPlug" />, <AutoText text="GAPlug" />, <AutoText text="MetadataXMLPlug"/> and <AutoText text="MARCPlug" /> remain). It is not strictly necessary to remove these redundant plugins, but it is good practice to include only plugins that are needed, to avoid unwanted (and unexpected) side effects.</Text>
+</NumberedItem>
+-->
 <NumberedItem>
 <Text id="0524">Now select <AutoText key="glidict::CDM.GUI.Classifiers"/> within the <AutoText key="glidict::GUI.Design"/> panel and <b>remove</b> the default classifier for <b>Source</b> metadata.</Text>
@@ -1779,5 +1779,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0525">Switch to the <AutoText key="glidict::GUI.Create"/> panel, <b>build</b> the collection, and <b>preview</b> it. Browse through the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> and view a record or two. Try searching&mdash;for example, find items that include <AutoText text="rock music"/>.</Text>
+<Text id="0525">Switch to the <AutoText key="glidict::GUI.Create"/> panel, <b>build</b> the collection, and <b>preview</b> it. Browse through the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> and view a record or two. Try searching&mdash;for example, find items that include <AutoText text="graphics"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1794,5 +1794,5 @@
 </Heading>
 <NumberedItem>
-<Text id="0531a">Collections built with MGPP (the default indexer) provide the option of fielded searching. In the browser, go to the <AutoText key="coredm::_Global:linktextPREFERENCES_" type="italics"/> page. You will notice that there is a <AutoText key="coredm::_preferences:textsearchtype_" /> option which enables you to switch between "normal" and "fielded" search. Change to fielded search now and click on the <AutoText key="coredm::_Global:labelSearch_"/> button. The search form has changed to a fielded form.</Text>
+<Text id="0531a">Now let's look at fielded searching. In the browser, go to the <AutoText key="coredm::_Global:linktextPREFERENCES_" type="italics"/> page. You will notice that there is a <AutoText key="coredm::_preferences:textsearchtype_" /> option which enables you to switch between "normal" and "fielded" search. Change to fielded search now and click on the <AutoText key="coredm::_Global:labelSearch_"/> button. The search form has changed to a fielded form.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1803,5 +1803,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0533"><b>Preview</b> the collection again. Notice that the collection's home page no longer includes a query box. (This is because the search form is too big to fit here nicely.) To search, you have to click <AutoText key="coredm::_Global:labelSearch_"/> in the navigation bar. Note that the <AutoText key="coredm::_Global:linktextPREFERENCES_" type="italics"/> page has changed so that the "normal" query style is no longer offered.</Text>
+<Text id="0533"><b>Preview</b> the collection again. Notice that the collection's home page no longer includes a query box. (This is because the search form is too big to fit here nicely.) To search, you have to click <AutoText key="coredm::_Global:labelSearch_"/> in the navigation bar. Note that the <AutoText key="coredm::_Global:linktextPREFERENCES_" type="italics"/> page has changed so that the "normal" query style is no longer the default value.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1833,16 +1833,25 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0533-9">Once exploding has finished, the MARC database file will have been deleted, and a folder created in its place. This folder contains an empty file for each record in the original database. The metadata for these records can be viewed and edited by switching to the <AutoText key="glidict::GUI.Enrich"/> panel.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-10">Because the MARC file is no longer present, and the collection contains empty (.nul) files, we need to change the list of plugins. In the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, remove <AutoText text="MARCPlug"/> and add <AutoText text="NULPlug"/> (use the default configuration).</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-11"><b>Rebuild</b> and <b>preview</b> the collection. You will notice that the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> classifier displays the filename not the record title, the <AutoText key="coredm::_Global:labelSubject_" type="italics"/> classifier is empty, searching no longer returns any results, and the document display is useless.</Text>
+<Text id="0533-9">Once exploding has finished, the MARC database file will have been deleted, and three folders created in its place. These folders contain an empty file for each record in the original database. The metadata for these records can be viewed and edited by switching to the <AutoText key="glidict::GUI.Enrich"/> panel.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533-10">Because the MARC file is no longer present, and the collection contains empty (.nul) files, we need to change the list of plugins. In the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, remove <AutoText text="MARCPlug"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533-11"><b>Rebuild</b> and <b>preview</b> the collection. You will notice that the <AutoText key="coredm::_Global:labelSubject_" type="italics"/> classifier is empty, searching no longer returns any results, and the document display is useless.</Text>
+<Text id="0533-11b">Although the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> classifier was built on <AutoText key="metadata::ex.Title"/>, it still displays the correct titles, but in the <AutoText key="glidict::GUI.Enrich"/> panel you can see the <AutoText key="metadata::ex.Title"/> metadata are actually the filenames rather than titles of the MARC records. This is because the default <AutoText text="VList"/> format uses the <AutoText key="metadata::exp.Title"/> metadata. In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select <AutoText text="VList"/> in the list of assigned format statements. The resulting format statement looks like:</Text>
+<Format>
+&lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
+&lt;td valign="top"&gt;[ex.srclink]{Or}{[ex.thumbicon],[ex.srcicon]}[ex./srclink]&lt;/td&gt;<br/>
+&lt;td valign="top"&gt;[highlight]<br/>
+{Or}{[dc.Title],[exp.Title],[ex.Title],Untitled}<br/>
+[/highlight]{If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}
+</Format>
+<Text id="0533-11c">Since there is no <AutoText key="metadata::dc.Title"/> metadata and <AutoText key="metadata::exp.Title"/> comes before <AutoText key="metadata::ex.Title"/>, the expoded titles will be displayed.</Text>
 </NumberedItem>
 <Heading>
 <Text id="0533-11a">Reformatting the collection to use the exploded metadata</Text>
 </Heading>
-<Text id="0533-12">The collection previously used extracted (ex.) metadata, but now it uses exploded (exp.) metadata. The classifiers and search indexes were built on ex metadata, which is why they no longer work properly.</Text>
+<Text id="0533-12">The collection previously used extracted (ex.) metadata, but now it uses exploded (exp.) metadata. The <AutoText key="coredm::_Global:labelSubject_" type="italics"/> classifier and search indexes were built on ex metadata, which is why they no longer work properly.</Text>
 <Text id="0533-12a">There is also no longer any text in the documents. Previously, MARCPlug stored the raw record as the "text" of each record. Now that the metadata is in the Librarian Interface, there is no longer the concept of raw record, and so there is no text.</Text>
 <Text id="0533-12b">We need to modify the collection design to take note of these changes.</Text>
@@ -1860,5 +1869,8 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0533-15">In the <AutoText key="glidict::CDM.GUI.Classifiers"/> section, change the <AutoText key="metadata::ex.Title"/> <AutoText text="AZList"/> to use <AutoText key="metadata::exp.Title"/> metadata. Double click the <AutoText key="metadata::ex.Title"/> <AutoText text="AZList"/> in the <AutoText key="glidict::CDM.ClassifierManager.Assigned"/> list, and change the <AutoText text="metadata"/> option to use <AutoText key="metadata::exp.Title"/>. Click <AutoText key="glidict::General.OK" type="button"/>. Do the same thing for the Subject <AutoText text="AZCompactList"/>, changing <AutoText key="metadata::ex.Subject"/> to <AutoText key="metadata::exp.Subject"/>.</Text>
+<Text id="0533-15">To explicitly use the <AutoText key="metadata::exp.Title"/> metadata, in the <AutoText key="glidict::CDM.GUI.Classifiers"/> section, change the <AutoText key="metadata::ex.Title"/> <AutoText text="AZList"/> to use <AutoText key="metadata::exp.Title"/> metadata. Double click the <AutoText key="metadata::ex.Title"/> <AutoText text="AZList"/> in the <AutoText key="glidict::CDM.ClassifierManager.Assigned"/> list, and change the <AutoText text="metadata"/> option to use <AutoText key="metadata::exp.Title"/>. Click <AutoText key="glidict::General.OK" type="button"/>. Do the same thing for the Subject <AutoText text="AZCompactList"/>, changing <AutoText key="metadata::ex.Subject"/> to <AutoText key="metadata::exp.Subject"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533-23"><b>Rebuild</b> and <b>preview</b> the collection. The classifiers should be back to normal and searching should now work.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1866,5 +1878,5 @@
 <BulletList>
 <Bullet>
-<Text id="0533-16a">There is no dls or dc metadata for this collection, so replace <Format>{Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}</Format> with <Format>{Or}{[exp.Title],[ex.Title],Untitled}</Format>.</Text>
+<Text id="0533-16a">There is no dc metadata for this collection, so replace <Format>{Or}{[dc.Title],[exp.Title],[ex.Title],Untitled}</Format> with <Format>{Or}{[exp.Title],[ex.Title],Untitled}</Format>.</Text>
 </Bullet>
 <Bullet>
@@ -1898,7 +1910,4 @@
 <NumberedItem>
 <Text id="0533-22">The <AutoText key="coredm::_document:textDETACH_" type="italics"/> and <AutoText key="coredm::_document:textNOHIGHLIGHT_" type="italics"/> buttons are not very useful for this collection, so lets get rid of them. Edit the <AutoText text="DocumentButtons"/> format statement to make it empty.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-23"><b>Rebuild</b> and <b>preview</b> the collection. The classifiers should be back to normal, searching should now work, and there should be a nice record display.</Text>
 </NumberedItem>
 </Content>
@@ -1909,5 +1918,5 @@
 </Title>
 <SampleFiles folder="isis"/>
-<Version initial="2.70w" current="2.71"/>
+<Version initial="2.70w" current="2.80"/>
 <Content>
 <Comment>
@@ -1915,5 +1924,5 @@
 </Comment>
 <NumberedItem>
-<Text id="is-3">Start a new collection called <b>ISIS Collection</b>.</Text>
+<Text id="is-3">Start a new collection called <b>ISIS Collection</b> (base it on <b>New Collection</b>).</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1971,177 +1980,21 @@
 </Title>
 <SampleFiles folder="custom"/>
-<Version initial="2.70" current="2.71"/>
+<Version initial="2.70" current="2.80"/>
 <Content>
 <Text id="mf-2">The appearance of all pages produced by Greenstone is governed by macro files, which reside in the folder <Path>Greenstone &rarr; macros</Path>, images, and CSS stylesheets, both of which reside in <Path>Greenstone &rarr; images</Path>. </Text>
 <Text id="mf-3">A macro takes the form <Format>_macroname_ {macro value}</Format>. Macro names start and end with underscores (_), and the macro value is enclosed in curly brackets ({}). Macro values can be text or HTML, and can include other macros.</Text>
-<Text id="mf-4">Macros are grouped into packages, and different packages control the appearance of different pages. For example, the <AutoText text="home"/>, <AutoText text="help"/>, <AutoText text="preferences"/>, <AutoText text="query"/>, <AutoText text="document"/> packages control the home, help, preferences, query, and document pages, respectively. Some macro files contain macros for just one package, for example, <Path>home.dm</Path>, <Path>query.dm</Path>, <Path>document.dm</Path>, while others contain macros for many packages. <Path>base.dm</Path> contains macros used globally, <Path>style.dm</Path> controls the common style of each page, <Path>english.dm</Path>, <Path>french.dm</Path> and other language files contain the text fragments for the entire interface, in that specific language. </Text>
+<Text id="mf-4">Macros are grouped into packages, and different packages control the appearance of different pages. For example, the <AutoText text="home"/>, <AutoText text="help"/>, <AutoText text="preferences"/>, <AutoText text="query"/>, <AutoText text="document"/> packages control the home, help, preferences, query, and document pages, respectively. Some macro files contain macros for just one package, for example, <Path>home.dm</Path>, <Path>query.dm</Path>, <Path>document.dm</Path>, while others contain macros for many packages. <Path>base.dm</Path> contains macros used globally, <Path>style.dm</Path> controls the common style of each page, <Path>english.dm</Path>, <Path>french.dm</Path> and other language files contain the text fragments for the entire interface, in that language. </Text>
 <Text id="mf-5">The output of the library program is a page of HTML which is viewed in a web browser. CSS (Cascading Style Sheets) are often used alongside HTML pages to control the formatting, such as layout, colour, font etc. The default Greenstone stylesheet is <Path>Greenstone &rarr; images &rarr; style.css</Path>.</Text>
 <Text id="mf-6">In this exercise, we customize the macros, images and stylesheets to change the appearance of our library.</Text>
 <Heading>
-<Text id="mf-7">Changing the background and header images</Text>
-</Heading>
-<NumberedItem>
-<Text id="mf-8">Three new images for this exercise can be found in <Path>sample_files &rarr; custom</Path>. Copy <Path>chalk-blue.gif</Path>, <Path>gsdlhead-blue.gif</Path> and <Path>divb-blue.gif</Path> from the <Path>custom</Path> folder into the <Path>Greenstone &rarr; images</Path> folder.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-9">Open the file <Path>Greenstone &rarr; macros &rarr; home.dm</Path> in a text editor, e.g. WordPad. Find each occurrence of <Format>gsdlhead.gif</Format> in this file (there are two) and replace with <Format>gsdlhead-blue.gif</Format>. (If you are using WordPad, you can use <Menu>Edit &rarr; Find</Menu> to search for the text.)</Text>
-<Text id="mf-10">Save <Path>home.dm</Path> and close the file.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-11">Open the file <Path>Greenstone &rarr; macros &rarr; style.dm</Path> with the same program. Locate the following part of the file (this is part of the <Format>_cssheader_</Format> macro):</Text>
-<Format>
-&lt;style type="text/css"&gt;<br/>
-body.bgimage \{ background-image: url("_httpimg_/chalk.gif"); \}<br/>
-</Format>
-<Text id="mf-12">Use copy and paste on the <Format>body.bgimage</Format> line to make it look like this: </Text>
-<Format>
-&lt;style type="text/css"&gt;<br/>
-/*body.bgimage \{ background-image: url("_httpimg_/chalk.gif"); \}*/<br/>
-body.bgimage \{ background-image: url("_httpimg_/chalk-blue.gif"); \}<br/>
-</Format>
-<Text id="mf-13">/*...*/ around a line signals a comment, and this style element will be ignored. We use this to "comment out" the original line and replace it with a modified line. This way it is easy to revert back to the original if necessary. Here we are changing the background image for the <Format>bgimage</Format> section of the <Format>body</Format> of the page to <Format>chalk-blue.gif</Format>.</Text>
-<Text id="mf-14">Save <Path>style.dm</Path> and close the file.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-15">Preview the home page in a web browser. (On Windows, restart the Greenstone library server.) The page header and background should now use the new graphics, and be blue.</Text>
-<Comment>
-<Text id="mf-15a">The final part of this exercise looks at how we determined which images needed replacing, and which macro files should be edited.</Text>
-</Comment>
-</NumberedItem>
-<Heading>
-<Text id="mf-16">Changing the colour of the navigation bar, page title and page text</Text>
-</Heading>
-<Text id="mf-17">Now that the background image is a nice blue colour, lets format the page so that some other parts are blue too. Preview the collection after each change to make sure that it has worked properly. On Windows, macro file changes require a restart of the Greenstone library server. Stylesheet changes may require a force reload in the web browser.</Text>
-<NumberedItem>
-<Text id="mf-18">First, we'll change the colour of the navigation bar and green divider bars. These use an image as a background, specified in the same macro as the page background.</Text>
-<Text id="mf-19">Open <Path>Greenstone &rarr; macros &rarr; style.dm</Path> in a text editor, and find the <Format>_cssheader_</Format> macro that you modified previously. Change the <Format>div.navbar</Format> and <Format>div.divbar</Format> parts to use <Format>divb-blue.gif</Format> instead of <Format>bg_green.png</Format>:</Text>
-<Format>
-/*div.navbar \{ background-image: url("_httpimg_/bg_green.png"); \}*/<br/>
-div.navbar \{ background-image: url("_httpimg_/divb-blue.gif"); \}<br/>
-/*div.divbar \{ background-image: url("_httpimg_/bg_green.png"); \}*/<br/>
-div.divbar \{ background-image: url("_httpimg_/divb-blue.gif"); \}<br/>
-</Format>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-20">The selected item on the navigation bar uses the same background, so change that too:</Text>
-<Format>
-/*a.navlink_sel \{ background-image: url("_httpimg_/bg_green.png"); \}*/<br/>
-a.navlink_sel \{ background-image: url("_httpimg_/divb-blue.gif"); \}
-</Format>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-21">Next, we get rid of the background green image on the page and collection titles. Comment out the <Format>p.bannertitle</Format> and <Format>p.collectiontitle</Format> parts:</Text>
-<Format>
-/*p.bannertitle \{background-image: url("_httpimg_/banner_bg.png"); \}*/<br/>
-/*p.collectiontitle \{background-image: url("_httpimg_/banner_bg.png"); \}*/
-</Format>
-</NumberedItem>
-<Text id="mf-22">The above style definitions were included in the macro file so that image paths could be dynamically generated. The majority of the style definitions reside in an external style file, <Path>Greenstone &rarr; images &rarr; style.css</Path>, and most style changes involve modifying that file.</Text>
-<NumberedItem>
-<Text id="mf-23">Open <Path>Greenstone &rarr; images &rarr; style.css</Path> in a text editor. Make the following modifications. You might want to preview after each one to see the effect.</Text>
-<Text id="mf-24">Change some of the colours:</Text>
-<BulletList>
-<Bullet>
-<Text id="mf-27">Find the <Format>body</Format> style instructions:</Text>
-<Format>
-body {<br/>
-  background: #ffffff;<br/>
-  color: #000000;<br/>
-}
-</Format>
-<Text id="mf-27a">Set <Format>color</Format> to <Format>teal</Format>.</Text>
-</Bullet>
-<Bullet>
-<Text id="mf-25">For <Format>a.collectiontitle</Format>, set <Format>color</Format> to <Format>blue</Format>.</Text>
-</Bullet>
-<Bullet>
-<Text id="mf-26">For <Format>p.collectiontitle</Format>, add <Format>color: blue;</Format></Text>
-</Bullet>
-</BulletList>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-28">For fun, lets switch the positions of the home, help and preferences buttons and the collection name or image.</Text>
-<BulletList>
-<Bullet>
-<Text id="mf-29">For <Format>div.pageinfo</Format>, set both <Format>float</Format> and <Format>text-align</Format> to <Format>left</Format>.</Text>
-</Bullet>
-<Bullet>
-<Text id="mf-30">For <Format>div.collectimage</Format>, set <Format>float</Format> and <Format>text-align</Format> to <Format>right</Format>.</Text>
-</Bullet>
-</BulletList>
-<Text id="mf-31">The look of your library should now be substantially different.</Text>
-</NumberedItem>
-<Heading>
-<Text id="mf-32">Adding a footer</Text>
-</Heading>
-<NumberedItem>
-<Text id="mf-33">Next we add a footer to each page. <Path>Greenstone &rarr; macros &rarr; style.dm</Path> defines a header and footer for each page, and macro files for the different pages define the page content. Open the file <Path>Greenstone &rarr; macros &rarr; style.dm</Path> in a text editor.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-34">Locate the <Format>_footer_</Format> macro:</Text>
-<Format>
-_footer_ {<br/>
-&lt;!-- page footer (\_style:footer\_) --&gt;<br/>
-_pagefooterextra__endspacer__htmlfooter_<br/>
-}
-</Format>
-<Text id="mf-35">After <Format>_pagefooterextra_</Format> add some text or HTML. For example <Format>&lt;center&gt;&lt;small&gt;Copyright 2006 My Awesome Digital Library&lt;/small&gt;&lt;/center&gt;</Format>. The resulting macro will look something like:</Text>
-<Format>
-_footer_ {<br/>
-&lt;!-- page footer (\_style:footer\_) --&gt;<br/>
-_pagefooterextra_
-&lt;center&gt;&lt;small&gt;Copyright 2006 My Awesome Digital Library&lt;/small&gt;&lt;/center&gt;
-_endspacer__htmlfooter_<br/>
-}
-</Format>
-<Comment>
-<Text id="mf-36">The <Format>&lt;center&gt;</Format> and <Format>&lt;small&gt;</Format> HTML tags center the text, and make it a smaller size than the rest of the page.</Text>
-</Comment>
-<Text id="mf-37">Save <Path>style.dm</Path> and close the file.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-38">Preview the changes in a web browser. (On Windows, restart the Greenstone library server.) Each page should now have the new text at the bottom.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-39">Adding text into the main <Format>_footer_</Format> macro adds it to all pages. To add a footer just to a particular page, use <Format>_pagefooterextra_</Format> in the appropriate macro file. For example, lets add some more text to the footer, this time just on the home page.</Text>
-<Text id="mf-40">Open the file <Path>Greenstone &rarr; macros &rarr; home.dm</Path> in a text editor. After the line <Format>package home</Format>, add the following text:</Text>
-<Format>
-_pagefooterextra_ {Collections generated by Me.}
-</Format>
-<Text id="mf-41">Save <Path>home.dm</Path> and close the file.</Text>
-<Text id="mf-42">Preview the home page in a web browser. (On Windows, restart the Greenstone library server.) The home page should now display the new text, while the other pages won't.</Text>
-</NumberedItem>
-<Heading>
-<Text id="mf-43">Make your own Greenstone home page</Text>
-</Heading>
-<Text id="mf-44">You can make radical changes to a page by changing the macro file completely. For example, here we use a predefined alternative to the home page.</Text>
-<NumberedItem>
-<Text id="mf-45">Open the file <Path>Greenstone &rarr; etc &rarr; main.cfg</Path> in a text editor. Locate the <AutoText text="macrofiles" type="italics"/> list:</Text>
-<Format>
-# The list of display macro files used by this receptionist<br/>
-macrofiles  tip.dm style.dm base.dm query.dm help.dm pref.dm about.dm \<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;document.dm browse.dm status.dm authen.dm users.dm html.dm \<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;extlink.dm gsdl.dm extra.dm home.dm collect.dm docs.dm \<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bsummary.dm gti.dm gli.dm nav_css.dm usability.dm \<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br/>
-</Format>
-<Text id="mf-46">Change the text <Format>home.dm</Format> to <Format>yourhome.dm</Format>. Save and close the file.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-47">Preview the newly structured home page in a web browser. (On Windows, restart the Greenstone library server.) </Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-48">Reverse this last change by changing <Format>yourhome.dm</Format> back to <Format>home.dm</Format> in the file <Path>Greenstone &rarr; etc &rarr; main.cfg</Path>. You may also like to reverse the other changes you have made.</Text>
-</NumberedItem>
-<Heading>
 <Text id="mf-49">Collection specific customisation</Text>
 </Heading>
-<Text id="mf-50">Macros can also be used to customize single collections. They should be added to a file called <Path>extra.dm</Path> in the <Path>macros</Path> directory of a collection. This part of the exercise can be done using the Librarian Interface.</Text> 
-<Text id="mf-51">We use the Word and PDF collection (from exercise <TutorialRef id="word_pdf_collection"/>) as the example for this exercise, but it can be done with any collection. Open up this collection (reports) in the Librarian Interface.</Text>
-<NumberedItem>
-<Text id="mf-51a">Go to the <AutoText key="glidict::GUI.Format"/> panel, and select <AutoText key="glidict::CDM.GUI.Macros"/> from the left hand list. This section allows you to edit the collection's extra.dm macro file.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-53">First, we change the title of the <AutoText key="coredm::_about:textabcol_"/> section of the about page. Add the following text in the edit box:</Text>
+<Text id="mf-50">Macros can be used to customize single collections by adding them to a file called <Path>extra.dm</Path> in the <Path>macros</Path> directory of a collection.</Text> 
+<Text id="mf-51">We use the Word and PDF collection (from exercise <TutorialRef id="word_pdf_collection"/>) as the example for this exercise, but it can be done with any collection. Open up this collection (<b>reports</b>) in the Librarian Interface.</Text>
+<NumberedItem>
+<Text id="mf-51a">Go to the <AutoText key="glidict::GUI.Format"/> panel, and select <AutoText key="glidict::CDM.GUI.Macros"/> from the left hand list. This section allows you to edit the collection's <i>extra.dm</i> macro file.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-53">First, we change the title of the <AutoText key="coredm::_about:textabcol_"/> section of the about page. Add the following text in the edit box (which can be copied from the file <Path>about_tweak.txt</Path> in the <Path>sample_files &rarr; custom</Path> folder):</Text>
 <Format>
 package about<br/>
@@ -2154,11 +2007,36 @@
 }
 </Format>
-<Text id="mf-55">Preview the collection. (On Windows, restart the Greenstone library server.) The about page will have a new title underneath the search form.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-56">Next we'll do some style customisations for this collection. Add the following text:</Text>
+<Text id="mf-55">Preview the collection by pressing the <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/> button. The <i>About</i> page will have a new title underneath the search form.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-33">Next we add a footer to each page. Add the <Format>_footer_</Format> macro to the end of the edit box (which can be copied from the file <Path>footer_tweak.txt</Path> in the <Path>sample_files &rarr; custom</Path> folder):</Text>
 <Format>
 package Style<br/>
 <br/>
+_footer_ {<br/>
+_pagefooterextra_
+&lt;center&gt;&lt;small&gt;Copyright 2006 My Awesome Digital Library&lt;/small&gt;&lt;/center&gt;
+_endspacer__htmlfooter_<br/>
+}
+</Format>
+<Comment>
+<Text id="mf-36">The <Format>&lt;center&gt;</Format> and <Format>&lt;small&gt;</Format> HTML tags center the text, and make it a smaller size than the rest of the page.</Text>
+</Comment>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-38">Preview the changes in a web browser. Each page should now have the new text at the bottom.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-39">Putting text in the main <Format>_footer_</Format> macro adds it to all pages of this collection. To add a footer just to a particular page, use <Format>_pagefooterextra_</Format> in the appropriate package. For example, lets add some more text to the footer, this time just on the <i>About</i> page.</Text>
+<Text id="mf-40">Add the following text immediately after the line
+<Format>package about</Format> :</Text>
+<Format>
+_pagefooterextra_ {Collection generated by Me.}
+</Format>
+<Text id="mf-42">Preview the <i>About</i> page in a web browser. The <i>About</i> page should now display the new text, while the other pages won't.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-56">Next we'll do some style customisations. Add the following text below the <Format>_footer_</Format> macro (which can be copied from the file <Path>red_tweak.txt</Path> in the <Path>sample_files &rarr; custom</Path> folder)</Text>
+<Format>
 _collectionspecificstyle_ {<br/>
 &lt;style type="text/css"&gt;<br/>
@@ -2174,10 +2052,11 @@
 }
 </Format>
-<Text id="mf-57">Preview the collection. (On Windows, restart the Greenstone library server.) The reports collection will now have a pink background, and the navigation bar and divider bars will be red. These changes will only affect this collection.</Text>
+<Text id="mf-56a">/*...*/ around a line signals a comment, and this style element will be ignored.</Text>
+<Text id="mf-57">Preview the collection. The <b>reports</b> collection will now have a pink background, and the navigation bar and divider bars will be red. These changes will only affect this collection.</Text>
 </NumberedItem>
 <Text id="mf-58">Any macros from the general macro files can be copied into a collection's <Path>extra.dm</Path> file and modified. Remember to include the package declaration to make sure that the macros get applied to the correct page(s).</Text>
 <Text id="mf-59">The style modifications made above were minor. The collection still uses the majority of the standard style file. The style declarations in the <Format>_collectionspecificstyle_</Format> macro get appended to the default ones. To completely change the appearance of a collection, we can use a new style sheet altogether.</Text>
 <NumberedItem>
-<Text id="mf-59a">Add the following to <Path>extra.dm</Path> after the last modifications:</Text>
+<Text id="mf-59a">Add the following text (which can be copied from the file <Path>css_tweak.txt</Path> in the <Path>sample_files &rarr; custom</Path> folder) after the last modifications:</Text>
 <Format>
 _cssheader_ {<br/>
@@ -2190,11 +2069,132 @@
 </NumberedItem>
 <Heading>
+<Text id="mf-73">Changing the colour of the page title and page text</Text>
+</Heading>
+<Text id="mf-17">In the previous exercises we changed a single collection. Now we change all the pages in our Greenstone installation by modifying style and macro files outside the Librarian Interface. First, we format the page so that some other parts are blue. Preview any collection after each change to make sure that it has worked properly. On Windows, macro file changes require a restart of the Greenstone local library server. Stylesheet changes may require a forced reload in the web browser.</Text>
+<!--
+<NumberedItem>
+<Text id="mf-18">First, we'll change the colour of the navigation bar and green divider bars. These use an image as a background, specified in the same macro as the page background.</Text>
+<Text id="mf-19">Open <Path>Greenstone &rarr; macros &rarr; style.dm</Path> in a text editor, and find the <Format>_cssheader_</Format> macro that you modified previously. Change the <Format>div.navbar</Format> and <Format>div.divbar</Format> parts to use <Format>divb-blue.gif</Format> instead of <Format>bg_green.png</Format>:</Text>
+<Format>
+/*div.navbar \{ background-image: url("_httpimg_/bg_green.png"); \}*/<br/>
+div.navbar \{ background-image: url("_httpimg_/divb-blue.gif"); \}<br/>
+/*div.divbar \{ background-image: url("_httpimg_/bg_green.png"); \}*/<br/>
+div.divbar \{ background-image: url("_httpimg_/divb-blue.gif"); \}<br/>
+</Format>
+<Text id="mf-19a">Preview the collection, now the navigation bar and the green divider change to a blue background. Note that when you select a classifier, the background of the selected item is still green.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-20">The selected item on the navigation bar uses the same background, so change that too:</Text>
+<Format>
+/*a.navlink_sel \{ background-image: url("_httpimg_/bg_green.png"); \}*/<br/>
+a.navlink_sel \{ background-image: url("_httpimg_/divb-blue.gif"); \}
+</Format>
+<Text id="mf-20a">Preview the collection, now the selected classifier is also in a blue background.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-21">Next, we get rid of the background green image on the page and collection titles. Comment out the
+<Format>p.bannertitle</Format> and <Format>p.collectiontitle</Format>
+parts.(If a collection title image is used, you won't see the change of the background on the collection titles.)</Text>
+<Format>
+/*p.bannertitle \{background-image: url("_httpimg_/banner_bg.png"); \}*/<br/>
+/*p.collectiontitle \{background-image: url("_httpimg_/banner_bg.png"); \}*/
+</Format>
+<Text id="mf-21a">Preview the collection, the small green background on the collection title image and the page title image is gone.</Text>
+</NumberedItem>
+<Text id="mf-22">The above style definitions were included in the macro file so that image paths could be dynamically generated. </Text>
+-->
+<NumberedItem>
+<Text id="mf-23">The majority of the style definitions reside in an external style file, <Path>Greenstone &rarr; images &rarr; style.css</Path>, and most style changes involve modifying that file. Open <Path>Greenstone &rarr; images &rarr; style.css</Path> in a text editor, e.g. WordPad (and save a .backup copy). Make the following modifications. You might want to preview after each one to see the effect.</Text>
+<Text id="mf-24">Change some of the colours:</Text>
+<BulletList>
+<Bullet>
+<Text id="mf-27">Find the <Format>body</Format> style instructions:</Text>
+<Format>
+body {<br/>
+  background: #ffffff;<br/>
+}
+</Format>
+<Text id="mf-27a">Add <Format>color: teal;</Format></Text>
+</Bullet>
+<Bullet>
+<Text id="mf-25">For <Format>a.collectiontitle</Format>, set <Format>color</Format> to <Format>blue</Format>.</Text>
+</Bullet>
+<Bullet>
+<Text id="mf-26">For <Format>p.collectiontitle</Format>, add <Format>color: blue;</Format></Text>
+</Bullet>
+</BulletList>
+<Text id="mf-27b">Preview the collection. Now text in the page body is a light green color (teal), and the font of the collection title has changed from black to blue.</Text>
+</NumberedItem>
+<comment>(If a collection title image is used, you won't see the change on the collection title.)</comment>
+<NumberedItem>
+<Text id="mf-28">Lets switch the positions of the HOME, HELP and PREFERENCES buttons and the collection name or image.</Text>
+<BulletList>
+<Bullet>
+<Text id="mf-29">For <Format>div.pageinfo</Format>, set both <Format>float</Format> and <Format>text-align</Format> to <Format>left</Format>.</Text>
+</Bullet>
+<Bullet>
+<Text id="mf-30">For <Format>div.collectimage</Format>, set <Format>float</Format> and <Format>text-align</Format> to <Format>right</Format>.</Text>
+</Bullet>
+</BulletList>
+<Text id="mf-31">The look of your library should now be substantially different. The HELP, HOME and PREFERENCES buttons are in the left upper corner whereas the collection title is switched to the right of the page.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-8">Now we will customize the default Greenstone header image and the background image. Two new images for this exercise can be found in <Path>sample_files &rarr; custom</Path>. Copy <Path>newbgimg.gif</Path>, <Path>newheadimg.gif</Path> from the <Path>custom</Path> folder into the <Path>Greenstone &rarr; images</Path> folder.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-9">Open the file <Path>Greenstone &rarr; macros &rarr; home.dm</Path> in a text editor. Find each occurrence of <Format>gsdlhead.gif</Format> in this file (there are two) and replace with <Format>newheadimg.gif</Format>. (If you are using WordPad, you can use <Menu>Edit &rarr; Find</Menu> to search for the text.)</Text>
+<Text id="mf-10">Save <Path>home.dm</Path> and close the file.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-11">Open the file <Path>Greenstone &rarr; macros &rarr; style.dm</Path> with the text editor. Locate the following part of the file (this is part of the <Format>_cssheader_</Format> macro):</Text>
+<Format>
+&lt;style type="text/css"&gt;<br/>
+body.bgimage \{ background-image: url("_httpimg_/chalk.gif"); \}<br/>
+</Format>
+<Text id="mf-12">Use copy and paste on the <Format>body.bgimage</Format> line to make it look like this: </Text>
+<Format>
+&lt;style type="text/css"&gt;<br/>
+/*body.bgimage \{ background-image: url("_httpimg_/chalk.gif"); \}*/<br/>
+body.bgimage \{ background-image: url("_httpimg_/newbgimg.gif"); \}<br/>
+</Format>
+<Text id="mf-13">Here we are changing the background image for the <Format>bgimage</Format> section of the <Format>body</Format> of the page to <Format>newbgimg.gif</Format>.</Text>
+<Text id="mf-14">Save <Path>style.dm</Path> and close the file.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-15">Preview the home page in a web browser. (On Windows, restart the Greenstone library server.) The header and background of every page of each collection should now use the new graphics.</Text>
+</NumberedItem>
+<Heading>
+<Text id="mf-43">Make your own Greenstone home page</Text>
+</Heading>
+<Text id="mf-44">You can make radical change to a page by changing the macro file completely. For example, here we use a alternative to the home page which we have prepared for you in advance and included in your Greenstone installation.</Text>
+<NumberedItem>
+<Text id="mf-45">Open the file <Path>Greenstone &rarr; etc &rarr; main.cfg</Path> in a text editor. Locate the <AutoText text="macrofiles" type="italics"/> list:</Text>
+<Format>
+# The list of display macro files used by this receptionist<br/>
+macrofiles  tip.dm style.dm base.dm query.dm help.dm pref.dm about.dm \<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;document.dm browse.dm status.dm authen.dm users.dm html.dm \<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;extlink.dm gsdl.dm extra.dm home.dm collect.dm docs.dm \<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bsummary.dm gti.dm gli.dm nav_css.dm usability.dm \<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...<br/>
+</Format>
+<Text id="mf-46">Change the text <Format>home.dm</Format> to <Format>yourhome.dm</Format>. Save and close the file.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-47">Preview the newly structured home page in a web browser. (On Windows, restart the Greenstone library server.) Look at the file macros/yourhome.dm in a text editor to see hoe these changes are expressed.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-48">Reverse this last change by changing <Format>yourhome.dm</Format> back to <Format>home.dm</Format> in the file <Path>Greenstone &rarr; etc &rarr; main.cfg</Path>. You may also like to reverse the other changes you have made.</Text>
+<Comment>
+<Text id="mf-15a">The final part of this exercise looks at how we determined which images needed replacing, and which macro files should be edited.</Text>
+</Comment>
+</NumberedItem>
+<Heading>
 <Text id="mf-63">How to determine which images to replace (advanced)</Text>
 </Heading>
 <NumberedItem>
-<Text id="mf-64">In the first part of this exercise we replaced the default background (<AutoText text="chalk.gif"/>) and header (<AutoText text="gsdlhead.gif"/>) images with new ones. To do this we needed to change the image names in the macro files. How did we know which images we were replacing and which macro files to edit? This exercise shows you how to find out.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="mf-65">To find out the names of the images to replace, go to the home page of your digital library in a browser. Right-click on the header image (<AutoText text="Greenstone digital library software" type="quoted"/>) and select "Save picture as". A dialog will pop up and will display the image name: <AutoText text="gsdlhead.gif" type="quoted"/> (or <AutoText text="gsdlhead-blue.gif" type="quoted"/> if you are using the new header). Click Cancel to close the dialog&mdash;you don't need to save the images. Do the same for the background image by right clicking on the left hand green (or blue) swirly bar. This time choose "Save background as" to find the name: <AutoText text="chalk.gif" type="quoted"/> (or <AutoText text="new_background.gif" type="quoted"/>), then click Cancel.</Text>
+<Text id="mf-64">In the step 10 of this exercise we replaced the default background (<AutoText text="chalk.gif"/>) and header (<AutoText text="gsdlhead.gif"/>) images with new ones. To do this we needed to change the image names in the macro files. How did we know which images we were replacing and which macro files to edit? This exercise shows you how to find out.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="mf-65">To find out the names of the images to replace, go to the home page of your digital library in a browser. Right-click on the header image (<AutoText text="Greenstone digital library software" type="quoted"/>) and select "Save picture as". A dialog will pop up and will display the image name: <i><AutoText text="gsdlhead.gif" /></i> (or <i><AutoText text="newheadimg.gif" /></i> if you are using the new header). Click Cancel to close the dialog&mdash;you don't need to save the images. Do the same for the background image by right clicking on the left hand green (or blue) swirly bar. This time choose "Save background as" to find the name: <i><AutoText text="chalk.gif" /></i> (or <i><AutoText text="newbgimg.gif" /></i>), then click Cancel.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2204,10 +2204,10 @@
 <Text id="mf-67">Once you have identified the names of the images to be replaced, you need to find out where they occur in the macro files. To do this, search the macro files for the image names using the <AutoText text="find"/> program, which is run in a command prompt. Open a command prompt using <Menu>Start &rarr; Programs &rarr; Accessories &rarr; Command Prompt</Menu>, or <Menu>Start &rarr; Run</Menu> and enter <Command>cmd</Command> as the name of the program to run.</Text>
 <Text id="mf-68">You can type <Command>find/?</Command> to see a description of the program and its arguments.</Text>
-<Text id="mf-69">To search the macro files for <AutoText text="gsdlhead.gif" type="quoted"/> type</Text>
+<Text id="mf-69">To search the macro files for <i><AutoText text="gsdlhead.gif" /></i> type</Text>
 <Command>find "gsdlhead.gif" "C:\Program Files\Greenstone\macros\*.dm"</Command>
 <Text id="mf-70"><AutoText text="*.dm"/> means all files ending in <AutoText text=".dm"/>. A list of all macro files will be displayed, along with any matches. You will see that <Path>home.dm</Path> and <Path>exported_home.dm</Path> both contain <AutoText text="gsdlhead.gif"/>. <Path>home.dm</Path> in the one you want to edit&mdash;<Path>exported_home.dm</Path> is used for the home page when you export a collection to CD-ROM.</Text>
-<Text id="mf-71">Do the same thing for <AutoText text="chalk.gif" type="quoted"/>:</Text>
+<Text id="mf-71">Do the same thing for <i><AutoText text="chalk.gif" /></i>:</Text>
 <Command>find "chalk.gif" "C:\Program Files\Greenstone\macros\*.dm"</Command>
-<Text id="mf-72"><Path>base.dm</Path> is the only file that mentions this image.</Text>
+<Text id="mf-72"><Path>base.dm</Path> and <Path>style.dm</Path> are the only files that mention this image.</Text>
 <Text id="mf-73">Close the command prompt.</Text>
 </NumberedItem>
@@ -2219,5 +2219,5 @@
 </Title>
 <SampleFiles folder="beatles"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <NumberedItem>
@@ -2255,5 +2255,5 @@
 <Prerequisite id="multimedia_collection_explore"/>
 <SampleFiles folder="beatles"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -2302,5 +2302,5 @@
 </BulletList>
 <Text id="0566"><b>Build</b> the collection again, and <b>preview</b> it.</Text>
-<Text id="0567">Extracted metadata is unreliable. But it is very cheap! On the other hand, manually assigned metadata is reliable, but expensive. The previous section of this exercise has shown how to aim for the best of both worlds by using extracted metadata but correcting it when it is wrong. While this may not satisfy the professional librarian, it could provide a useful compromise for the music teacher who wants to get their collection together with a minimum of effort.</Text>
+<Text id="0567">Extracted metadata is unreliable. But it is very cheap! On the other hand, manually assigned metadata is reliable, but expensive. The previous section of this exercise has shown how to aim for the best of both worlds by using extracted metadata but correcting it when it is wrong.</Text>
 </NumberedItem>
 <Heading>
@@ -2357,5 +2357,7 @@
 <highlight>{If}{[dc.Format] eq 'Images',</highlight><br/> 
 <highlight>[srclink][thumbicon][/srclink],</highlight><br/> 
-<highlight>[link][icon][/link]}}</highlight>&lt;/td&gt; <br/>
+<highlight>{If}{[dc.Format] eq 'Supplementary',</highlight><br/>
+<highlight>[srclink][srcicon][/srclink] [link][icon][/link],</highlight>
+<highlight>[link][icon][/link]}}}</highlight>&lt;/td&gt; <br/>
 &lt;td valign=top&gt;[highlight]<br/>
 {Or}{[dls.Title],[dc.Title],[Title],Untitled}<br/>
@@ -2529,5 +2531,5 @@
 <NumberedItem>
 <Text id="0646">Using the file browser, copy the <Path>images</Path> and <Path>macros</Path> folders from the <Path>advbeat_large</Path> folder into the <Path>smallbea</Path> folder. (It's OK to overwrite the existing <Path>images</Path> folder: the image in it is included in the folder being copied.) The <Path>images</Path> folder includes some useful icons, and the <Path>macros</Path> folder defines some macro names that use these images.</Text>
-<Text id="0646a">To see the macro definitions, open the collection in the LIbrarian Interface (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Open"/></Menu>) and view the <AutoText key="glidict::CDM.GUI.Macros"/> section in the <AutoText key="glidict::GUI.Format"/> panel.</Text>
+<Text id="0646a">To see the macro definitions, open the collection in the Librarian Interface (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Open"/></Menu>) and view the <AutoText key="glidict::CDM.GUI.Macros"/> section in the <AutoText key="glidict::GUI.Format"/> panel.</Text>
 </NumberedItem>
 <Heading>
@@ -2620,5 +2622,5 @@
 </Title>
 <SampleFiles folder="niupepa"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -2635,5 +2637,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0680">Some of the files you have just dragged in are the newspaper images; others are text files that contain the text extracted from these images. We want these to be processed by <AutoText text="PagedImgPlug"/>, not <AutoText text="ImagePlug"/> or <AutoText text="TEXTPlug"/>. Switch to the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel and delete <AutoText text="ImagePlug"/> and <AutoText text="TEXTPlug"/>. While you are at it, you could tidy things up by deleting <AutoText text="ZIPPlug"/> and all plugins from <AutoText text="HTMLPlug"/> to <AutoText text="NULPlug"/> as well, since they will not be used. <AutoText text="GAPlug"/> and <AutoText text="PagedImgPlug"/> remain.</Text>
+<Text id="0680">Some of the files you have just dragged in are the newspaper images; others are text files that contain the text extracted from these images. We want these to be processed by <AutoText text="PagedImgPlug"/>, not <AutoText text="ImagePlug"/> or <AutoText text="TEXTPlug"/>. Switch to the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel and <i>delete <AutoText text="ImagePlug"/> and <AutoText text="TEXTPlug"/></i>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2641,7 +2643,4 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0678a">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section, check the <AutoText key="glidict::CDM.LevelManager.Section"/> checkbox to build the indexes on section level as well as document level.</Text>
-</NumberedItem>
-<NumberedItem>
 <Text id="0681">Now go to the <AutoText key="glidict::GUI.Create"/> panel, <b>build</b> the collection and <b>preview</b> the result. Search for <AutoText text="waka" type="quoted"/> and view one of the titles listed (all three appear as <AutoText text="Te Whetu o Te Tau" type="italics"/>). Browse by <AutoText key="coredm::_Global:labelTitle_"/> and view one of the <AutoText text="Te Waka o Te Iwi" type="italics"/> newspapers. Note that only the <AutoText text="Te Whetu o Te Tau" type="italics"/> newspapers have text; <AutoText text="Te Waka o Te Iwi" type="italics"/> papers don't.</Text>
 </NumberedItem>
@@ -2662,18 +2661,33 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0687">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText key="metadata::ex.Title"/> classifier in the <AutoText key="glidict::CDM.FormatManager.Feature"/> list, and <AutoText text="VList"/> in the <AutoText key="glidict::CDM.FormatManager.Part"/> list. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add this format statment to your collection. Delete the contents of the <AutoText key="glidict::CDM.FormatManager.Editor"/> box, and add the following text. (This format statement can be copied and pasted from the file <Path>sample_files &rarr; niupepa &rarr; formats &rarr; titles_tweak.txt</Path>.)</Text>
+<Text id="0686a"><b>Build</b> the collection, and <b>preview</b> the <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list and the <AutoText key="coredm::_Global:labelDate_" type="italics"/> list.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0687">Now we change the format statement for <AutoText key="coredm::_Global:labelTitle_" type="italics"/> to display more information about the documents. In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText key="metadata::ex.Title"/> classifier in the <AutoText key="glidict::CDM.FormatManager.Feature"/> list, and <AutoText text="VList"/> in the <AutoText key="glidict::CDM.FormatManager.Part"/> list. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add this format statement to your collection. Delete the contents of the <AutoText key="glidict::CDM.FormatManager.Editor"/> box, and add the following text. (This format statement can be copied and pasted from the file <Path>sample_files &rarr; niupepa &rarr; formats &rarr; titles_tweak.txt</Path>.)</Text>
 <Format>
 &lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
 &lt;td valign="top"&gt;<br/>
 {If}{[numleafdocs],[ex.Title] ([numleafdocs]),<br/>
-{If}{[ex.Volume],Volume [ex.Volume] }<br/>
-{If}{[ex.Number],Number [ex.Number] }<br/>
-{If}{[ex.Date], [ex.Date]}}<br/>
+Volume [ex.Volume] Number [ex.Number] Date [ex.Date]}<br/>
 &lt;/td&gt;
 </Format>
 </NumberedItem>
 <NumberedItem>
-<Text id="0690a"><b>Build</b> the collection, and <b>preview</b> the new <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list.</Text>
-<Text id="0687c">As a consequence of using the <AutoText text="AZCompactList"/> classifier, bookshelf icons appear when titles are browsed. This revised format statement has the effect of specifying in brackets how many items are contained within a bookshelf. It works by exploiting the fact that only bookshelf icons define <Format>[numleafdocs]</Format> metadata. For document nodes, Title is not displayed. Instead, Volume, Number and Date information are displayed if present.</Text>
+<Text id="0690a">Refresh in the web browser to view the new <AutoText key="coredm::_Global:labelTitle_" type="italics"/> list.</Text>
+<Text id="0687c">As a consequence of using the <AutoText text="AZCompactList"/> classifier, bookshelf icons appear when titles are browsed. This revised format statement has the effect of specifying in brackets how many items are contained within a bookshelf. It works by exploiting the fact that only bookshelf icons define <Format>[numleafdocs]</Format> metadata. For document nodes, Title is not displayed. Instead, Volume, Number and Date information are displayed.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0691">The <AutoText key="coredm::_Global:labelDate_" type="italics"/> list groups documents by date. A numeric date is displayed at the end of each document title, for example 18580601. This is in the Greenstone internal date format, which is crucial for the <AutoText text="DateList" /> classifier to correctly parse date metadata and generate an ordered date list. However, you can make the date look nice by adding a <AutoText text="[Format:]"/> macro to date metadata.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0691a">Now we format the date. In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText text="DateList" /> classifier <i>and set <AutoText key="glidict::CDM.FormatManager.Part"/> to <AutoText text="DateList"/></i>. Replace the last line</Text>
+<Format>
+&lt;td&gt;{Or}{[dc.Date],[exp.Date],[ex.Date]}&lt;/td&gt;
+</Format>
+<Text id="0691b">with</Text>
+<Format>
+&lt;td&gt;{Or}{[dc.Date],[exp.Date],[format:ex.Date]}&lt;/td&gt;
+</Format>
+<Text id="0691c">Refresh in the web browser to view the new <AutoText key="coredm::_Global:labelDate_" type="italics"/> list.</Text>
 </NumberedItem>
 <Heading>
@@ -2681,8 +2695,8 @@
 </Heading>
 <Comment>
-<Text id="0695">When you reach a newspaper, only its associated text is displayed. When either of the <AutoText text="Te Waka o Te Iwi"/> newspapers is accessed, the document view presents the message <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/>. No scanned image information (screen-view resolution or otherwise) is shown, even though it has been computed and stored with the document. This can be fixed by a format statement that modifies the default behaviour for <AutoText text="DocumentText"/>.</Text>
-</Comment>
-<NumberedItem>
-<Text id="0696">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText text="DocumentText"/> format statement. The default format string displays the document's plain text, which, if there is none, is set to <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/>. Change this to the following text. (This format statement can be copied and pasted from the file <Path>sample_files &rarr; niupepa &rarr; formats &rarr; doc_tweak.txt</Path>)</Text>
+<Text id="0695">When you reach a newspaper, only its associated text is displayed. When either of the <AutoText text="Te Waka o Te Iwi"/> newspapers is accessed, the document view presents the message <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/> No scanned image information (screen-view resolution or otherwise) is shown, even though it has been computed and stored with the document. This can be fixed by a format statement that modifies the default behaviour for <AutoText text="DocumentText"/>.</Text>
+</Comment>
+<NumberedItem>
+<Text id="0696">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText text="DocumentText"/> format statement. The default format string displays the document's plain text, which, if there is none, is set to <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/> Change this to the following text. (This format statement can be copied and pasted from the file <Path>sample_files &rarr; niupepa &rarr; formats &rarr; doc_tweak.txt</Path>)</Text>
 <Format>
 &lt;table&gt;&lt;tr&gt;<br/>  
@@ -2692,5 +2706,5 @@
 </Format>
 <Comment>
-<Text id="0698">Including <Format>[screenicon]</Format> has the effect of embedding the screen-sized image generated by switching the <AutoText text="screenview"/> option on in <AutoText text="PagedImgPlug"/>. It is hyperlinked to the original image by the construct <Format>[srclink]...[/srclink]</Format>.</Text>
+<Text id="0698">Including <Format>[screenicon]</Format> has the effect of embedding the screen-sized image generated by switching the <AutoText text="screenview"/> option on in <AutoText text="PagedImgPlug"/>. It is hyperlinked to the original image by the construct <Format>[srclink]...[/srclink]</Format>. This is a large image but it may be scaled by your browser.</Text>
 </Comment>
 <Text id="0698a">This modification will display screenview image, but does nothing about the dummy text <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/>, which will still be displayed. To get rid of this, edit the <AutoText text="DocumentText"/> format statement again and replace</Text>
@@ -2700,9 +2714,9 @@
 <Text id="0698b">with</Text>
 <Format>
-{If}{[Text] ne "<AutoText key="perlmodules::BasPlug.dummy_text" type="plain"/> ",&lt;td valign=top&gt;[Text]&lt;/td&gt;}
-</Format>
-</NumberedItem>
-<NumberedItem>
-<Text id="0698c"><b>Preview</b> the collection and view one of the <AutoText text="Te Waka o Te Iwi"/> documents. The line <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/> should now be gone. (Note that it important to get the text exactly right for this to work, including the space after the ".".)</Text>
+{If}{[NoText] ne '1',&lt;td valign=top&gt;[Text]&lt;/td&gt;}
+</Format>
+</NumberedItem>
+<NumberedItem>
+<Text id="0698c"><b>Preview</b> the collection and view one of the <AutoText text="Te Waka o Te Iwi"/> documents. The line <AutoText key="perlmodules::BasPlug.dummy_text" type="quoted"/> should now be gone.</Text>
 </NumberedItem>
 <Heading>
@@ -2716,15 +2730,17 @@
 </NumberedItem>
 <NumberedItem>
+<Text id="0690e"><b>Build</b> and <b>preview</b> the collection.</Text>
+</NumberedItem>
+<NumberedItem>
 <Text id="0690d-1">Set the display text used for the level drop-down menu by going to the <AutoText key="glidict::CDM.GUI.SearchMetadata"/> section on the <AutoText key="glidict::GUI.Format"/> panel. Set the document level text to "newspaper", and the section level text to "page".</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0690e"><b>Build</b> and <b>preview</b> the collection. Compare searching at "newspaper" level compared to  "page" level. A useful search term for this collection is <AutoText text="aroha" type="quoted"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0690f">You will notice that when searching for individual pages, the newspaper image is displayed in the search results. As these images are very large, this is not very useful. Go to <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel in the Librarian Interface and select the <AutoText text="VList"/> format statement from the list of assigned format statements. Remove the second line from the <AutoText key="glidict::CDM.FormatManager.Editor"/>:</Text>
+<Text id="0690d-2">Refresh in your web browser. Compare searching at "newspaper" level with searching at "page" level. A useful search term for this collection is <AutoText text="aroha" type="quoted"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0690f">You will notice that when searching for individual pages, the newspaper image is displayed in the search results. As these images are very large, this is not very useful. Go to <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel in the Librarian Interface, choose <AutoText key="glidict::CDM.FormatManager.AllFeatures"/>  in <AutoText key="glidict::CDM.FormatManager.Feature"/> list, and select the <AutoText text="VList"/> format statement from the list of assigned format statements. Remove the second line from the <AutoText key="glidict::CDM.FormatManager.Editor"/>:</Text>
 <Format>
 &lt;td valign="top"&gt;[ex.srclink]{Or}{[ex.thumbicon],[ex.srcicon]}[ex./srclink]&lt;/td&gt;
 </Format>
-<Text id="0690f-1">While we are here, lets remove the filename from the display. Remove the following from the last line:</Text>
+<Text id="0690f-1">The reason why this is causing a problem is that the <AutoText text="PagedImgPlug"/> does not produce ex.thumbicon, and as a consequence this format statement displays ex.srcicon, which is very large  </Text>
+<Text id="0690f-2">While we are here, let's remove the filename from the display. Remove the following from the last line of the format string:</Text>
 <Format>
 {If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}
@@ -2740,16 +2756,47 @@
 &lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
 &lt;td valign="top"&gt;<br/>
-{If}{[parent:ex.Title],[parent:ex.Title]<br/>
-{If}{[parent:ex.Volume],Volume [parent:ex.Volume] }<br/>
-{If}{[parent:ex.Number],Number [parent:ex.Number]}: Page [ex.Title],<br/>
-[ex.Title] {If}{[ex.Volume], Volume [ex.Volume] }<br/>
-{If}{[ex.Number], Number [ex.Number] }}<br/>
-&lt;br/&gt;&lt;i&gt;({Or}{[parent:ex.Date],[ex.Date]})&lt;/i&gt;&lt;/td&gt;<br/>
+{If}{[parent:ex.Title],[parent:ex.Title] Volume [parent:ex.Volume] Number [parent:ex.Number]: Page [ex.Title],<br/>
+[ex.Title] Volume [ex.Volume] Number [ex.Number]}<br/>
+&lt;br/&gt;&lt;i&gt;({Or}{[parent:ex.Date],[ex.Date],undated})&lt;/i&gt;&lt;/td&gt;<br/>
 &lt;/td&gt;
 </Format>
-<Text id="0690l"><b>Preview</b> the search results. Items display newspaper title, Volume, Number and Date if available, and pages also display the page number.</Text>
-</NumberedItem>
-<Comment>
-<Text id="0701">In the collection you have just built, newspapers are grouped by series title, and dates are supplied alongside each one to distinguish it from others in the same series. Users can browse chronologically by date, and when a newspaper page is viewed a preview image is shown on the left that displays the original high-resolution version when clicked, accompanied on the right by the plain-text version of that newspaper (if available).</Text>
+<Text id="0690l"><b>Preview</b> the search results. Items display newspaper title, Volume, Number and Date, and pages also display the page number.</Text>
+</NumberedItem>
+<Comment>
+<Text id="0701">The collection you have just built involves a fairly complex document structure. There are two series of newspapers, <AutoText text="Te Waka"/> and <AutoText text="Te Whetu"/>.</Text>
+</Comment>
+<Comment>
+<Text id="0701-a">In the <AutoText text="Te Waka"/> series there are two actual newspapers, <AutoText text="Volume 1" type="italics"/> Numbers 1 and 2. Number 1 has 4 pages, numbered 1, 2, 3, 4; Number 2 has 4 pages, numbered 5, 6, 7, 8. The page numbers increase consecutively through each volume, despite the fact that the volume is divided into different Numbers. Each page in the Te Waka series is represented by a single file, a GIF image of the page.</Text>
+</Comment>
+<Comment>
+<Text id="0701-b">The <AutoText text="Te Whetu"/> series has three actual newspapers, <AutoText text="Volume 1" type="italics"/> Numbers 1, 2, and 3. Number 1 has 4 pages, numbered 1, 2, 3, 4; Number 2 has 5 pages, numbered 5, 6, 7, 8, 9; Number 3 has 5 pages, numbered 10, 11, 12, 13, 14. Again the page numbers increase consecutively through each volume. Each page in this series is represented by two files, a GIF image of the page and a text file containing the OCRâd text that appears on it.</Text>
+</Comment>
+<Comment>
+<Text id="0701-c">The key to this structure is in the respective <i>.item</i> files. Here is a synopsis of the information they contain:</Text>
+<Format>
+(9-1-1)	Te Waka Volume 1 Number 1<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.1 gif<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.2 gif<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.3 gif<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.4 gif<br/>
+(9-1-2)	Te Waka Volume 1 Number 2<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.5 gif<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.6 gif<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.7 gif<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.8 gif<br/>
+(10-1-1)	Te Whetu Volume 1 Number 1<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.1 gif text<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.2 gif text<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.3 gif text<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.4 gif text<br/>
+(10-1-2)	Te Whetu Volume 1 Number 2<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.5 gif text<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;âŠ<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.9 gif text<br/>
+(10-1-3)	Te Whetu Volume 1 Number 3<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.10 gif text<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;âŠ<br/>
+&nbsp;&nbsp;&nbsp;&nbsp;p.14 gif text<br/>
+</Format>
 </Comment>
 </Content>
@@ -2761,5 +2808,5 @@
 <SampleFiles folder="niupepa"/>
 <Prerequisite id="scanned_image_collection"/>
-<Version initial="2.70" current="2.71"/>
+<Version initial="2.70" current="2.80"/>
 <Content>
 <Comment>
@@ -2815,5 +2862,5 @@
 <Text id="sc21">The second style is an extended format, and uses XML. It allows a hierarchy of pages, and metadata specification at the page level as well as at the document level. In this section, we add in two newspapers which use XML-based item files.</Text>
 <NumberedItem>
-<Text id="sc22">In the <AutoText key="glidict::GUI.Gather"/> panel, add the folder <Path>sample_files &rarr; niupepa &rarr; new_papers &rarr; xml</Path> to your collection. </Text>
+<Text id="sc22">In the <AutoText key="glidict::GUI.Gather"/> panel, add the folder <Path>sample_files &rarr; niupepa &rarr; new_papers &rarr; xml</Path> (you need to add the <AutoText text="xml"/> folder, not the <AutoText text="23"/> folder) to your collection. </Text>
 </NumberedItem>
 <NumberedItem>
@@ -2867,5 +2914,5 @@
 {If}{[srcicon],_document:viewfullsize_}<br/>
 {If}{[screenicon],_document:viewpreview_}<br/>
-{If}{[Text] ne 'This document has no text. ',_document:viewtext_}<br/>
+{If}{[NoText] ne '1',_document:viewtext_}<br/>
 &lt;/div&gt;<br/>
 &lt;div class="toc"&gt;[DocTOC]&lt;/div&gt;<br/>
@@ -2881,5 +2928,5 @@
 {If}{_cgiargp_ eq 'fullsize',[srcicon],<br/>
 {If}{_cgiargp_ eq 'preview',[screenicon],<br/>
-{If}{[Text] ne \'This document has no text. \',[Text],[screenicon]}}}
+{If}{[NoText] ne '1',[Text],[screenicon]}}}
 </Format>
 <Text id="sc34b">This format statement changes the display based on the <AutoText text="p" type="quoted"/> argument (<Format>_cgiargp_</Format>). This is not used normally for document display, so we can use it here to switch between full size image (<Format>[srcicon]</Format>), preview size image (<Format>[screenicon]</Format>) and text (<Format>[Text]</Format>) versions of each page.</Text>
@@ -2895,5 +2942,5 @@
 </Title>
 <SampleFiles folder="oai"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -2995,5 +3042,5 @@
 </Title>
 <Prerequisite id="OAI_collection"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -3020,5 +3067,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="oai-8">Downloaded files are stored in a top-level folder called <AutoText key="glidict::Tree.DownloadedFiles"/> that appears on the left-hand side of the <AutoText key="glidict::GUI.Gather"/> panel. These can files can then be added to a collection.</Text> 
+<Text id="oai-8">Downloaded files are stored in a top-level folder called <AutoText key="glidict::Tree.DownloadedFiles"/> that appears on the left-hand side of the <AutoText key="glidict::GUI.Gather"/> panel. These files can then be added to a collection.</Text> 
 </NumberedItem>
 <Heading>
@@ -3075,8 +3122,8 @@
 <Text id="0750">Use METS as Greenstone's Internal Representation</Text>
 </Title>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <NumberedItem>
-<Text id="0751">In the Greenstone Librarian Interface, open up one of your existing collections, for example the <b>hobbits</b> collection.</Text>
+<Text id="0751">In the Greenstone Librarian Interface, open up one of your existing collections, for example the <b>Small HTML Collection</b> collection.</Text>
 </NumberedItem>
 <Comment>
@@ -3105,5 +3152,5 @@
 </Title>
 <SampleFiles folder="dspace"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <NumberedItem>
@@ -3113,7 +3160,10 @@
 <Text id="0763">Start a <b>new collection</b> called <b>StoneD</b> and fill out its fields appropriately. Leave the metadata set at Dublin Core, the default.</Text>
 </NumberedItem>
+<!-- don't need to remove the plugins -->
+<!--
 <NumberedItem>
 <Text id="0764">Switch to the <AutoText key="glidict::GUI.Design"/> panel and select the <AutoText key="glidict::CDM.GUI.Plugins"/> section on the left-hand side. <b>Remove</b> <AutoText text="ZIPPlug" />, <AutoText text="TEXTPlug" />, <AutoText text="HTMLPlug" />, <AutoText text="EMAILPlug" />, <AutoText text="PSPlug" />, <AutoText text="ImagePlug" />, <AutoText text="ISISPlug" /> and <AutoText text="NULPlug" />. Strictly speaking we do not need to remove these, however it reduces clutter.</Text>
 </NumberedItem>
+-->
 <NumberedItem>
 <Text id="0765">Now add <AutoText text="DSpacePlug" />. Leave the plugin options at their defaults and press <AutoText key="glidict::General.OK" type="button"/>.</Text>
@@ -3192,5 +3242,5 @@
 </Title>
 <Prerequisite id="dspace_to_greenstone"/>
-<Version initial="2.60" current="2.71"/>
+<Version initial="2.60" current="2.80"/>
 <Content>
 <Comment>
@@ -3235,5 +3285,5 @@
 <Text id="gems-1">Editing metadata sets</Text>
 </Title>
-<Version initial="2.70w" current="2.71"/>
+<Version initial="2.70w" current="2.80"/>
 <Content>
 <Text id="gems-2">GEMS (Greenstone Editor for Metadata Sets) can be used to modify existing metadata sets or create new ones. GEMS is launched from the Librarian Interface when you want to create a new metadata set, or edit an existing one. In this exercise, we run GEMS outside of the Librarian Interface.</Text>
@@ -3252,5 +3302,5 @@
 </Heading>
 <NumberedItem>
-<Text id="gems-8">In this exercise, we will create a new metadata set. In order to save time, we will base it on an existing one: Development Library Subset. From the <AutoText key="glidict::Menu.File"/> menu, select <AutoText key="glidict::Menu.File_New"/> (<AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_New"/>). A popup window appears: <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Title"/>. Fill in the fields. Use <AutoText text="My Metadata Set" type="quoted"/> for the <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Metadata_Title"/>, <AutoText text="my" type="quoted"/> for the <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Metadata_Namespace"/>, and select "Development Library Subset Example Metadata" from the <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Base_MetadataSet"/> drop down list. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
+<Text id="gems-8">In this exercise, we will create a new metadata set. In order to save time, we will base it on an existing one: Development Library Subset. From the <AutoText key="glidict::Menu.File"/> menu, select <AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_New"/>. A popup window appears: <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Title"/>. Fill in the fields. Use <AutoText text="My Metadata Set" type="quoted"/> for the <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Metadata_Title"/>, <AutoText text="my" type="quoted"/> for the <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Metadata_Namespace"/>, and select "Development Library Subset Example Metadata" from the <AutoText key="glidict::GEMS.NewMetadataSetPrompt.Base_MetadataSet"/> drop down list. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -3264,5 +3314,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="gems-12">In the right hand side, the default attributes will appear for the new element. "Label" and "definition" are used in the Librarian Interface when displaying metadata elements and their descriptions. These attributes can be set in multiple languages.</Text>
+<Text id="gems-12">In the right hand side, the default attributes will appear for the new element. "Label" and "definition" are used in the Librarian Interface when displaying metadata elements and their descriptions (the "definition" is shown as additional text for the element). These attributes can be set in multiple languages.</Text>
 </NumberedItem>
 <NumberedItem>
Index: documentation/trunk/tutorials/xml-source/tutorial_es.xml
===================================================================
--- documentation/trunk/tutorials/xml-source/tutorial_es.xml	(revision 14545)
+++ documentation/trunk/tutorials/xml-source/tutorial_es.xml	(revision 17494)
@@ -4,4 +4,5 @@
      <!ENTITY rarr "&#8594;">
      <!ENTITY mdash "&#8212;">
+     <!ENTITY copy "&#169;">
 ]>
 <TutorialList>
@@ -18,4 +19,5 @@
 <Text id="wiki">Back to wiki</Text><Updated date="2-Mar-2006"/>
 <Text id="print">Imprima versiÃ³n</Text><Updated date="29-Mar-2006"/>
+<Text id="copyright">Copyright &copy; 2005 2006 2007 by the <Link url="http://www.nzdl.org">New Zealand Digital Library Project</Link> at <Link url="http://www.waikato.ac.nz">the University of Waikato</Link>, New Zealand<br/>Permission is granted to copy, distribute and/or modify this document under the terms of the <Link url="http://www.gnu.org/licenses/fdl.html">GNU Free Documentation License</Link>, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled <Link url="http://greenstonewiki.cs.waikato.ac.nz/wiki/gsdoc/GNUFDL.html">âGNU Free Documentation License.â</Link></Text>
 </SupplementaryText>
 <Comment>
Index: documentation/trunk/tutorials/xml-source/tutorial_fr.xml
===================================================================
--- documentation/trunk/tutorials/xml-source/tutorial_fr.xml	(revision 14545)
+++ documentation/trunk/tutorials/xml-source/tutorial_fr.xml	(revision 17494)
@@ -4,4 +4,5 @@
      <!ENTITY rarr "&#8594;">
      <!ENTITY mdash "&#8212;">
+     <!ENTITY copy "&#169;">
 ]>
 <TutorialList>
@@ -18,4 +19,5 @@
 <Text id="wiki">Back to wiki</Text><Updated date="2-Mar-2006"/>
 <Text id="print">Imprimer version</Text><Updated date="2-Apr-2006"/>
+<Text id="copyright">Copyright &copy; 2005 2006 2007 by the <Link url="http://www.nzdl.org">New Zealand Digital Library Project</Link> at <Link url="http://www.waikato.ac.nz">the University of Waikato</Link>, New Zealand<br/>Permission is granted to copy, distribute and/or modify this document under the terms of the <Link url="http://www.gnu.org/licenses/fdl.html">GNU Free Documentation License</Link>, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled <Link url="http://greenstonewiki.cs.waikato.ac.nz/wiki/gsdoc/GNUFDL.html">âGNU Free Documentation License.â</Link></Text>
 </SupplementaryText>
 <Comment>
Index: documentation/trunk/tutorials/xml-source/tutorial_ru.xml
===================================================================
--- documentation/trunk/tutorials/xml-source/tutorial_ru.xml	(revision 14545)
+++ documentation/trunk/tutorials/xml-source/tutorial_ru.xml	(revision 17494)
@@ -4,4 +4,5 @@
      <!ENTITY rarr "&#8594;">
      <!ENTITY mdash "&#8212;">
+     <!ENTITY copy "&#169;">
 ]>
 <TutorialList>
@@ -18,4 +19,5 @@
 <Text id="wiki">Back to wiki</Text><Updated date="2-Mar-2006"/>
 <Text id="print">ÐÐµÑÑÐžÑ ÐŽÐ»Ñ Ð¿ÐµÑÐ°ÑÐž</Text><Updated date="29-Mar-2006"/>
+<Text id="copyright">Copyright &copy; 2005 2006 2007 by the <Link url="http://www.nzdl.org">New Zealand Digital Library Project</Link> at <Link url="http://www.waikato.ac.nz">the University of Waikato</Link>, New Zealand<br/>Permission is granted to copy, distribute and/or modify this document under the terms of the <Link url="http://www.gnu.org/licenses/fdl.html">GNU Free Documentation License</Link>, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled <Link url="http://greenstonewiki.cs.waikato.ac.nz/wiki/gsdoc/GNUFDL.html">âGNU Free Documentation License.â</Link></Text>
 </SupplementaryText>
 <Comment>
