Index: /trunk/gsdl-documentation/tutorials/xml-source/tutorial_en.xml
===================================================================
--- /trunk/gsdl-documentation/tutorials/xml-source/tutorial_en.xml	(revision 13134)
+++ /trunk/gsdl-documentation/tutorials/xml-source/tutorial_en.xml	(revision 13135)
@@ -875,5 +875,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0310b">Modify the <AutoText key="metadata::ex.Title"/> index to include <AutoText key="metadata::dc.Title"/> by selecting the index in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> box and clicking <AutoText key="glidict::CDM.IndexManager.Edit_Index" type="button"/>. Select <AutoText key="metadata::dc.Title"/> from the list of metadata, and click <AutoText key="glidict::CDM.IndexManager.MGPP.Replace_Index" type="button"/>. Searching this index will search both dc.Title and ex.Title metadata. If you want to restrict searching to just the manually added dc.Title metadata, edit the index again and deselect <AutoText key="metadata::ex.Title"/> from the list of metadata.</Text>
+<Text id="0310b">Modify the <AutoText key="metadata::ex.Title"/> index to include <AutoText key="metadata::dc.Title"/> by selecting the index in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> box and clicking <AutoText key="glidict::CDM.IndexManager.Edit_Index" type="button"/>. Select <AutoText key="metadata::dc.Title"/> from the list of metadata, and click <AutoText key="glidict::CDM.IndexManager.Replace_Index" type="button"/>. Searching this index will search both dc.Title and ex.Title metadata. If you want to restrict searching to just the manually added dc.Title metadata, edit the index again and deselect <AutoText key="metadata::ex.Title"/> from the list of metadata.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -907,8 +907,8 @@
 </Heading>
 <NumberedItem>
-<Text id="">The default display text for the indexes in the drop-down list on the search page contains the content of the index. Now we will change this display text to make it nicer. Go to the <AutoText key="glidict::GUI.Format"/> panel by clicking its tab. This panel is split into several sections, each controlling some aspect of collection presentation.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="">Select <AutoText key="glidict::CDM.GUI.SearchMetadata"/> in the left hand list. This pane allows you to modify what text is displayed for the drop-down lists in the search form (indexes, subcollections, levels etc). Set the  <AutoText key="glidict::CDM.SearchMetadataManager.Component_Name"/> for the <AutoText text="dc.Title,Title"/> index to be "titles", and that for the <AutoText text="dc.Creator"/> index to be "creators". Preview the collection by clicking the <AutoText key="glidict::CreatePane.Preview_Collection"/>. The search form should display the new text.</Text>
+<Text id="0321-2">The default display text for the indexes in the drop-down list on the search page contains the content of the index. Now we will change this display text to make it nicer. Go to the <AutoText key="glidict::GUI.Format"/> panel by clicking its tab. This panel is split into several sections, each controlling some aspect of collection presentation.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0321-3">Select <AutoText key="glidict::CDM.GUI.SearchMetadata"/> in the left hand list. This pane allows you to modify what text is displayed for the drop-down lists in the search form (indexes, subcollections, levels etc). Set the  <AutoText key="glidict::CDM.SearchMetadataManager.Component_Name"/> for the <AutoText text="dc.Title,Title"/> index to be "titles", and that for the <AutoText text="dc.Creator"/> index to be "creators". Preview the collection by clicking the <AutoText key="glidict::CreatePane.Preview_Collection"/>. The search form should display the new text.</Text>
 </NumberedItem>
 <Heading>
@@ -1377,5 +1377,4 @@
 </Content>
 </Tutorial>
-<!-- ** here -->
 <Tutorial id="enhanced_html_collection">
 <Title>
@@ -1383,5 +1382,5 @@
 </Title>
 <Prerequisite id="large_html_collection"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -1450,6 +1449,6 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0451">Having defined the subcollections, we partition the index into corresponding parts. Click the <AutoText key="glidict::CDM.SubcollectionManager.Subindex_Controls"/> tab. Select the first subcollection and give it the name <b>citizens</b>; click <AutoText key="glidict::CDM.SubcollectionIndexManager.Add_Subindex" type="button"/>. Repeat for the other three subcollections, naming their partitions <b>monarchs</b>, <b>others</b> and <b>relatives</b>.</Text>
-<Text id="0451a">The order they appear in the <AutoText key="glidict::CDM.SubcollectionIndexManager.Subindexes"/> list os the order they will appear in the drop down menu on the search page. You can change the order by using the <AutoText key="glidict::CDM.Move.Move_Up" type="button"/> and <AutoText key="glidict::CDM.Move.Move_Down" type="button"/> buttons.</Text>
+<Text id="0451">Having defined the subcollection filters, we partition the index into corresponding parts. Click the <AutoText key="glidict::CDM.SubcollectionManager.Subindex_Controls"/> tab. Select the citizens subcollection and click <AutoText key="glidict::CDM.SubcollectionIndexManager.Add_Subindex" type="button"/>. Next select monarchs, and click <AutoText key="glidict::CDM.SubcollectionIndexManager.Add_Subindex" type="button"/>. Repeat for the other two subcollections, so that you end up with four partitions, one based on each subcollection filter.</Text>
+<Text id="0451a">The order they appear in the <AutoText key="glidict::CDM.SubcollectionIndexManager.Subindexes"/> list is the order they will appear in the drop down menu on the search page. You can change the order by using the <AutoText key="glidict::CDM.Move.Move_Up" type="button"/> and <AutoText key="glidict::CDM.Move.Move_Down" type="button"/> buttons.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1460,5 +1459,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0453">To allow users to search the collection as a whole as well as each subcollection individually, return to the <AutoText key="glidict::CDM.GUI.Subcollections"/> section of the <AutoText key="glidict::GUI.Design"/> panel and select the <AutoText key="glidict::CDM.SubcollectionManager.Subindex_Controls"/> tab. Type <b>all</b> into the <AutoText key="glidict::CDM.SubcollectionIndexManager.PartitionName"/> and select all four subcollections by checking their boxes. Click <AutoText key="glidict::CDM.SubcollectionIndexManager.Add_Subindex" type="button"/>.</Text>
+<Text id="0453">To allow users to search the collection as a whole as well as each subcollection individually, return to the <AutoText key="glidict::CDM.GUI.Subcollections"/> section of the <AutoText key="glidict::GUI.Design"/> panel and select the <AutoText key="glidict::CDM.SubcollectionManager.Subindex_Controls"/> tab. Select all four subcollections by checking their boxes and click <AutoText key="glidict::CDM.SubcollectionIndexManager.Add_Subindex" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1469,4 +1468,7 @@
 </NumberedItem>
 <NumberedItem>
+<Text id="0455a">The text in the drop down box on the search page is based on the filters each partition was built on. To change the text that is displayed, go to the <AutoText key="glidict::CDM.GUI.SearchMetadata"/> section of the <AutoText key="glidict::GUI.Format"/> panel. The single filter partitions have sensible default text, but the combined partition does not. Set the <AutoText key="glidict::CDM.SearchMetadataManager.Component_Name"/> for the combined partition to "all". <b>Preview</b> the collection.</Text>
+</NumberedItem>
+<NumberedItem>
 <Text id="0456">Return to <AutoText key="glidict::Preferences.Mode.Librarian"/> mode, using <AutoText key="glidict::Menu.File_Options"/> (on the <AutoText key="glidict::Menu.File"/> menu).</Text>
 </NumberedItem>
@@ -1481,6 +1483,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0464">Preview the newly rebuilt collection's <AutoText key="coredm::_Global:labelTitle_"/>
- page. Previously this listed more than a dozen pages per letter of the alphabet, but now there are just three&mdash;the first three files encountered by the building process.</Text>
+<Text id="0464">Preview the newly rebuilt collection's <AutoText key="coredm::_Global:labelTitle_"/> page. Previously this listed more than a dozen pages per letter of the alphabet, but now there are just three&mdash;the first three files encountered by the building process.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1494,8 +1495,8 @@
 </Title>
 <Prerequisite id="large_html_collection"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <NumberedItem>
-<Text id="0468">Open up your <b>tudor</b> collection, go to the <AutoText key="glidict::GUI.Design"/> panel (by clicking on its tab) and select <AutoText key="glidict::CDM.GUI.Formats"/> from the left-hand list. Leave the editing controls at their default value, so that <AutoText key="glidict::CDM.FormatManager.Feature"/> remains blank and <AutoText text="VList"/> is selected as the <AutoText key="glidict::CDM.FormatManager.Part"/>. The text in the <AutoText key="glidict::CDM.FormatManager.Editor"/> box reads as follows:</Text>
+<Text id="0468">Open up your <b>tudor</b> collection, go to the <AutoText key="glidict::GUI.Format"/> panel (by clicking on its tab) and select <AutoText key="glidict::CDM.GUI.Formats"/> from the left-hand list. Leave the editing controls at their default value, so that <AutoText key="glidict::CDM.FormatManager.Feature"/> displays <AutoText key="glidict::CDM.FormatManager.AllFeatures" type="italics"/> and <AutoText text="VList"/> is selected as the <AutoText key="glidict::CDM.FormatManager.Part"/>. The text in the <AutoText key="glidict::CDM.FormatManager.Editor"/> box reads as follows:</Text>
 <Format>
 &lt;td valign=top&gt;[link][icon][/link]&lt;/td&gt;<br/>
@@ -1510,8 +1511,8 @@
 </Indent>
 <Text id="0472">for a particular document whose <i>Title</i> metadata is <AutoText text="A discussion of question five from Tudor Quiz: Henry VIII"/> and whose <i>Source</i> metadata is <AutoText text="quizstuff.html"/>.</Text>
-<Text id="0473">This format appears in the search results list, in the <AutoText key="coredm::_Global:labelTitle_"/> list, and also when you get down to individual documents in the <AutoText key="coredm::_Global:labelTitle_"/> hierarchy. This is Greenstone's default format statement.</Text>
-</NumberedItem>
-<Comment>
-<Text id="0474">Greenstone's default format statement is complex&mdash;even baroque&mdash;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.</Text>
+<Text id="0473">This format appears in the search results list, in the <AutoText key="coredm::_Global:labelTitle_"/> list, and also when you get down to individual documents in the <AutoText key="coredm::_Global:labelSubject_"/> hierarchy. This is Greenstone's default format statement.</Text>
+</NumberedItem>
+<Comment>
+<Text id="0474">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.</Text>
 </Comment>
 <NumberedItem>
@@ -1523,5 +1524,4 @@
 &lt;/td&gt;
 </Format>
