I've removed the preference pages screenshots, as there was no description of the settings. I've added a link to the wiki pages and updated them accordingly (hopefully someone else might put the explanation text in there).

This way, we will have all preference descriptions at one place.

svn path=/trunk/; revision=13052

4 files changed, 15 insertions, 93 deletions

diff --git a/docbook/eug_src/EUG_chapter_customize.xml b/docbook/eug_src/EUG_chapter_customize.xml
index 9ab976b1f2..54f11debb0 100644
--- a/docbook/eug_src/EUG_chapter_customize.xml
+++ b/docbook/eug_src/EUG_chapter_customize.xml
@@ -690,7 +690,15 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ...
       will pop up the Preferences dialog box as shown in 
       <xref linkend="ChCustGUIPrefPage"/>, with the "User Interface" page as 
 	  default. On the left side is a tree where you can select the page to be 
-	  shown. XXX - add detailed descriptions of all the preferences pages.
+	  shown.
+	  <note><title>Note!</title>
+	  <para>
+	  Preference settings are added frequently. For a recent explanation of 
+	  the preference pages and their settings have a look at the 
+	  <command>Ethereal Wiki Preferences page</command> at <ulink 
+	  url="&EtherealWikiPreferencesPage;">&EtherealWikiPreferencesPage;</ulink>.
+      </para>
+      </note>
 	  <warning>
 		<title>Warning!</title>
 		<para>
@@ -725,98 +733,10 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a &lt;capture autostop condition> ] ...
 		</listitem>
 	</itemizedlist>
     </para>
-	<section><title>The "User Interface" page</title>
     <figure id="ChCustGUIPrefPage">
-      <title>The "User Interface" preferences page</title>
+      <title>The preferences dialog box</title>
       <graphic entityref="EtherealGUIPreferences" format="PNG"/>
     </figure>
-	<para>
-	      This page allows you to configure various characteristics 
-	      of the GUI.
-	</para>
-	</section>
-	<section><title>The "User Interface: Layout" page</title>
-    <figure id="ChCustGUILayoutPrefPage">
-      <title>The "User Interface: Layout" preferences page</title>
-      <graphic entityref="EtherealGUILayoutPreferences" format="PNG"/>
-    </figure>
-	<para>
-	This page selects the GUI layout of the main window.
-	</para>
-	</section>
-	<section><title>The "User Interface: Columns" page</title>
-	<para>
-    <figure id="ChCustGUIColumnsPrefPage">
-      <title>The "User Interface: Columns" preferences page</title>
-      <graphic entityref="EtherealGUIColumnsPreferences" format="PNG"/>
-    </figure>
-	      This page allows you to select which columns appear in the 
-	      "Packet List" Pane.
-	    </para>
-		<note><title>Note!</title>
-		<para>
-		Unlike all other preference changes, you will have to save the 
-		preferences and restart Ethereal in order for column changes to 
-		take effect! 
-		</para>
-		</note>
-	</section>
-
-	<section><title>The "User Interface: Font" page</title>
-	<para>
-    <figure id="ChCustGUIFontPrefPage">
-      <title>The "User Interface: Font" preferences page</title>
-      <graphic entityref="EtherealGUIFontPreferences" format="PNG"/>
-    </figure>
-	      This page allows you to select which font to use.
-	    </para>
-	</section>
-
-	<section><title>The "User Interface: Colors" page</title>
-	<para>
-    <figure id="ChCustGUIColrsPrefPage">
-      <title>The "User Interface: Colors" preferences page</title>
-      <graphic entityref="EtherealGUIColorsPreferences" format="PNG"/>
-    </figure>
-	      This page allows you to select which colors to use.
-	    </para>
-	</section>
-
-	<section><title>The "Capture" page</title>
-	<para>
-    <figure id="ChCustCapturePrefPage">
-      <title>The "Capture" preferences page</title>
-      <graphic entityref="EtherealCapturePreferences" format="PNG"/>
-    </figure>
-	      This page allows you to select some defaults for the capture options dialog.
-	    </para>
-	</section>
-
-	<section><title>The "Printing" page</title>
-	<para>
-    <figure id="ChCustPrintingPrefPage">
-      <title>The "Printing" preferences page</title>
-      <graphic entityref="EtherealPrintingPreferences" format="PNG"/>
-    </figure>
-	      This page allows you to select some defaults for the print dialog.
-	    </para>
-	</section>
-
-	<section><title>The "Name Resolution" page</title>
-	<para>
-    <figure id="ChCustNameResolutionPrefPage">
-      <title>The "Name Resolution" preferences page</title>
-      <graphic entityref="EtherealNameResolutionPreferences" format="PNG"/>
-    </figure>
-	      This page allows you to select some defaults for the name resolution.
-	    </para>
-	</section>
-
-	<section id="ChCustProtocolsPrefPages"><title>The "Protocols" pages</title>
-	<para>
-	These pages allows you to select settings for various protocols.
-	</para>
-	</section>
   </section>
   
 </chapter>
diff --git a/docbook/eug_src/EUG_chapter_use.xml b/docbook/eug_src/EUG_chapter_use.xml
index 12838b23b5..182d3d6c74 100644
--- a/docbook/eug_src/EUG_chapter_use.xml
+++ b/docbook/eug_src/EUG_chapter_use.xml
@@ -124,7 +124,7 @@
 	  <tip><title>Tip!</title>
 	  <para>
 	  The layout of the main window can be customized by changing preference settings. 
-	  See <xref linkend="ChCustGUILayoutPrefPage"/> for details!
+	  See <xref linkend="ChCustPreferencesSection"/> for details!
 	  </para>
 	  </tip>
     </para>
@@ -1669,7 +1669,7 @@
     <para>
 	There are a lot of different columns available. Which columns are 
 	displayed can be selected by preference settings, see 
-	<xref linkend="ChCustGUIColumnsPrefPage"/>.
+	<xref linkend="ChCustPreferencesSection"/>.
     </para>
     <para>
 	The default columns will show:
diff --git a/docbook/eug_src/EUG_chapter_work.xml b/docbook/eug_src/EUG_chapter_work.xml
index a34148dab2..b0850887c8 100644
--- a/docbook/eug_src/EUG_chapter_work.xml
+++ b/docbook/eug_src/EUG_chapter_work.xml
@@ -214,7 +214,7 @@
 	    <para>The menu item takes you to the preferences dialog and selects 
 		the page corresponding to the protocol if there are settings 
 		associated with the highlighted field. More information on preferences 
-		can be found in <xref linkend="ChCustProtocolsPrefPages"/>.
+		can be found in <xref linkend="ChCustPreferencesSection"/>.
 		</para>
 		</entry>
 	      </row>
diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index b4ad112fdc..34ccd32839 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -80,6 +80,8 @@ Ethereal Info
   <!ENTITY EtherealFAQPage "&EtherealWebSite;/faq.html">
   <!ENTITY EtherealFAQPromiscPage "&EtherealWebSite;/faq#promiscsniff">
   <!ENTITY EtherealMediaPage "&EtherealWebSite;/media.html">
+  <!ENTITY EtherealWikiPage "http://wiki.ethereal.com">
+  <!ENTITY EtherealWikiPreferencesPage "&EtherealWikiPage;/Preferences">
 
   <!ENTITY EtherealDevMailList "ethereal-dev[AT]ethereal.com">
   <!ENTITY EtherealUsersMailList "ethereal-users[AT]ethereal.com">