Merge pull request #89 from infirit/yelp

user-guide: change ghelp: to help:

7 files changed, 26 insertions, 26 deletions

diff --git a/user-guide/C/goscustdesk.xml b/user-guide/C/goscustdesk.xml
index 31b94de..f7aa40d 100644
--- a/user-guide/C/goscustdesk.xml
+++ b/user-guide/C/goscustdesk.xml
@@ -271,7 +271,7 @@ commands to run (<option>-x</option> for <application>mate-terminal</application
                 </para>
               </entry>
               <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-                <para>Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type="help" url="ghelp:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
+                <para>Select this option to run the command as soon as your session begins. For more accessibility options, see <ulink type="help" url="help:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
               </entry>
             </row>
           </tbody>
@@ -1621,7 +1621,7 @@ test area to test the effect of your settings.</para>
 	      <varlistentry>
 	        <term><guilabel>Selected Layouts</guilabel></term>
 	        <listitem><para>You can switch between selected layouts to change the characters your keyboard produces when you type. To add a layout, click <guibutton>Add</guibutton>. You can have up to four layouts. To remove a layout, select it and press <guibutton>Remove</guibutton>.</para>
-	        <para>To switch between keyboard layouts, use the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application> panel applet</ulink>. <!-- better link to the specific page, but not yet suitable for a direct link: ghelp:gswitchit?gswitchit-applet-switching --></para>
+	        <para>To switch between keyboard layouts, use the <ulink type="help" url="help:gswitchit"><application>Keyboard Indicator</application> panel applet</ulink>. <!-- better link to the specific page, but not yet suitable for a direct link: help:gswitchit?gswitchit-applet-switching --></para>
                  <para>To add a layout to the list of selected layouts, click the <guibutton>Add</guibutton> button. It opens a layout chooser dialog, which lets you select a layout by country or by language.</para> 
 	        </listitem>
 	      </varlistentry>
@@ -1704,8 +1704,8 @@ test area to test the effect of your settings.</para>
                   <para>A <firstterm>third level</firstterm> key allows you to obtain a third character from a key, in the same way that pressing <keycap>Shift</keycap> with a key produces a different character to pressing the key alone.</para>
                   <para>Use this group to select a key you want to act as a third level modifier key.</para>
                   <para>Pressing the third-level key and <keycap>Shift</keycap> produces a fourth character from a key.</para>
-                  <para>The third and fourth level characters for your keyboard layout are shown in the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> Layout View Window.</para>
-                  <!-- better link, pending CVS commit of gswitchit docs: "ghelp:gswitchit?layout-view" -->
+                  <para>The third and fourth level characters for your keyboard layout are shown in the <ulink type="help" url="help:gswitchit"><application>Keyboard Indicator</application></ulink> Layout View Window.</para>
+                  <!-- better link, pending CVS commit of gswitchit docs: "help:gswitchit?layout-view" -->
                 </listitem>
         </varlistentry>
         <varlistentry>
@@ -1747,7 +1747,7 @@ accessibility options</secondary>
       <anchor id="goscustaccess-9"/>
       <para>The <guilabel>Accessibility</guilabel> tabbed section allows you to set  options such as filtering out accidental keypresses and using shortcut keys without having to hold down several keys at once. These features are also known as AccessX.</para>
 
-       <para>This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type="help" url="ghelp:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
+       <para>This section describes each of the preferences you can set. For a more task-oriented description of keyboard accessibility, see the <ulink type="help" url="help:mate-access-guide?index"><citetitle>MATE Desktop Accessibility Guide</citetitle></ulink>.</para>
 
       <para><xref linkend="goscustdesk-TBL-85"/> lists the accessibility preferences
  that you can modify.</para>
@@ -2013,7 +2013,7 @@ of your settings.</para>
                 </indexterm>
               </entry>
               <entry valign="top">
-               <para>Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type="help" url="ghelp:mate-access-guide?dtconfig-14"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>.</para>
+               <para>Select this option to make the numeric keypad emulate mouse actions. The list of keys and their equivalences is in the <citetitle>MATE Desktop Accessibility Guide</citetitle> under the heading <ulink type="help" url="help:mate-access-guide?dtconfig-14"><citetitle>To Enable the Keyboard to Emulate the Mouse</citetitle></ulink>.</para>
               </entry>
             </row>
             <row>
@@ -2831,7 +2831,7 @@ sound output preferences that you can modify.</para>
 
   <sect2 id="prefs-multimedia">
     <title>Multimedia Systems Selector</title>
-    <para>See the <ulink type="help" url="ghelp:gstreamer-properties">GStreamer Properties Manual</ulink>.</para>
+    <para>See the <ulink type="help" url="help:gstreamer-properties">GStreamer Properties Manual</ulink>.</para>
   </sect2>
 
   <sect2 id="prefs-sessions">
diff --git a/user-guide/C/goseditmainmenu.xml b/user-guide/C/goseditmainmenu.xml
index 079cb69..b521753 100644
--- a/user-guide/C/goseditmainmenu.xml
+++ b/user-guide/C/goseditmainmenu.xml
@@ -67,7 +67,7 @@
                    
     <itemizedlist>          
       <listitem><para><guimenuitem>Connect to Server</guimenuitem> lets you choose a server on your network. For more on this, see <xref linkend="caja-server-connect"/>.</para></listitem>
-      <listitem><para><guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type="help" url="ghelp:mate-search-tool">Search for Files Manual</ulink>.</para></listitem>     
+      <listitem><para><guimenuitem>Search for Files</guimenuitem> lets you search for files on your computer. For more on this, see the <ulink type="help" url="help:mate-search-tool">Search for Files Manual</ulink>.</para></listitem>
       <listitem><para>The <guimenuitem>Recent Documents</guimenuitem> submenu lists the documents you have recently opened. The last entry in the submenu clears the list.</para></listitem>                  
     </itemizedlist>                
   </section>
@@ -115,6 +115,6 @@
     <para>The <guilabel>Menu Layout</guilabel> window lists the menus in the left pane. Click on the expander arrows to show or hide submenus. Choose a menu in the left pane to see its items listed in the right pane.</para>
     <para>To remove an item from a menu, deselect it in the list. The item can be added back to the menu by selecting it once again.</para>
 
-    <note><para>The <ulink type="help" url="ghelp:system-admin-guide?menustructure-0">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them.</para></note>
+    <note><para>The <ulink type="help" url="help:system-admin-guide?menustructure-0">System Administration Guide</ulink> has more information on how MATE implements menus and how administrators can customize them.</para></note>
   </section>
 </chapter>
diff --git a/user-guide/C/gosoverview.xml b/user-guide/C/gosoverview.xml
index ac4fa56..56a4b20 100644
--- a/user-guide/C/gosoverview.xml
+++ b/user-guide/C/gosoverview.xml
@@ -416,13 +416,13 @@ specify the number of workspaces that you require.</para>
     <para>The applications that are part of MATE include the following:</para>
     
     <itemizedlist>
-      <listitem><para><ulink type="help" url="ghelp:pluma"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:mate-dictionary"><application>Dictionary</application></ulink> allows you to look up definitions of a word. </para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:eom"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:gcalctool"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:gucharmap"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard.</para></listitem>
+      <listitem><para><ulink type="help" url="help:pluma"><application>Pluma Text Editor</application></ulink> can read, create, or modify any kind of simple text without any formatting.</para></listitem>
+      <listitem><para><ulink type="help" url="help:mate-dictionary"><application>Dictionary</application></ulink> allows you to look up definitions of a word. </para></listitem>
+      <listitem><para><ulink type="help" url="help:eom"><application>Image Viewer</application></ulink> can display single image files, as well as large image collections.</para></listitem>
+      <listitem><para><ulink type="help" url="help:gcalctool"><application>Calculator</application></ulink> performs basic, financial, and scientific calculations.</para></listitem>
+      <listitem><para><ulink type="help" url="help:gucharmap"><application>Character Map</application></ulink> lets you choose letters and symbols from the <firstterm>Unicode</firstterm> character set and paste them into any application. If you are writing in several languages, not all of the characters you need will be on your keyboard.</para></listitem>
       <listitem><para><link linkend="caja"><application>Caja File Manager</application></link> displays your folders and their contents. Use this to copy, move and classify your files, and to access CDs, USB flash drives, and any other removable media. When you choose an item from the <link linkend="places-menu"><guimenu>Places</guimenu> menu</link>, a <application>Caja File Manager</application> window opens showing that location.</para></listitem>
-      <listitem><para><ulink type="help" url="ghelp:mate-terminal"><application>Terminal</application></ulink> gives you access to the system command line.</para></listitem>
+      <listitem><para><ulink type="help" url="help:mate-terminal"><application>Terminal</application></ulink> gives you access to the system command line.</para></listitem>
     </itemizedlist>
 
     <para>Further standard MATE applications include games, music and video players, a web browser, software accessibility tools, and utilities to manage your system. Your distributor or vendor may have added other applications, such as a word processor and a graphics editor. They may also provide you with a way to install further applications.</para>
@@ -505,7 +505,7 @@ specify the number of workspaces that you require.</para>
       
       <section id="filechooser-open-folder">
         <title>Choosing a folder</title> 
-        <para>You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type="help" url="ghelp:file-roller"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder.</para>
+        <para>You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type="help" url="help:file-roller"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder.</para>
       </section>      
            
       <section id="filechooser-open-location">
diff --git a/user-guide/C/gospanel.xml b/user-guide/C/gospanel.xml
index ad726b9..cac05e1 100644
--- a/user-guide/C/gospanel.xml
+++ b/user-guide/C/gospanel.xml
@@ -64,12 +64,12 @@ these panels.</para>
         <varlistentry>
           <term><application>Clock</application> applet</term>
           <listitem><para>The <application>Clock</application> shows the current
-      time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type="help" url="ghelp:clock">Clock Applet Manual</ulink>.</para></listitem>
+      time. Click on the time to open a small calendar. You can also view a world map by clicking the <guilabel>Locations</guilabel> expansion label. For more on this, see the <ulink type="help" url="help:clock">Clock Applet Manual</ulink>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term><application>Volume Control</application>
       applet</term>
-          <listitem><para>The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type="help" url="ghelp:mate-volume-control">Volume Control Manual</ulink>.</para></listitem>
+          <listitem><para>The <application>Volume Control</application> enables you to control the volume of the speakers on your system. For more on this, see the <ulink type="help" url="help:mate-volume-control">Volume Control Manual</ulink>.</para></listitem>
         </varlistentry>
         <varlistentry>
           <term>
@@ -1227,7 +1227,7 @@ on any vacant space on the panel. Choose <guimenu>Add to Panel</guimenu>, then c
       <para>To open the <application>Search Tool</application>, click on
 the <guibutton>Search</guibutton> button. </para>
       <para>For more information on the <application>Search Tool</application>,
-see the <ulink type="help" url="ghelp:mate-search-tool">Search Tool Manual</ulink>.</para>
+see the <ulink type="help" url="help:mate-search-tool">Search Tool Manual</ulink>.</para>
     </section>
     <section id="gospanel-564">
       <title>Show Desktop Button</title>
diff --git a/user-guide/C/gosstartsession.xml b/user-guide/C/gosstartsession.xml
index 50f8059..cfa9239 100644
--- a/user-guide/C/gosstartsession.xml
+++ b/user-guide/C/gosstartsession.xml
@@ -120,7 +120,7 @@ on the login screen, then press <keycap>Return</keycap>.</para>
         <para>When you log in to a session in a different language, you are changing 
 the language for the user interface but are not changing the keyboard layout. 
 To choose a different keyboard layout, use the 
-<ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> applet.</para>
+<ulink type="help" url="help:gswitchit"><application>Keyboard Indicator</application></ulink> applet.</para>
       </note>
       <tip>
         <para>Your system distributor or vendor may have altered the login 
diff --git a/user-guide/C/gostools.xml b/user-guide/C/gostools.xml
index c98170e..d2dae0e 100644
--- a/user-guide/C/gostools.xml
+++ b/user-guide/C/gostools.xml
@@ -941,19 +941,19 @@ a screenshot of the entire screen.</para>
           </varlistentry>
 
           <varlistentry>
-            <term><option>ghelp:</option> or
+            <term><option>help:</option> or
             <option>mate-help:</option></term>
 
             <listitem>
               <para>Use this URI when you want to access MATE help documents,
               which are typically written in DocBook format.</para>
 
-              <screen><userinput>yelp ghelp:gcalctool</userinput></screen>
+              <screen><userinput>yelp help:gcalctool</userinput></screen>
 
               <para>If you want to open the help document at a particular section,
               append a question mark to the end of the URI, followed by the section id.</para>
               
-              <screen><userinput>yelp ghelp:user-guide?yelp-advanced-cmdline</userinput></screen>
+              <screen><userinput>yelp help:user-guide?yelp-advanced-cmdline</userinput></screen>
             </listitem>
           </varlistentry>
 
@@ -1038,8 +1038,8 @@ a screenshot of the entire screen.</para>
             <para>Perform conversion from DocBook format to a format suitable
             for display.</para>
           </listitem>
-        </itemizedlist><application>Yelp Help Browser</application> relies on <ulink url="ghelp:mate-doc-xslt">MATE XSLT
-      Stylesheets</ulink> to perform conversion from DocBook to HTML.  <ulink url="ghelp:mate-doc-make">MATE Documentation 
+        </itemizedlist><application>Yelp Help Browser</application> relies on <ulink url="help:mate-doc-xslt">MATE XSLT
+      Stylesheets</ulink> to perform conversion from DocBook to HTML.  <ulink url="help:mate-doc-make">MATE Documentation
       Build Utilities</ulink> are relied upon by application authors to install and register documentation within the help system.</para>
     </section>
 
diff --git a/user-guide/C/legal.xml b/user-guide/C/legal.xml
index acb0b40..9c4e248 100644
--- a/user-guide/C/legal.xml
+++ b/user-guide/C/legal.xml
@@ -6,7 +6,7 @@
 	  by the Free Software Foundation with no Invariant Sections,
 	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
 	  a copy of the GFDL at this <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+	  url="help:fdl">link</ulink> or in the file COPYING-DOCS
 	  distributed with this manual.
          </para>
          <para> This manual is part of a collection of MATE manuals