-<Text id="0475a">Remember to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text> 
 <Text id="0476"><b>Preview</b> the result (you don't need to build the collection, because changes to format statements take effect immediately). Look at some search results and at the <AutoText key="coredm::_Global:labelTitle_"/> list. They are just the same as before! Under most circumstances this far simpler format statement is entirely equivalent to Greenstone's more complex default. </Text>
 <Comment>
@@ -1530,9 +1530,10 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0482">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Design"/> panel, the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu (just above <AutoText key="glidict::CDM.FormatManager.Part"/> menu) is blank. That implies that the same format is used for the search results, titles, and all nodes in the subject hierarchy&mdash;including internal nodes (that is, bookshelves). The <AutoText key="glidict::CDM.FormatManager.Feature"/> menu can be used to restrict a format statement to a specific one of these lists; when it's blank, the <AutoText text="VList" /> specification applies throughout. We will override this format statement for the hierarchical <i>subject</i> classifier. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu, scroll down to the item that says</Text>
+<Text id="0482">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu (just above <AutoText key="glidict::CDM.FormatManager.Part"/> menu) displays <AutoText key="glidict::CDM.FormatManager.AllFeatures" type="italics"/>. That implies that the same format is used for the search results, titles, and all nodes in the subject hierarchy&mdash;including internal nodes (that is, bookshelves). The <AutoText key="glidict::CDM.FormatManager.Feature"/> menu can be used to restrict a format statement to a specific one of these lists. We will override this format statement for the hierarchical <i>subject</i> classifier. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu, scroll down to the item that says</Text>
 <Indent>
 CL2: Hierarchy -metadata dc.Subject and Keywords
 </Indent> 
 <Text id="0483">and select it. This is the format statement that affects the second classifier (i.e., "CL2"), which is a <AutoText text="Hierarchy"/> classifier based on <b>dc.Subject and Keywords</b> metadata.</Text>
+<Text id="0483a">Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add this format statement to the collection.</Text>
 <Text id="0484">Edit the <AutoText key="glidict::CDM.FormatManager.Editor"/> box below to read</Text>
 <Format>
@@ -1540,11 +1541,10 @@
 &lt;td&gt;[ex.Title]&lt;/td&gt;
 </Format> 
-<Text id="0485">and click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0486">Now go to the <AutoText key="glidict::GUI.Create"/> panel and click <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/>. First, the offending "()" has disappeared from the bookshelves. Second, when you get down to a list of documents in the subject hierarchy, the filename does not appear beside the title, because <AutoText key="metadata::ex.Source"/> is not specified in the format statement and this format statement applies to all nodes in the <i>subject</i> classifier. Note that the search results and titles lists have not changed: they still display the filename underneath the title.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0487">Let's change the search results format so that <i>dc.Subject and Keywords</i> metadata is displayed here instead of the filename. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu (under <AutoText key="glidict::CDM.GUI.Formats"/> on the <AutoText key="glidict::GUI.Design"/> panel), scroll down to the item <AutoText text="Search"/> and select it. Change the <AutoText key="glidict::CDM.FormatManager.Editor"/> box below to read</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0486"><b>Preview</b> the <AutoText key="coredm::_Global:labelSubject_"/> list in the collection. First, the offending "()" has disappeared from the bookshelves. Second, when you get down to a list of documents in the subject hierarchy, the filename does not appear beside the title, because <AutoText key="metadata::ex.Source"/> is not specified in the format statement and this format statement applies to all nodes in the <i>subject</i> classifier. Note that the search results and titles lists have not changed: they still display the filename underneath the title.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0487">Let's change the search results format so that <AutoText key="metadata::dc.Subject"/> metadata is displayed here instead of the filename. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu (under <AutoText key="glidict::CDM.GUI.Formats"/> on the <AutoText key="glidict::GUI.Format"/> panel), scroll down to the item <AutoText text="Search"/> and select it. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add this format statement to the collection. Change the <AutoText key="glidict::CDM.FormatManager.Editor"/> box below to read</Text>
 <Format>
 &lt;td&gt;[link][icon][/link]&lt;/td&gt;<br/>
@@ -1553,19 +1553,18 @@
 &lt;/td&gt;<br/>
 </Format> 
-<Text id="0488">and click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0489">To insert the <b>[dc.Subject]</b>, position the cursor at the appropriate point and either type it in, or use the <AutoText key="glidict::CDM.FormatManager.Variable"/> drop down menu&mdash;the one that says <AutoText text="[Text]"/>. Make it say <b>[dc.Subject]</b> and click <AutoText key="glidict::CDM.FormatManager.Insert" type="button"/> to insert this into the <AutoText key="glidict::CDM.FormatManager.Editor"/>. This menu shows many of the things that you can put in square brackets in the format statement.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0490">Now go to the <AutoText key="glidict::GUI.Create"/> panel and click <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/>. Documents in the search results list will be displayed like this:</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0489">To insert the <AutoText text="[dc.Subject]"/>, position the cursor at the appropriate point and either type it in, or select it from the <AutoText key="glidict::CDM.FormatManager.Insert_Variable"/> drop down menu. This menu shows many of the things that you can put in square brackets in the format statement.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0490"><b>Preview</b> the collection. Documents in the search results list will be displayed like this:</Text>
 <table><tr><td><img width='15' height='20' src="../tutorial_files/itext.gif" /></td><td width='408' valign='top'>A discussion of question five from Tudor Quiz: Henry VIII <br/>
 Tudor period|Others</td></tr></table>
-<Text id="0493">(The vertical bar appears because this <i>dc.Subject and Keywords</i> metadata is hierarchical metadata. Unfortunately there is no way to get at individual components of the hierarchy. For most metadata, such as title and author, this isn't a problem.)</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0494">Finally, let's return to the <i>subjects</i> hierarchy and learn how to do different things to the bookshelves and to the documents themselves. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu, re-select the item</Text>
+<Text id="0493">(The vertical bar appears because this <AutoText key="metadata::dc.Subject"/> metadata is hierarchical metadata. Unfortunately there is no way to get at individual components of the hierarchy. For most metadata, such as title and author, this isn't a problem.)</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0494">Finally, let's return to the <AutoText key="coredm::_Global:labelSubject_" type="italics"/> hierarchy and learn how to do different things to the bookshelves and to the documents themselves. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu, re-select the item</Text>
 <Indent>
-CL2: Hierarchy -metadata dc.Subject and Keywords
+CL2: Hierarchy -metadata <AutoText key="metadata::dc.Subject" type="plain"/>
 </Indent> 
 <Text id="0495">Edit the <AutoText key="glidict::CDM.FormatManager.Editor"/> box below to read</Text>
@@ -1576,5 +1575,5 @@
 &lt;/td&gt;
 </Format> 
-<Text id="0496">and click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>. Again, you can insert the items in square brackets by selecting them from the <AutoText key="glidict::CDM.FormatManager.Variable"/> drop down box (don't forget to click <AutoText key="glidict::CDM.FormatManager.Insert" type="button"/>).</Text>
+<Text id="0496">Again, you can insert the items in square brackets by selecting them from the <AutoText key="glidict::CDM.FormatManager.Insert_Variable"/> drop down box.</Text>
 <Comment>
 <Text id="0497">The <AutoText text="If"/> statement tests the value of the variable <AutoText text="numleafdocs"/>. This variable is only set for internal nodes of the hierarchy, i.e. bookshelves, and gives the number of documents below that node. If it is set we take the first branch, otherwise we take the second. Commas are used to separate the branches. The curly brackets serve to indicate that the <AutoText text="If"/> is special&mdash;otherwise the word <AutoText text="If" type="quoted"/> itself would be output.</Text>
@@ -1582,5 +1581,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0498">Go to the <AutoText key="glidict::GUI.Create"/> panel, click <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/>, and examine the subject hierarchy again to see the effect of your changes. Bookshelves should say <AutoText text="Bookshelf title:"/> and then the title, while documents will  display <AutoText text="Title:"/> and the title. Note that the number of documents in the bookshelf is not displayed: we are using <Format>[numleafdocs]</Format> to test what kind of item in the list we are at, but we are not displaying it.</Text>
+<Text id="0498"><b>Preview</b> the collection and examine the subject hierarchy again to see the effect of your changes. Bookshelves should say <AutoText text="Bookshelf title:"/> and then the title, while documents will display <AutoText text="Title:"/> and the title. Note that the number of documents in the bookshelf is not displayed: we are using <Format>[numleafdocs]</Format> to test what kind of item in the list we are at, but we are not displaying it.</Text>
 </NumberedItem>
 </Content>
@@ -1636,5 +1635,4 @@
 <NumberedItem>
 <Text id="st-7">Open the Greenstone demo collection in the Librarian Interface. In the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, note that <AutoText text="HTMLPlug"/> has the <AutoText text="description_tags"/> option set. This option is needed when Section tags are used in the source documents.</Text>
-<Text id="st-8">The <AutoText text="metadata_fields"/> option is not valid when <AutoText text="description_tags"/> is set&mdash;all metadata is expected to be in the Section tags if they are being used.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1647,5 +1645,5 @@
 <Text id="0411">Downloading files from the web</Text>
 </Title>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -1661,15 +1659,16 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0415a">In the <AutoText key="glidict::GUI.Download"/> panel, enter this URL</Text>
+<Text id="0415a">Go to the <AutoText key="glidict::GUI.Download"/> panel by clicking its tab. There are four download types listed on the left hand side. For this exercise, we only use the <AutoText key="glidict::DOWNLOAD.MODE.WebDownload"/> type. Make sure this is selected in the list.</Text>
+<Text id="0415b">Enter this URL</Text>
 <Link>http://englishhistory.net/tudor/citizens/</Link> 
-<Text id="0417">into the <AutoText key="glidict::Mirroring.Source_URL"/> box. There are several options that govern how the download process proceeds. To copy just the <i>citizens</i> section of the website, select <AutoText key="glidict::Mirroring.Higher_Directories"/>. If you don't do this (or if you miss out the terminating "/"), the downloading process will follow links to other areas of the <i>englishhistory.net</i> website and grab those as well. Set <AutoText key="glidict::Mirroring.Download_Depth"/> to <AutoText key="glidict::Mirroring.Download_Depth.Unlimited"/>&mdash;we want to follow as many links as necessary to download all the pages.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0417a">If your computer is behind a firewall or proxy server, you will need to edit the proxy settings in the Librarian Interface. Open the <AutoText key="glidict::Preferences.Connection"/> tab in <Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Options"/></Menu> and switch on the <AutoText key="glidict::Preferences.Connection.Use_Proxy"/> checkbox. Enter the proxy server address and port number in the <AutoText key="glidict::Preferences.Connection.Proxy_Host"/> and <AutoText key="glidict::Preferences.Connection.Proxy_Port"/> boxes. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0418">Now click <AutoText key="glidict::Mirroring.Download" type="button"/>. If you have set proxy information in <AutoText key="glidict::Menu.File_Options"/>, a popup will ask for you user name and password. Once the download has started, a progress bar appears in the lower half of the panel that reports on how the downloading process is doing.</Text>
-<Comment>
-<Text id="0419">More detailed information can be obtained by clicking <AutoText key="glidict::Mirroring.DownloadJob.Log" type="button"/>. The process can be paused and restarted as needed, or stopped altogether by clicking <AutoText key="glidict::Mirroring.DownloadJob.Close" type="button"/>. Downloading can be a lengthy process involving multiple sites, and so Greenstone allows additional downloads to be queued up. When new URLs are pasted into the <AutoText key="glidict::Mirroring.Source_URL"/> box and <AutoText key="glidict::Mirroring.Download" type="button"/> clicked, a new progress bar is appended to those already present in the lower half of the panel. When the currently active download item completes, the next is started automatically.</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 the option, hover the mouse over the option 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>
+</NumberedItem>
+<NumberedItem>
+<Text id="0417a">If your computer is behind a firewall or proxy server, you will need to edit the proxy settings in the Librarian Interface. Click the <AutoText key="glidict::Mirroring.Preferences" type="button"/> button. Switch on the <AutoText key="glidict::Preferences.Connection.Use_Proxy"/> checkbox. Enter the proxy server address and port number in the <AutoText key="glidict::Preferences.Connection.Proxy_Host"/> and <AutoText key="glidict::Preferences.Connection.Proxy_Port"/> boxes. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0418">Now click <AutoText key="glidict::Mirroring.Download" type="button"/>. If you have set proxy information in <AutoText key="glidict::Menu.File_Options"/>, a popup will ask for your user name and password. Once the download has started, a progress bar appears in the lower half of the panel that reports on how the downloading process is doing.</Text>
+<Comment>
+<Text id="0419">More detailed information can be obtained by clicking <AutoText key="glidict::Mirroring.DownloadJob.Log" type="button"/>. The process can be paused and restarted as needed, or stopped altogether by clicking <AutoText key="glidict::Mirroring.DownloadJob.Close" type="button"/>. Downloading can be a lengthy process involving multiple sites, and so Greenstone allows additional downloads to be queued up. When new URLs are pasted into the <AutoText text="url"/> box and <AutoText key="glidict::Mirroring.Download" type="button"/> clicked, a new progress bar is appended to those already present in the lower half of the panel. When the currently active download item completes, the next is started automatically.</Text>
 </Comment>
 </NumberedItem>
@@ -1688,5 +1687,5 @@
 </Title>
 <Prerequisite id="downloading_from_internet"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <NumberedItem>
@@ -1707,9 +1706,8 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0430">To make use of the new URL metadata, the icon link must be changed to serve up the original URL rather than the copy stored in the digital library. Go to the <AutoText key="glidict::GUI.Design"/> panel, select the <AutoText key="glidict::CDM.GUI.Formats"/> section and edit the <AutoText text="VList" /> format statement by replacing</Text>
+<Text id="0430">To make use of the new URL metadata, the icon link must be changed to serve up the original URL rather than the copy stored in the digital library. Go to the <AutoText key="glidict::GUI.Format"/> panel, select the <AutoText key="glidict::CDM.GUI.Formats"/> section and edit the <AutoText text="VList" /> format statement by replacing</Text>
 <Format>[link][icon][/link]</Format>
 <Text id="0431">with</Text>
 <Format>[weblink][webicon][/weblink]</Format>
-<Text id="0432">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/> to commit the change.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1723,12 +1721,11 @@
 </Title>
 <SampleFiles folder="marc"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
-<Text id="0520a">This exercise looks at adding fielded searching to 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"/>. There is no need to include any metadata sets because the metadata extracted from the MARC records will appear as extracted metadata. Deselect the <b>Dublin Core</b> metadata set, and click <AutoText key="glidict::General.OK" type="button"/>.</Text>
-<Text id="0521a">A <AutoText key="glidict::NoMetadataSetsSelected.Title"/> warning message will pop-up, alerting you to the fact that you won't be able to manually assign metadata to the collection. In this collection, all the metadata will come from the MARC file; click <AutoText key="glidict::General.OK" type="button"/> to continue. (If you don't want to see this popup again, tick the <AutoText key="glidict::WarningDialog.Dont_Show_Again"/> checkbox.)</Text>
+<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>
@@ -1756,14 +1753,17 @@
 </NumberedItem>
 <Heading>
-<Text id="0531">Adding fielded searching</Text>
-</Heading>
-<NumberedItem>
-<Text id="0532">In the <AutoText key="glidict::GUI.Design"/> panel select <AutoText key="glidict::CDM.GUI.SearchTypes"/> from the left-hand list and activate the <AutoText key="glidict::CDM.SearchTypeManager.Enable"/> option.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0532a">Add form searching to the collection by selecting <AutoText text="form"/> in the <AutoText key="glidict::CDM.SearchTypeManager.SearchType_Selection"/> menu and clicking <AutoText key="glidict::CDM.SearchTypeManager.Add" type="button"/>. Remove plain searching by selecting <AutoText text="plain"/> in the <AutoText key="glidict::CDM.SearchTypeManager.Assigned"/> list, and clicking <AutoText key="glidict::CDM.SearchTypeManager.Remove" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533"><b>Build</b> the collection once again, and <b>preview</b> the results. 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 to control the advanced searching options.</Text>
+<Text id="0531">Using fielded searching</Text>
+</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_"/>. The search form has changed to a fielded form.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0531b">You can specify which search form types are available for a particular collection, and which one is the default using the <AutoText text="SearchTypes"/> format statement. In the <AutoText key="glidict::GUI.Format"/> panel select <AutoText key="glidict::CDM.GUI.Formats"/> from the left-hand list. Select the <AutoText text="SearchTypes"/> format statement from the list of assigned formats, and set the contents to <AutoText text="form"/>. This will make only fielded searching available for this collection.</Text>
+<Comment>
+<Text id="0531c">Search type options include <AutoText text="form"/> and <AutoText text="plain"/>. You can specify one or both separated by a comma. If both are specified, the first one is used as the default: this is the one that the user will see when they first enter the collection.</Text>
+</Comment>
+</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>
 </NumberedItem>
 <NumberedItem>
@@ -1771,8 +1771,11 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0533c">In the <AutoText key="glidict::GUI.Design"/> panel, go to the <AutoText key="glidict::CDM.GUI.Indexes"/> section. Add an index on <b>subjects</b> by selecting <AutoText key="metadata::ex.Subject"/> from the <AutoText key="glidict::CDM.IndexManager.Source"/> list (and deselecting anything already selected), and giving it a name in the <AutoText key="glidict::CDM.IndexManager.Index_Name"/> box, e.g. "Subject". Click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533d"><b>Rebuild</b> the collection and <b>preview</b> the results. Notice the extra fields in the <AutoText key="coredm::_query:textinfield_"/> drop-down menus in the search form. You can do quite complicated queries by searching for words in different fields at the same time.</Text>
+<Text id="0533c">In the <AutoText key="glidict::GUI.Design"/> panel, go to the <AutoText key="glidict::CDM.GUI.Indexes"/> section. Add a new index based on <AutoText key="metadata::ex.Subject"/> by clicking <AutoText key="glidict::CDM.IndexManager.New_Index" type="button"/>, selecting <AutoText key="metadata::ex.Subject"/> in the list of metadata, and clicking <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533d"><b>Rebuild</b> the collection and <b>preview</b> the results. Notice the extra field in the <AutoText key="coredm::_query:textinfield_"/> drop-down menus in the search form. You can do quite complicated queries by searching for words in different fields at the same time.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533e">To change the text that is displayed in the drop-down menus of the search form, go to the <AutoText key="glidict::CDM.GUI.SearchMetadata"/> section of the <AutoText key="glidict::GUI.Format"/> panel. Here you can change the display text for the indexes.</Text>
 </NumberedItem>
 <Heading>
@@ -1782,5 +1785,5 @@
 <Text id="0533-3">Go to the <AutoText key="glidict::GUI.Enrich"/> panel and try to see the metadata. It doesn't appear! This is because the metadata is associated with records inside the file, not the file itself.</Text>
 <Text id="0533-4">Metadata file types, such as MARC, CDS/ISIS, BibTex etc. can be imported into Greenstone but their metadata cannot be viewed in the Librarian Interface. To edit any metadata you need to go back to the program that created the file.</Text>
-<Text id="0533-5">Greenstone provides a new way of <i>exploding</i> a metadata database so that each record appears as an individual document, with viewable and editable metadata. This process is irreversible: once this step has been done, the database is deleted and can no longer be used in its original program.</Text>
+<Text id="0533-5">Greenstone provides a way of <i>exploding</i> a metadata database so that each record appears as an individual document, with viewable and editable metadata. This process is irreversible: once this step has been done, the database is deleted and can no longer be used in its original program.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1807,8 +1810,8 @@
 <Text id="0533-12b">We need to modify the collection design to take note of these changes.</Text>
 <NumberedItem>
-<Text id="0533-13">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section, change the Title index to use <AutoText key="metadata::exp.Title"/>: select the Title index in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> list. Deselect <AutoText key="metadata::ex.Title"/> in the <AutoText key="glidict::CDM.IndexManager.Source"/> list, and select <AutoText key="metadata::exp.Title"/>. Click <AutoText key="glidict::CDM.IndexManager.MGPP.Replace_Index" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-13a">Remove the <AutoText key="metadata::ex.Subject"/> index by selecting it in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> list and clicking <AutoText key="glidict::CDM.IndexManager.Remove_Index" type="button"/>. Add an index on <AutoText key="metadata::exp.Subject"/>: type "Subject" in the <AutoText key="glidict::CDM.IndexManager.Index_Name"/> field, select <AutoText key="metadata::exp.Subject"/> in the <AutoText key="glidict::CDM.IndexManager.Source"/> list (making sure nothing else is selected), and click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>.</Text>
+<Text id="0533-13">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section, change the Title index to use <AutoText key="metadata::exp.Title"/>: select the Title index in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> list and click <AutoText key="glidict::CDM.IndexManager.Edit_Index" type="button"/>. Deselect <AutoText key="metadata::ex.Title"/> in the list of metadata, and select <AutoText key="metadata::exp.Title"/>. Click <AutoText key="glidict::CDM.IndexManager.Replace_Index" type="button"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533-13a">Remove the <AutoText key="metadata::ex.Subject"/> index by selecting it in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> list and clicking <AutoText key="glidict::CDM.IndexManager.Remove_Index" type="button"/>. Add an index on <AutoText key="metadata::exp.Subject"/>: click <AutoText key="glidict::CDM.IndexManager.New_Index" type="button"/>,  select <AutoText key="metadata::exp.Subject"/> in the metadata list, and click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -1816,14 +1819,14 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0533-14a">To enable combined searching across all indexes at once, tick the <AutoText key="glidict::CDM.IndexManager.Allfields_Index"/> checkbox, enter an appropriate name in the <AutoText key="glidict::CDM.IndexManager.Index_Name"/> field (e.g. "All Fields", then click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>. Move this to the top of the list using the <AutoText key="glidict::CDM.Move.Move_Up" type="button"/> and <AutoText key="glidict::CDM.Move.Move_Down" type="button"/> buttons, so that it appears first in the drop down list. Click <AutoText key="glidict::CDM.IndexManager.Set_Default" type="button"/> so that it becomes the default field for searching.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-15">In the <AutoText key="glidict::CDM.GUI.Classifiers"/> section, change the Title <AutoText text="AZList"/> to use <AutoText key="metadata::exp.Title"/> metadata. Double click the 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"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-16">In the <AutoText key="glidict::CDM.GUI.Formats"/> section, select <AutoText text="VList"/> in the list of assigned format statements.</Text>
+<Text id="0533-14a">To enable combined searching across all indexes at once, click <AutoText key="glidict::CDM.IndexManager.New_Index" type="button"/>, tick the <AutoText key="glidict::CDM.IndexManager.Allfields_Index"/> checkbox, and click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>. Move this to the top of the list using the <AutoText key="glidict::CDM.Move.Move_Up" type="button"/> and <AutoText key="glidict::CDM.Move.Move_Down" type="button"/> buttons, so that it appears first in the drop down list. Click <AutoText key="glidict::CDM.IndexManager.Set_Default" type="button"/> so that it becomes the default field for searching.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533-15">In the <AutoText key="glidict::CDM.GUI.Classifiers"/> section, change the Title <AutoText text="AZList"/> to use <AutoText key="metadata::exp.Title"/> metadata. Double click the 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-16">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.</Text>
 <BulletList>
 <Bullet>
-<Text id="0533-16a">There is no dls or dc Title, 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 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>
 </Bullet>
 <Bullet>
@@ -1841,8 +1844,7 @@
 [/highlight]&lt;/td&gt;
 </Format>
-<Text id="0533-18">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0533-19">Clear the <AutoText text="DocumentHeading"/> format statement by selecting it in the list of assigned format statements, deleting the contents in the <AutoText key="glidict::CDM.FormatManager.Editor"/>, and clicking <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>. The record Title will be displayed as part of the <AutoText text="DocumentText"/> format, so we don't need it here. </Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0533-19">Clear the <AutoText text="DocumentHeading"/> format statement by selecting it in the list of assigned format statements and deleting the contents in the <AutoText key="glidict::CDM.FormatManager.Editor"/>. The record Title will be displayed as part of the <AutoText text="DocumentText"/> format, so we don't need it here. </Text>
 </NumberedItem>
 <NumberedItem>
@@ -1855,8 +1857,7 @@
 &lt;/table&gt;
 </Format>
-<Text id="0533-21">Remember to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</NumberedItem>
-<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, make it empty, and click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
+</NumberedItem>
+<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>
@@ -1875,8 +1876,8 @@
 </Comment>
 <NumberedItem>
-<Text id="is-3">Start a new collection called <b>ISIS Collection</b>, fill out appropriate fields for it, and choose <b>Dublin Core</b> as the metadata set.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="is-4">Drag the files from <Path>sample_files &rarr; isis</Path> into the collection. </Text>
+<Text id="is-3">Start a new collection called <b>ISIS Collection</b>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="is-4">Drag the files from <Path>sample_files &rarr; isis</Path> (excluding the <Path>format_tweaks</Path> folder) into the collection. </Text>
 </NumberedItem>
 <NumberedItem>
@@ -1884,11 +1885,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="is-6">In the <AutoText key="glidict::GUI.Design"/> panel select <AutoText key="glidict::CDM.GUI.SearchTypes"/> from the left-hand list and activate the <AutoText key="glidict::CDM.SearchTypeManager.Enable"/> option.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="is-7">Add form searching to the collection by selecting <AutoText text="form"/> in the <AutoText key="glidict::CDM.SearchTypeManager.SearchType_Selection"/> menu and clicking <AutoText key="glidict::CDM.SearchTypeManager.Add" type="button"/>. Remove plain searching by selecting <AutoText text="plain"/> in the <AutoText key="glidict::CDM.SearchTypeManager.Assigned"/> list, and clicking <AutoText key="glidict::CDM.SearchTypeManager.Remove" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="is-8">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section, remove the useless Source and Title indexes, and add new indexes for Photographer^all, Country^all and Notes^all metadata.</Text>
+<Text id="is-8">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section of the <AutoText key="glidict::GUI.Design"/> panel, remove the useless Source and Title indexes, and add new indexes for Photographer^all, Country^all and Notes^all metadata.</Text>
 <Text id="is-9">CDS/ISIS metadata has subfields, and these are represented using ^.</Text>
 </NumberedItem>
@@ -1897,33 +1892,33 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="is-11">In the <AutoText key="glidict::CDM.GUI.Formats"/> section, change the <AutoText text="VList"/> format statement to display <AutoText text="Photographer"/> and <AutoText text="Notes"/> metadata. Change it to look like:</Text>
+<Text id="is-12"><b>Rebuild</b> and <b>preview</b> the collection. </Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="is-11">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, change the <AutoText text="VList"/> format statement to display <AutoText text="Photographer"/> and <AutoText text="Notes"/> metadata. Change it to look like:</Text>
 <Format>
 &lt;td valign=top&gt;[link][icon][/link]&lt;/td&gt;<br/>
 &lt;td valign=top&gt;&lt;b&gt;[ex.Photographer^all]&lt;/b&gt;&lt;br/&gt;[ex.Notes^all]&lt;/td&gt;
 </Format>
-<Text id="is-11a">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="is-12"><b>Rebuild</b> and <b>preview</b> the collection. </Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="is-11a">Make fielded searching the default by changing the <AutoText text="SearchTypes"/> format statement to <AutoText text="form,plain"/> (instead of <AutoText text="plain,form"/>).</Text>
 </NumberedItem>
 <Text id="is-13"><AutoText text="ISISPlug"/> stores a nicely formatted version of the record as the document text, and this is what is displayed when we view a record. Lets tidy it up a little more.</Text>
 <NumberedItem>
-<Text id="is-14">In the <AutoText key="glidict::CDM.GUI.Formats"/> section, remove the <AutoText key="coredm::_document:textDETACH_" type="italics"/> and <AutoText key="coredm::_document:textNOHIGHLIGHT_" type="italics"/> buttons by setting the <AutoText text="DocumentButtons"/> format statement to empty, and clicking <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="is-15">Remove the <AutoText text="Untitled" type="quoted"/> at the top of the document by setting the <AutoText text="DocumentHeading"/> format statement to empty and clicking <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="is-16">Finally, lets link to the raw record, which is stored as <AutoText text="ISISRawRecord"/> metadata. Edit the <AutoText text="DocumentText"/> format statement to look like:</Text>
+<Text id="is-14">Remove the <AutoText key="coredm::_document:textDETACH_" type="italics"/> and <AutoText key="coredm::_document:textNOHIGHLIGHT_" type="italics"/> buttons by setting the <AutoText text="DocumentButtons"/> format statement to empty.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="is-15">Remove the <AutoText text="Untitled" type="quoted"/> at the top of the document by setting the <AutoText text="DocumentHeading"/> format statement to empty.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="is-16">Finally, lets link to the raw record, which is stored as <AutoText text="ISISRawRecord"/> metadata. Edit the <AutoText text="DocumentText"/> format statement to look like the following. (This format can be copied from <Path>sample_files &rarr; isis &rarr; format_tweaks &rarr; document_text.txt</Path>.)</Text>
 <Format>
 &lt;p&gt;[Text]&lt;/p&gt;<br/>
 {If}{_cgiargshowrecord_, <br/>
-&lt;b&gt;CDS Record:&lt;/b&gt;&lt;br/&gt;&lt;tt&gt;[ISISRawRecord]&lt;/tt&gt;&lt;p/&gt;<br/>
+&lt;p&gt;&lt;b&gt;CDS Record:&lt;/b&gt;&lt;br/&gt;&lt;tt&gt;[ISISRawRecord]&lt;/tt&gt;&lt;/p&gt;<br/>
 &lt;center&gt;&lt;a href=\'_gwcgi_?e=_cgiarge_&amp;a=d&amp;d=_cgiargd_\'&gt;Hide CDS Record&lt;/a&gt;&lt;/center&gt;, <br/>
 &lt;center&gt;&lt;a href=\'_gwcgi_?e=_cgiarge_&amp;a=d&amp;d=_cgiargd_&amp;showrecord=1\'&gt;Show CDS Record&lt;/a&gt;&lt;/center&gt;<br/>
 }
 </Format>
-<Text id="is-16a">Don't forget to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-
 </NumberedItem>
 <NumberedItem>
@@ -1937,5 +1932,5 @@
 </Title>
 <SampleFiles folder="custom"/>
-<Version initial="2.70" current="2.70w"/>
+<Version initial="2.70" current="2.71"/>
 <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>
@@ -1943,5 +1938,5 @@
 <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-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. You will not need the Librarian Interface for this exercise.</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>
@@ -1951,5 +1946,5 @@
 </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 each one 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-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>
@@ -2089,7 +2084,6 @@
 &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 \<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;english.dm english2.dm french.dm french2.dm spanish.dm \<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;spanish2.dm russian.dm russian2.dm usability.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>
@@ -2101,15 +2095,14 @@
 <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.</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. </Text>
-<NumberedItem>
-<Text id="mf-52">Create a new macros folder for the collection: <Path>Greenstone &rarr; collect &rarr; reports &rarr; macros</Path>. Copy the file <Path>Greenstone &rarr; macros &rarr; extra.dm</Path> into the new folder.</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 to the <Path>extra.dm</Path> file:</Text>
+<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>
 <Format>
 package about<br/>
@@ -2122,9 +2115,8 @@
 }
 </Format>
-<Text id="mf-54">Save the file.</Text>
 <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 to <Path>extra.dm</Path>:</Text>
+<Text id="mf-56">Next we'll do some style customisations for this collection. Add the following text:</Text>
 <Format>
 package Style<br/>
@@ -2155,5 +2147,5 @@
 }
 </Format>
-<Text id="mf-60">Copy the file <Path>sample_files &rarr; custom &rarr; style-blue.css</Path> into the collection's <Path>images</Path> folder: <Path>Greenstone &rarr; collect &rarr; reports &rarr; images</Path> (you may need to create this folder).</Text>
+<Text id="mf-60">Outside of the Librarian Interface, locate the collection folder <Path>Greenstone &rarr; collect &rarr; reports &rarr;</Path>. Create an <Path>images</Path> folder inside this, and copy the file <Path>sample_files &rarr; custom &rarr; style-blue.css</Path> into this folder.</Text>
 <Text id="mf-61">Preview the collection; it should look radically different.</Text>
 </NumberedItem>
@@ -2173,14 +2165,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>
 <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>
 <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-73">Close the command prompt.</Text>
 </NumberedItem>
@@ -2192,5 +2180,5 @@
 </Title>
 <SampleFiles folder="beatles"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <NumberedItem>
@@ -2228,5 +2216,5 @@
 <Prerequisite id="multimedia_collection_explore"/>
 <SampleFiles folder="beatles"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -2234,5 +2222,5 @@
 </Comment>
 <NumberedItem>
-<Text id="0552">Start a new collection (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_New"/></Menu>) called <b>small beatles</b>, basing it on the default "New Collection." (Basing it on the existing Advanced Beatles collection would make your life far easier, but we want you to learn how to build it from scratch!) Fill out the fields with appropriate information. Use the Dublin Core metadata set (set by default).</Text>
+<Text id="0552">Start a new collection (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_New"/></Menu>) called <b>small beatles</b>, basing it on the default <AutoText key="glidict::NewCollectionPrompt.NewCollection"/>. (Basing it on the existing Advanced Beatles collection would make your life far easier, but we want you to learn how to build it from scratch!) Fill out the fields with appropriate information.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2296,5 +2284,5 @@
 </Bullet>
 <Bullet>
-<Text id="0574">Add an <AutoText text="AZCompactList" /> classifier. Select <AutoText key="metadata::dc.Format"/> as the <AutoText text="metadata"/> field and specify "browse" as the <AutoText text="buttonname"/>. Click the <AutoText text="sort"/> checkbox, and specify "Title" in the adjacent text box: this will make the classifier display documents in alphabetical order of title.</Text>
+<Text id="0574">Add an <AutoText text="AZCompactList" /> classifier. Select <AutoText key="metadata::dc.Format"/> as the <AutoText text="metadata"/> field and specify "browse" as the <AutoText text="buttonname"/>. Click the <AutoText text="sort"/> checkbox, and select <AutoText key="metadata::ex.Title"/> in the drop-down list: this will make the classifier display documents in alphabetical order of title.</Text>
 </Bullet>
 </BulletList>
@@ -2302,5 +2290,5 @@
 </NumberedItem>
 <Comment>
-<Text id="0575a">Note how we assigned dc.Format metadata to all documents in the collection with a minimum of labour. We did this by capitalizing on the folder structure of the original information. Even though we complained earlier about how messy this folder structure is, you can still take advantage of it when assigning metadata.</Text>
+<Text id="0575a">Note how we assigned <AutoText key="metadata::dc.Format"/> metadata to all documents in the collection with a minimum of labour. We did this by capitalizing on the folder structure of the original information. Even though we complained earlier about how messy this folder structure is, you can still take advantage of it when assigning metadata.</Text>
 </Comment>
 <Heading>
@@ -2311,5 +2299,5 @@
 <BulletList>
 <Bullet>
-<Text id="0581">Change to the <AutoText key="glidict::GUI.Design"/> panel and select the <AutoText key="glidict::CDM.GUI.Formats"/> section.</Text>
+<Text id="0581">Change to the <AutoText key="glidict::GUI.Format"/> panel and select the <AutoText key="glidict::CDM.GUI.Formats"/> section.</Text>
 </Bullet>
 <Bullet>
@@ -2336,11 +2324,8 @@
 </Format> 
 </Bullet>
-<Bullet>
-<Text id="0584">Then click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</Bullet>
 </BulletList>
 <Text id="0585">To make this easier for you we have prepared a plain text file that contains the new text. In WordPad open the following file:</Text>
 <Path>sample_files &rarr; beatles &rarr; format_tweaks &rarr; audio_tweak.txt</Path> 
-<Text id="0586">(Be sure to use WordPad rather than Notepad, because Notepad does not display the line breaks correctly.) Place it in the copy buffer by highlighting the text in WordPad and selecting <Menu>Edit &rarr; Copy</Menu>. Now move back to the Librarian Interface, highlight all the text that makes up the current <AutoText text="VList"/> format statement, and use <Menu><AutoText key="glidict::Menu.Edit"/> &rarr; <AutoText key="glidict::Menu.Edit_Paste"/></Menu> to transform the old statement to the new one. Remember to press <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/> when finished.</Text>
+<Text id="0586">(Be sure to use WordPad rather than Notepad, because Notepad does not display the line breaks correctly.) Place it in the copy buffer by highlighting the text in WordPad and selecting <Menu>Edit &rarr; Copy</Menu>. Now move back to the Librarian Interface, highlight all the text that makes up the current <AutoText text="VList"/> format statement, and use <Menu><AutoText key="glidict::Menu.Edit"/> &rarr; <AutoText key="glidict::Menu.Edit_Paste"/></Menu> to transform the old statement to the new one.</Text>
 <Text id="0589"><b>Preview</b> the result. You may need to click the browser's &lt;<b>Reload</b>&gt; button to force it to re-load the page.</Text>
 </NumberedItem>
@@ -2362,5 +2347,5 @@
 </Bullet>
 </BulletList>
-<Text id="0595">Don't forget to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/> after all this work! <b>Preview</b> the result (you don't need to rebuild the collection.)</Text>
+<Text id="0595"><b>Preview</b> the result (you don't need to rebuild the collection.)</Text>
 </NumberedItem>
 <Heading>
@@ -2392,5 +2377,5 @@
 </Heading>
 <NumberedItem>
-<Text id="0606">Make the bookshelves show how many documents they contain by inserting a line in the <AutoText text="VList"/> format statement in the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Design"/> panel. The added line is shown highlighted below. The complete format statement can be copied from <Path>sample_files &rarr; beatles &rarr; format_tweaks &rarr; show_num_docs.txt</Path>.</Text>
+<Text id="0606">Make the bookshelves show how many documents they contain by inserting a line in the <AutoText text="VList"/> format statement in the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel. The added line is shown highlighted below. The complete format statement can be copied from <Path>sample_files &rarr; beatles &rarr; format_tweaks &rarr; show_num_docs.txt</Path>.</Text>
 <Format>
 &lt;td valign=top&gt;<br/> 
@@ -2404,5 +2389,4 @@
 {Or}{[dls.Title],[dc.Title],[Title],Untitled}<br/>
 [/highlight]&lt;/td&gt;</Format> 
-<Text id="0607">Don't forget to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <Text id="0609"><b>Preview</b> the result (you don't need to build the collection.) Bookshelves in the titles and browse classifiers should show how many documents they contain.</Text>
 </NumberedItem>
@@ -2412,5 +2396,5 @@
 <NumberedItem>
 <Text id="0612">In the <AutoText key="glidict::CDM.GUI.Classifiers"/> section on the <AutoText key="glidict::GUI.Design"/> panel, add a <AutoText text="Phind"/> classifier. Leave the settings at their defaults: this generates a phrase browsing classifier that sources its phrases from <i>Title</i> and <i>text</i>.</Text>
-<Text id="0612b"><b>Build</b> the collection again and <b>preview</b> it. Select the new "phrases" option from the navigation bar. Enter a single word in the text box, such as <AutoText text="band" type="quotes"/>. The phrase browser will present you with phrases found in the collection containing the search term. This can provide a useful way of browsing a very large collection. Note that even though it is called a phrase browser, only single terms can be used as the starting point for browsing.</Text>
+<Text id="0612b"><b>Build</b> the collection again and <b>preview</b> it. Select the new <AutoText key="coredm::_Global:labelPhrases_"/> option from the navigation bar. Enter a single word in the text box, such as <AutoText text="band" type="quotes"/>. The phrase browser will present you with phrases found in the collection containing the search term. This can provide a useful way of browsing a very large collection. Note that even though it is called a phrase browser, only single terms can be used as the starting point for browsing.</Text>
 </NumberedItem>
 <Heading>
@@ -2418,7 +2402,7 @@
 </Heading>
 <NumberedItem>
-<Text id="0613">To complete the collection, lets give it a new image for the top left corner of the page. Go to the <AutoText key="glidict::CDM.GUI.General"/> section of the <AutoText key="glidict::GUI.Design"/> panel. Use the browse button of <AutoText key="glidict::CDM.General.Icon_Collection"/> to select the following image:</Text>
+<Text id="0613">To complete the collection, lets give it a new image for the top left corner of the page. Go to the <AutoText key="glidict::CDM.GUI.General"/> section of the <AutoText key="glidict::GUI.Format"/> panel. Use the browse button of <AutoText key="glidict::CDM.General.Icon_Collection"/> to select the following image:</Text>
 <Path>sample_files &rarr; beatles &rarr; advbeat_large &rarr; images &rarr; beatlesmm.png</Path>
-<Text id="0613a">Preview the collection, and make sure the new image appears.</Text>
+<Text id="0613a"><b>Preview</b> the collection, and make sure the new image appears.</Text>
 </NumberedItem>
 <Heading>
@@ -2493,4 +2477,7 @@
 </Comment>
 <NumberedItem>
+<Text id="0644a">Close the collection in the Librarian Interface (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Close"/></Menu>).</Text>
+</NumberedItem>
+<NumberedItem>
 <Text id="0645">Using your Windows file browser outside Greenstone, locate the folder</Text>
 <Path>sample_files &rarr; beatles &rarr; advbeat_large</Path> 
@@ -2498,9 +2485,10 @@
 <NumberedItem>
 <Text id="0645a">Open up another file browser, and locate the small beatles collection in your Greenstone installation:</Text>
-<Path>greenstone &rarr; collect &rarr; smallbea</Path>
+<Path>Greenstone &rarr; collect &rarr; smallbea</Path>
 <Text id="0645b"><AutoText text="smallbea"/> is the folder name generated by Greenstone for this collection. You can determine what the folder name is for a collection by looking at the title bar of the Librarian Interface: the folder name is displayed in brackets after the collection name.</Text>
 </NumberedItem>
 <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. To see the macro definitions, take a look by using a text editor to open the file <Path>extra.dm</Path> in the <Path>macros</Path> folder.</Text>
+<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>
 </NumberedItem>
 <Heading>
@@ -2508,5 +2496,5 @@
 </Heading>
 <NumberedItem>
-<Text id="0648">Re-Edit your <AutoText text="VList" /> format statement to be the following (in <AutoText key="glidict::CDM.GUI.Formats"/> on the <AutoText key="glidict::GUI.Design"/> panel)</Text>
+<Text id="0648">Re-edit your <AutoText text="VList" /> format statement to be the following (in <AutoText key="glidict::CDM.GUI.Formats"/> on the <AutoText key="glidict::GUI.Format"/> panel). You can copy this text from the file <Path>sample_files &rarr; beatles &rarr; format_tweaks &rarr; multi_icons.txt</Path>.</Text>
 <Format><highlight>&lt;td valign=top&gt;</highlight><br/> 
 &nbsp;&nbsp;<highlight>{If}{[numleafdocs],[link][icon][/link]}</highlight><br/> 
@@ -2529,7 +2517,4 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0649">The complete statement is in the file <Path>format_tweaks &rarr; multi_icons.txt</Path>.</Text>
-</NumberedItem>
-<NumberedItem>
 <Text id="0651"><b>Preview</b> your collection as before. Now different icons are used for discography, lyrics, tablature, and MARC metadata. Even MP3 and MIDI audio file types are distinguished. If you let the mouse hover over one of these images a "tool tip" appears explaining what file type the icon represents in the current interface language (note: <Path>extra.dm</Path> only defines English and French).</Text>
 </NumberedItem>
@@ -2538,8 +2523,8 @@
 </Heading>
 <NumberedItem>
-<Text id="0653">Open your collection's <Path>macros</Path> folder and locate the <Path>extra.dm</Path> file within it. <b>Open</b> it in a text editor, e.g. WordPad.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0654">The file content is fairly brief, specifying only what needs to be overridden from the default behaviour for this collection. Near the top of the file you should see:</Text>
+<Text id="0653a">Go to the <AutoText key="glidict::CDM.GUI.Macros"/> section in the <AutoText key="glidict::GUI.Format"/> panel.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0654">The content is fairly brief, specifying only what needs to be overridden from the default behaviour for this collection. Near the top you should see:</Text>
 <Format>
 _collectionspecificstyle_ {<br/>
@@ -2550,10 +2535,10 @@
 }
 </Format>
-<Text id="0655">Replace the text <AutoText text="beat_margin.gif" type="quotes"/> with <AutoText text="tile.jpg" type="quotes"/>. Save the file. </Text>
+<Text id="0655">Replace the text <AutoText text="beat_margin.gif" type="quotes"/> with <AutoText text="tile.jpg" type="quotes"/>.</Text>
 <Text id="0656">This line relates to the background image used. The new image <Path>tile.jpg</Path> was in the <Path>images</Path> folder that was copied across previously.</Text>
 </NumberedItem>
 <NumberedItem>
 <Text id="0658"><b>Preview</b> the collection's home page. The page background is now the new graphic.</Text>
-<Text id="0659">Other features can be altered by editing the macro files&mdash;for example, the headers and footers used on each page, and the highlighting style used for search terms (specify a different colour, use bold etc.).</Text>
+<Text id="0659">Other features can be altered by editing the macros&mdash;for example, the headers and footers used on each page, and the highlighting style used for search terms (specify a different colour, use bold etc.).</Text>
 </NumberedItem>
 <Heading>
@@ -2576,5 +2561,5 @@
 </Bullet>
 <Bullet>
-<Text id="0670"><b>Build</b> the collection and <b>preview</b> the result. (If you want the collection to have an icon, you will have to add it from the <AutoText key="glidict::GUI.Design"/> panel.)</Text>
+<Text id="0670"><b>Build</b> the collection and <b>preview</b> the result. (If you want the collection to have an icon, you will have to add it from the <AutoText key="glidict::GUI.Format"/> panel.)</Text>
 </Bullet>
 </BulletList>
@@ -2596,5 +2581,5 @@
 </Title>
 <SampleFiles folder="niupepa"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -2605,5 +2590,5 @@
 </Comment>
 <NumberedItem>
-<Text id="0677">Start a new collection called <b>Paged Images</b> and fill out the fields with appropriate information: it is a collection sourced from an excerpt of Niupepa documents; the only metadata used is document title and date, and these are extracted from the <AutoText text="item" type="quoted"/> files included in the source documents so no metadata set need be stipulated.</Text>
+<Text id="0677">Start a new collection called <b>Paged Images</b> and fill out the fields with appropriate information: it is a collection sourced from an excerpt of Niupepa documents.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2635,5 +2620,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0687">In the <AutoText key="glidict::CDM.GUI.Formats"/> section, 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. 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="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>
 <Format>
 &lt;td valign="top"&gt;[link][icon][/link]&lt;/td&gt;<br/>
@@ -2645,9 +2630,8 @@
 &lt;/td&gt;
 </Format>
-<Text id="0687a">Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>.</Text>
 </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="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>
 </NumberedItem>
 <Heading>
@@ -2658,5 +2642,5 @@
 </Comment>
 <NumberedItem>
-<Text id="0696">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Design"/> 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="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/>  
@@ -2665,5 +2649,4 @@
 &lt;/tr&gt;&lt;/table&gt;
 </Format>
-<Text id="0696a">and click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <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>
@@ -2677,5 +2660,4 @@
 {If}{[Text] ne "<AutoText key="perlmodules::BasPlug.dummy_text" type="plain"/> ",&lt;td valign=top&gt;[Text]&lt;/td&gt;}
 </Format>
-<Text id="0698d">and click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2689,11 +2671,14 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0690d">Go to the <AutoText key="glidict::CDM.GUI.Indexes"/> section of the <AutoText key="glidict::GUI.Design"/> panel. Remove the <AutoText key="metadata::ex.Source"/> index. Select the <AutoText text="document:text"/> index in the <AutoText key="glidict::CDM.IndexManager.Indexes"/> box, and change the <AutoText key="glidict::CDM.IndexManager.Index_Name"/> to "whole newspapers". Click <AutoText key="glidict::CDM.IndexManager.MGPP.Replace_Index" type="button"/>. Create a new index: set the <AutoText key="glidict::CDM.IndexManager.Index_Name"/> to "newspaper pages", keep <AutoText text="text"/> selected in <AutoText key="glidict::CDM.IndexManager.Source"/>, and change <AutoText key="glidict::CDM.IndexManager.Level"/> to <AutoText text="section"/>. Click <AutoText key="glidict::CDM.IndexManager.Add_Index" type="button"/>. Click <AutoText key="glidict::CDM.IndexManager.Set_Default" type="button"/> on the right hand side to make the "newspaper pages" index the default.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0690e"><b>Build</b> and <b>preview</b> the collection. Compare searching in the "whole newspapers" index compared to the "newspaper pages" index. 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"/> 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">Go to the <AutoText key="glidict::CDM.GUI.Indexes"/> section of the <AutoText key="glidict::GUI.Design"/> panel. Remove the <AutoText key="metadata::ex.Source"/> index. Check the <AutoText key="glidict::CDM.LevelManager.Section"/> checkbox to build the indexes on section level as well as document level. Make section level the default by selecting its <AutoText key="glidict::CDM.LevelManager.Default"/> radio button.</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>
 <Format>
 &lt;td valign="top"&gt;[ex.srclink]{Or}{[ex.thumbicon],[ex.srcicon]}[ex./srclink]&lt;/td&gt;
@@ -2703,10 +2688,9 @@
 {If}{[ex.Source],&lt;br&gt;&lt;i&gt;([ex.Source])&lt;/i&gt;}
 </Format>
-<Text id="0690f-2">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <Text id="0690g"><b>Preview</b> the collection&mdash;the search results should be back to normal. </Text>
 </NumberedItem>
 <NumberedItem>
 <Text id="0690h">Now you will notice that page level search results only show the Title of the page (the page number), and not the Title of the newspaper. We'll modify the format statement to show the newspaper title as well as the page number. Also, lets add in Volume and Number information too. </Text>
-<Text id="0690h-1">In the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Design"/> panel, select <AutoText text="Search"/> in <AutoText key="glidict::CDM.FormatManager.Feature"/>, and <AutoText text="VList"/> in <AutoText key="glidict::CDM.FormatManager.Part"/>. The previous changes modified <AutoText text="VList"/>, so they will apply to all <AutoText text="VList"/>s that don't have specific format statements. These next changes are made to <AutoText text="SearchVList"/> so will only apply to search results.</Text>
+<Text id="0690h-1">In the <AutoText key="glidict::CDM.GUI.Formats"/> section, select <AutoText text="Search"/> in <AutoText key="glidict::CDM.FormatManager.Feature"/>, and <AutoText text="VList"/> in <AutoText key="glidict::CDM.FormatManager.Part"/>. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/> to add this format to the collection. The previous changes modified <AutoText text="VList"/>, so they will apply to all <AutoText text="VList"/>s that don't have specific format statements. These next changes are made to <AutoText text="SearchVList"/> so will only apply to search results. </Text>
 <Text id="0690i">The extracted Title for the current section is specified as <Format>[ex.Title]</Format> while the Title for the parent section is <Format>[parent:ex.Title]</Format>. Since the same <AutoText text="SearchVList"/> format statement is used when searching both whole newspapers and newspaper pages, we need to make sure it works in both cases.</Text>
 <Text id="0690j">Set the format statement to the following text (it can be copied and pasted from the file <Path>sample_files &rarr; niupepa &rarr; formats &rarr; search_tweak.txt</Path>.)</Text>
@@ -2722,5 +2706,4 @@
 &lt;/td&gt;
 </Format>
-<Text id="1690j-1">Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>.</Text>
 <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>
@@ -2736,5 +2719,5 @@
 <SampleFiles folder="niupepa"/>
 <Prerequisite id="scanned_image_collection"/>
-<Version initial="2.70" current="2.70w"/>
+<Version initial="2.70" current="2.71"/>
 <Content>
 <Comment>
@@ -2806,15 +2789,14 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="sc26"><b>Close</b> the collection in the Librarian Interface (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Close"/></Menu>). It will not let you add two of the same plugin (apart from <AutoText text="UnknownPlug"/>), so the second <AutoText text="PagedImgPlug"/> must be added to the collect.cfg file manually.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="sc27">Open the file <Path>greenstone &rarr; collect &rarr; pagedima &rarr; etc &rarr; collect.cfg</Path> in a text editor. Copy the <AutoText text="plugin PagedImgPlug"/> line and paste it above the existing one. Edit the two <AutoText text="plugin PagedImgPlug"/> lines so that they look like:</Text>
-<Format>
-plugin PagedImgPlug -screenview -documenttype hierarchy -process_exp xml.*.item$<br/>
-plugin PagedImgPlug -screenview -documenttype paged
-</Format>
-<Text id="sc27a">Save and close the file.</Text>
+<Text id="sc25b">Change the mode in the Librarian Interface to <AutoText key="glidict::Preferences.Mode.Systems"/> (or <AutoText key="glidict::Preferences.Mode.Expert"/>) mode (using <Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Options"/></Menu>), because you will need to change the order of plugins, and use regular expressions in the plugin options.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="sc25c">Go to the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel, and add a new <AutoText text="PagedImgPlug"/> plugin. Enable the <AutoText text="screenview"/> option, set the <AutoText text="documenttype"/> option to <AutoText text="hierarchy"/> and set the <AutoText text="process_exp"/> option to <AutoText text="xml.*.item$"/>.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="sc25d">Move this <AutoText text="PagedImgPlug"/> plugin above the original one in the <AutoText key="glidict::CDM.PlugInManager.Assigned"/> list.</Text>
+</NumberedItem>
+<NumberedItem>
 <Text id="sc28">The XML based newspapers have been grouped into a folder called <Path>xml</Path>. This enables us to process these files differently, by utilizing the <AutoText text="process_exp"/> option which all plugins support. The first <AutoText text="PagedImgPlug"/> in the list looks for item files underneath the <Path>xml</Path> folder. These documents will be processed as 'hierarchical' documents. Item files that don't match the process expression (i.e. aren't underneath the <Path>xml</Path> folder) will be passed onto the second <AutoText text="PagedImgPlug"/>, and these are treated as 'paged' documents.</Text>
-<Text id="sc28a">Open the collection in the Librarian Interface (<Menu><AutoText key="glidict::Menu.File"/> &rarr; <AutoText key="glidict::Menu.File_Open"/></Menu>). Check the <AutoText key="glidict::CDM.GUI.Plugins"/> section of the <AutoText key="glidict::GUI.Design"/> panel to make sure that the two <AutoText text="PagedImgPlug"/> plugins appear.</Text>
 <Text id="sc29"><b>Rebuild</b> and <b>preview</b> the collection. Compare the document display for a paged document e.g. <AutoText text="Te Waka o Te Iwi, Vol. 1, No. 1"/> with a hierarchical document, e.g. <AutoText text="Matariki 1881, No. 1"/>.</Text>
 </NumberedItem>
@@ -2824,12 +2806,12 @@
 <Text id="sc31">We can modify the document display to switch between the text version and the screenview and full size versions. We do this using a combination of format statements and macro files.</Text>
 <NumberedItem>
-<Text id="sc32">First of all we will add a macro file to the collection. In a file browser outside of Greenstone, locate the Paged Image collection in your Greenstone installation: <Path>Greenstone &rarr; collect &rarr; pagedima</Path>. Create a new folder called <Path>macros</Path> in the <Path>pagedima</Path> folder.</Text>
-<Text id="sc32a">Also in a file browser, locate the file <Path>sample_files &rarr; niupepa &rarr; macros &rarr; extra.dm</Path>. Copy this file and paste it into the new <Path>macros</Path> folder you just created.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="sc33a">Back in the Librarian Interface, go to the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Design"/> panel.</Text> 
-</NumberedItem>
-<NumberedItem>
-<Text id="sc33b">Select <AutoText text="AllowExtendedOptions"/> in the <AutoText key="glidict::CDM.FormatManager.Feature"/> list, and tick <AutoText key="glidict::CDM.FormatManager.Enabled"/>. Click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>. This gives us more control over the layout of the page&mdash;in this case, we want to replace the standard <AutoText key="coredm::_document:textDETACH_" type="italics"/> and <AutoText key="coredm::_document:textNOHIGHLIGHT_" type="italics"/> buttons with buttons that switch between images and text.</Text>
+<Text id="sc32">First of all we will add a macro file to the collection. Close the collection in the Librarian Interface. In a file browser outside of Greenstone, locate the Paged Image collection in your Greenstone installation: <Path>Greenstone &rarr; collect &rarr; pagedima</Path>.</Text>
+<Text id="sc32a">Also in a file browser, locate the file <Path>sample_files &rarr; niupepa &rarr; macros &rarr; extra.dm</Path>. Copy this file and paste it into the <Path>macros</Path> folder inside the pagedima collection.</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="sc33a">Back in the Librarian Interface, open up the collection again, and go to the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel.</Text> 
+</NumberedItem>
+<NumberedItem>
+<Text id="sc33b">Select <AutoText text="AllowExtendedOptions"/> in the <AutoText key="glidict::CDM.FormatManager.Feature"/> list, and click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>. Tick the <AutoText key="glidict::CDM.FormatManager.Enabled"/> checkbox. This gives us more control over the layout of the page&mdash;in this case, we want to replace the standard <AutoText key="coredm::_document:textDETACH_" type="italics"/> and <AutoText key="coredm::_document:textNOHIGHLIGHT_" type="italics"/> buttons with buttons that switch between images and text.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2844,7 +2826,6 @@
 &lt;div class="toc"&gt;[DocTOC]&lt;/div&gt;<br/>
 </Format>
-<Text id="sc33c-1">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <Text id="sc33e"><Format>{Or}{[parent(Top):ex.Title],[ex.Title]}</Format> outputs the newspaper Title metadata. This is only stored at the top level of the document, so if we are at a subsection, we need to get it from the top (<Format>[parent(Top):ex.Title]</Format>). Note that we can't just use <Format>[parent:ex.Title]</Format> as this retrieves the Title from the immediate parent node, which may not be the top node of the document.</Text>
-<Text id="sc33g"><Format>_document:viewpreview_, _document:viewfullsize_, _document:viewtext_</Format> are macros defined in <Path>extra.dm</Path> which output buttons for preview, fullsize and text versions, respectively. We choose which buttons to display based on what metadata and text the document has.</Text>
+<Text id="sc33g"><Format>_document:viewpreview_, _document:viewfullsize_, _document:viewtext_</Format> are macros defined in <Path>extra.dm</Path> which output buttons for preview, fullsize and text versions, respectively. We choose which buttons to display based on what metadata and text the document has. Note you can view the macros by going to the <AutoText key="glidict::CDM.GUI.Macros"/> section of the <AutoText key="glidict::GUI.Format"/> panel.</Text>
 <Text id="sc33h"><Format>[DocTOC]</Format> is the document table of contents or "go to page" navigation element. Since we are using extended options, we need to explicitly specify this for it to appear in the page.</Text>
 <Text id="sc33i">The different pieces are surrounded by <Format>&lt;div&gt;</Format> elements, so that the appropriate styling information can be used.</Text>
@@ -2857,5 +2838,4 @@
 {If}{[Text] ne \'This document has no text. \',[Text],[screenicon]}}}
 </Format>
-<Text id="sc34a-1">Remember to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <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>
 </NumberedItem>
@@ -2870,5 +2850,5 @@
 </Title>
 <SampleFiles folder="oai"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -2879,5 +2859,5 @@
 </Comment>
 <NumberedItem>
-<Text id="0705">Start a new collection called <b>OAI Service Provider</b>. Fill out the fields with appropriate information. You can leave the default metadata set as Dublin Core, although we do not make use of it.</Text>
+<Text id="0705">Start a new collection called <b>OAI Service Provider</b>. Fill out the fields with appropriate information.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2895,5 +2875,5 @@
 </Comment>
 <NumberedItem>
-<Text id="0710">You need to configure the image plug-in. In the <AutoText key="glidict::GUI.Design"/> panel, select the <AutoText key="glidict::CDM.GUI.Plugins"/> section, then select the <AutoText text="plugin ImagePlug"/> line and click <AutoText key="glidict::CDM.PlugInManager.Configure" type="button"/>. In the resulting popup window locate the <AutoText text="screenviewsize"/> option, switch it on, and type the number <AutoText text="300"/> in the box beside it to create a screen-view image of 300 pixels. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
+<Text id="0710">You need to configure the image plug-in. In the <AutoText key="glidict::GUI.Design"/> panel, select the <AutoText key="glidict::CDM.GUI.Plugins"/> section, then select the <AutoText text="ImagePlug"/> line and click <AutoText key="glidict::CDM.PlugInManager.Configure" type="button"/>. In the resulting popup window locate the <AutoText text="screenviewsize"/> option, switch it on, and type the number <AutoText text="300"/> in the box beside it to create a screen-view image of 300 pixels. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2914,5 +2894,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0716">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section of the <AutoText key="glidict::GUI.Design"/> panel, delete all indexes and add a new one called "captions" based on <AutoText key="metadata::ex.Description"/> metadata.</Text>
+<Text id="0716">In the <AutoText key="glidict::CDM.GUI.Indexes"/> section of the <AutoText key="glidict::GUI.Design"/> panel, delete all indexes and add a new one based on <AutoText key="metadata::ex.Description"/> metadata.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -2923,5 +2903,5 @@
 </Heading>
 <NumberedItem>
-<Text id="0719">In the <AutoText key="glidict::GUI.Design"/> panel, select <AutoText key="glidict::CDM.GUI.Formats"/>. First replace the <AutoText text="VList" /> format statement with this:</Text>
+<Text id="0719">In the <AutoText key="glidict::GUI.Format"/> panel, select <AutoText key="glidict::CDM.GUI.Formats"/>. First replace the <AutoText text="VList" /> format statement with the following (which can be copied from the file <Path>vlist_tweak.txt</Path> in the <Path>sample_files &rarr; oai &rarr;format_tweaks</Path> folder).</Text>
 <Format>
 &lt;td&gt;<br/> 
@@ -2932,5 +2912,4 @@
 &lt;/td&gt;
 </Format> 
-<Text id="0720">You will find this text in the file <Path>vlist_tweak.txt</Path> in the <Path>sample_files &rarr; oai &rarr;format_tweaks</Path> folder. Remember to click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/> when finished</Text>
 <Comment>
 <Text id="0721">This format statement customizes the appearance of vertical lists such as the search results and captions lists to show a thumbnail icon followed by Description metadata. Greenstone's default is to use extracted metadata, so <Format>[Description]</Format> is the same as <Format>[ex.Description]</Format>.</Text>
@@ -2940,5 +2919,4 @@
 <Text id="0722">Next, select <AutoText text="DocumentHeading"/> from the <AutoText key="glidict::CDM.FormatManager.Feature"/> pull-down list and change its format statement to: </Text>
 <Format>&lt;h3&gt;[Subject]&lt;/h3&gt;</Format> 
-<Text id="0722a">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <Comment>
 <Text id="0723">The document heading appears above the <AutoText key="coredm::_document:textDETACH_" type="italics"/> and <AutoText key="coredm::_document:textNOHIGHLIGHT_" type="italics"/> buttons when you get to a document in the collection. By default <AutoText text="DocumentHeading"/> displays the document's <AutoText key="metadata::ex.Title"/> metadata. In this particular set of OAI exported records, titles are filenames of JPEG images, and the filenames are particularly uninformative (for example, 01dla14). You can see them in the <AutoText key="glidict::GUI.Enrich"/> panel if you select an image in <Path>oai &rarr; JCDLPICS &rarr; srcdocs</Path> and check its <AutoText key="metadata::ex.Source"/> and <AutoText key="metadata::ex.Title"/> metadata. The above format statement displays <AutoText key="metadata::ex.Subject"/> metadata instead.</Text>
@@ -2957,9 +2935,8 @@
 &nbsp;&nbsp;&lt;tr&gt;&lt;td&gt;Rights:&lt;td&gt; [Rights]&lt;/td&gt;&lt;/tr&gt;<br/> 
 &lt;/table&gt;&lt;/center&gt;</Format> 
-<Text id="0727a">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
 <Text id="0730">This format statement alters how the document view is presented. It includes a screen-sized version of the image that hyperlinks back to the original larger version available on the web. Factual information extracted from the image, such as width, height and type, is also displayed.</Text>
 </NumberedItem>
 <NumberedItem>
-<Text id="0731">Format statements are processed by the runtime system, so the collection does not need to be rebuilt for these changes to take effect. Switch to the <AutoText key="glidict::GUI.Design"/> panel and press <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/> to see the changes.</Text>
+<Text id="0731">Format statements are processed by the runtime system, so the collection does not need to be rebuilt for these changes to take effect. Click <AutoText key="glidict::CreatePane.Preview_Collection" type="button"/> to see the changes.</Text>
 </NumberedItem>
 <Comment>
@@ -2968,4 +2945,5 @@
 </Content>
 </Tutorial>
+<!-- ** here -->
 <Tutorial id="OAI_downloading">
 <Title>
@@ -2973,5 +2951,5 @@
 </Title>
 <Prerequisite id="OAI_collection"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -3024,5 +3002,5 @@
 <Text id="0750">Use METS as Greenstone's Internal Representation</Text>
 </Title>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <NumberedItem>
@@ -3045,5 +3023,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0759">In your Windows file browser, locate the <Path>archives</Path> folder for the collection you are working with. For each document in the collection, Greenstone has generated two files: <Path>docmets.xml</Path>, the core METS description, and <Path>doctxt.xml</Path>, a supporting file. (Note: unless you are connected to the Internet you will be unable to view <Path>doctxt.xml</Path> in your web browser, because it refers to a remote resource.) Depending on the source documents there may be additional files, such as the images used within a web page. One of METS' many features is the ability to reference information in external XML files. Greenstone uses this to tie the content of the document, which is stored in the external XML file <Path>doctxt.xml</Path>, to its hierarchical structure, which is described in the core METS file <Path>docmets.xml</Path>.</Text>
+<Text id="0759">In your Windows file browser, locate the <Path>archives</Path> folder for the collection you are working with (in <Path>Greenstone &rarr; collect &rarr; &lt;collname&gt; &rarr; archives</Path>). For each document in the collection, Greenstone has generated two files: <Path>docmets.xml</Path>, the core METS description, and <Path>doctxt.xml</Path>, a supporting file. (Note: unless you are connected to the Internet you will be unable to view <Path>doctxt.xml</Path> in your web browser, because it refers to a remote resource.) Depending on the source documents there may be additional files, such as the images used within a web page. One of METS' many features is the ability to reference information in external XML files. Greenstone uses this to tie the content of the document, which is stored in the external XML file <Path>doctxt.xml</Path>, to its hierarchical structure, which is described in the core METS file <Path>docmets.xml</Path>.</Text>
 </NumberedItem>
 </Content>
@@ -3054,5 +3032,5 @@
 </Title>
 <SampleFiles folder="dspace"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <NumberedItem>
@@ -3106,12 +3084,11 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0780">Now select the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Design"/> panel, and select the <AutoText text="VList" /> format statement in the list of assigned format statements. Add the following text before the final <Format>&lt;/td&gt;</Format>:</Text>
+<Text id="0780">Now select the <AutoText key="glidict::CDM.GUI.Formats"/> section of the <AutoText key="glidict::GUI.Format"/> panel, and select the <AutoText text="VList" /> format statement in the list of assigned format statements. Add the following text before the final <Format>&lt;/td&gt;</Format>:</Text>
 <Format>
 {If}{[ex.equivlink],&lt;br&gt;Also available as:[ex.equivlink]}
 </Format>
-<Text id="0781">Click <AutoText key="glidict::CDM.FormatManager.Replace" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="0782">Also, let's add a format statement for the classifier based on <AutoText key="metadata::dc.Contributor"/> metadata. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu (under <AutoText key="glidict::CDM.GUI.Formats"/> on the  <AutoText key="glidict::GUI.Design"/> panel), select the item that says:</Text>
+</NumberedItem>
+<NumberedItem>
+<Text id="0782">Also, let's add a format statement for the classifier based on <AutoText key="metadata::dc.Contributor"/> metadata. In the <AutoText key="glidict::CDM.FormatManager.Feature"/> menu (under <AutoText key="glidict::CDM.GUI.Formats"/> on the  <AutoText key="glidict::GUI.Format"/> panel), select the item that says:</Text>
 <Indent>
 CL2: AZCompactList -metadata <AutoText key="metadata::dc.Contributor"/>
@@ -3119,5 +3096,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="0783">Leave <AutoText text="VList" /> as the <AutoText key="glidict::CDM.FormatManager.Part"/> and edit the text in the <AutoText key="glidict::CDM.FormatManager.Editor"/> box. Replace</Text>
+<Text id="0783">Leave <AutoText text="VList" /> as the <AutoText key="glidict::CDM.FormatManager.Part"/> and click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>. Edit the text in the <AutoText key="glidict::CDM.FormatManager.Editor"/> box. Replace</Text>
 <Format>
 {Or}{[dls.Title],[dc.Title],[ex.Title],Untitled}
@@ -3127,5 +3104,5 @@
 {If}{[numleafdocs],([numleafdocs]) [ex.Title],[dc.Title]}
 </Format>
-<Text id="0784">and click <AutoText key="glidict::CDM.FormatManager.Add" type="button"/>. This will display the number of documents for each bookshelf in the <AutoText key="coredm::_Global:labelContributor_" type="italics"/> classifier.</Text>
+<Text id="0784">This will display the number of documents for each bookshelf in the <AutoText key="coredm::_Global:labelContributor_" type="italics"/> classifier.</Text>
 </NumberedItem>
 <NumberedItem>
@@ -3142,5 +3119,5 @@
 </Title>
 <Prerequisite id="dspace_to_greenstone"/>
-<Version initial="2.60" current="2.70w"/>
+<Version initial="2.60" current="2.71"/>
 <Content>
 <Comment>
@@ -3187,5 +3164,5 @@
 <Version initial="2.70w" current="2.71"/>
 <Content>
-<Text id="gems-2">GEMS (Greenstone Editor for Metadata Sets) can be used to modify existing metadata sets or create new ones.</Text>
+<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>
 <Heading>
 <Text id="gems-3">Running GEMS</Text>
@@ -3196,5 +3173,5 @@
 </NumberedItem>
 <NumberedItem>
-<Text id="gems-6">A list of all the available metadata sets is shown on the left hand side. Explore these metadata sets, and see what elements belong to each set. Double click on a folder icon to open the set. A list of elements will be displayed.</Text>
+<Text id="gems-6">GEMS starts up with no metadata set loaded. You can start a new set, or open an existing one, from the <Menu><AutoText key="glidict::Menu.File"/></Menu> menu.</Text>
 </NumberedItem>
 <Heading>
@@ -3202,8 +3179,8 @@
 </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.Add_Set"/>. Fill in the fields. Use <AutoText text="My Metadata Set" type="quoted"/> for the <AutoText key="glidict::GEMS.Name"/>, <AutoText text="my" type="quoted"/> for the <AutoText key="glidict::GEMS.Namespace"/>, and select "Development Library Subset Example Metadata" from the <AutoText key="glidict::GEMS.inheritMetadataSet"/> drop down list. Click <AutoText key="glidict::General.OK" type="button"/>.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="gems-9">A folder for <AutoText text="My Metadata Set"/> will appear in the metadata set list on the left. Double click the folder icon to see what elements it has. Since it was based on the Development Library Subset metadata set, it contains all the elements from that set.</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_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>
+</NumberedItem>
+<NumberedItem>
+<Text id="gems-9">The new metadata set will be displayed. The left hand side list the elements (and sub-elements, if any) for the set, and the right hand side displays the set or element attributes. Since the new set was based on the Development Library Subset metadata set, it already contains all the elements from that set.</Text>
 </NumberedItem>
 <Heading>
@@ -3211,8 +3188,8 @@
 </Heading>
 <NumberedItem>
-<Text id="gems-11">Right click on the <AutoText text="My Metadata Set (my)"/> item in the list of metadata sets, and choose <AutoText key="glidict::GEMS.Add_Element"/> from the menu that appears. In the popup window, type <AutoText text="Category" type="quoted"/> for the <AutoText key="glidict::GEMS.Name"/>, and click <AutoText key="glidict::General.OK" type="button"/>. The new element will appear in the list.</Text>
-</NumberedItem>
-<NumberedItem>
-<Text id="gems-12">Right click on the <AutoText text="my.Category"/> element and select <AutoText key="glidict::GEMS.Add_Attribute"/> from the menu. Select <AutoText text="definition"/> from the <AutoText key="glidict::GEMS.Name"/> drop down list, and enter <AutoText text="The category this resource belongs to" type="quoted"/> in the <AutoText key="glidict::GEMS.Values"/> box. The GLI uses the element definitions when displaying information about a metadata set.</Text>
+<Text id="gems-11">Right click on <AutoText text="My Metadata Set"/> in the left hand tree (or in the blank space in the left hand side) and choose <AutoText key="glidict::GEMS.Popup.AddElement"/> from the menu that appears. In the popup window, type <AutoText text="Category" type="quoted"/> for the new element name, and click <AutoText key="glidict::General.OK" type="button"/>. The new element will appear in the list.</Text>
+</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>
 </NumberedItem>
 <NumberedItem>
