Jerry Talkington's patch to remove the filter stuff from

"Edit:Preferences" and put it directly under "Edit:Filters", and to add
an "Apply" button to it, which makes the currently selected filter the
current filter and applies it to the current capture.

svn path=/trunk/; revision=1275

1 files changed, 56 insertions, 43 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 4829a903d4..c918db0264 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -206,7 +206,14 @@ Exits the application.
 
 =item Edit:Preferences
 
-Sets the packet printing and filter options (see L<"Preferences"> below).
+Sets the packet printing, column display, and TCP stream coloring
+options (see L<"Preferences"> below).
+
+=item Edit:Filters
+
+Edits the saved list of filters, allowing filters to be added, changed,
+or deleted, and lets a selected filter be applied to the current
+capture, if any.
 
 =item Capture:Start
 
@@ -318,8 +325,7 @@ packets are displayed.
 =item Preferences
 
 The I<Preferences> dialog lets you select the output format of packets
-printed using the I<File:Print Packet> menu item and configure
-commonly-used filters.
+printed using the I<File:Print Packet> menu item.
 
 =over 6
 
@@ -333,44 +339,41 @@ I<File:> entry box lets you enter the name of the file you wish to save
 to.  Additinally, you can select the I<File:> button to browse the file
 system for a particular save file.
 
-=item Filter Preferences
+=item Column Preferences
 
-The I<Filters> page lets you create and modify filters, and set the
-default filter to use when capturing data or opening a capture file.
+The I<Columns> page lets you specify the number, title, and format
+of each column in the packet list.
 
-The I<Filter name> entry specifies a descriptive name for a filter, e.g.
-B<Web and DNS traffic>.  The I<Filter string> entry is the text that
-actually describes the filtering action to take, as described above.The
-dialog buttons perform the following actions:
+The I<Column title> entry is used to specify the title of the column
+displayed at the top of the packet list.  The type of data that the column
+displays can be specified using the I<Column format> option menu.  The row
+of buttons on the left perform the following actions:
 
 =over 6
 
 =item New
 
-If there is text in the two entry boxes, it creates a new associated list
-item.
+Adds a new column to the list.
 
 =item Change
 
-Modifies the currently selected list item to match what's in the entry
-boxes.
-
-=item Copy
-
-Makes a copy of the currently selected list item.
+Modifies the currently selected list item.
 
 =item Delete
 
 Deletes the currently selected list item.
 
+=item Up / Down
+
+Moves the selected list item up or down one position.
+
 =item OK
 
-Sets the currently selected list item as the active filter.  If  nothing
-is selected, turns filtering off.
+Currently has no effect.
 
 =item Save
 
-Saves the current filter list in F<$HOME/.ethereal/filters>.
+Saves the current column format as the default.
 
 =item Cancel
 
@@ -378,41 +381,60 @@ Closes the dialog without making any changes.
 
 =back
 
-=item Column Preferences
+=item TCP Stream Preferences
 
-The I<Columns> page lets you specify the number, title, and format
-of each column in the packet list.
+The I<TCP Streams> page can be used to change the color of the text
+displayed in the TCP stream window.  To change a color, simply select
+an attribute from the "Set:" menu and use the color selector to get the
+desired color.  The new text colors are displayed in a sample window.
 
-The I<Column title> entry is used to specify the title of the column
-displayed at the top of the packet list.  The type of data that the column
-displays can be specified using the I<Column format> option menu.  The row
-of buttons on the left perform the following actions:
+=back
+
+=item Filters
+
+The I<Filters> dialog lets you create and modify filters, and set the
+default filter to use when capturing data or opening a capture file.
+
+The I<Filter name> entry specifies a descriptive name for a filter, e.g.
+B<Web and DNS traffic>.  The I<Filter string> entry is the text that
+actually describes the filtering action to take, as described above.The
+dialog buttons perform the following actions:
 
 =over 6
 
 =item New
 
-Adds a new column to the list.
+If there is text in the two entry boxes, it creates a new associated list
+item.
 
 =item Change
 
-Modifies the currently selected list item.
+Modifies the currently selected list item to match what's in the entry
+boxes.
+
+=item Copy
+
+Makes a copy of the currently selected list item.
 
 =item Delete
 
 Deletes the currently selected list item.
 
-=item Up / Down
+=item Apply
 
-Moves the selected list item up or down one position.
+Sets the currently selected list item as the active filter, and applies
+it to the current capture, if any.
+(The currently selected list item must be a display filter, not a
+capture filter.)  If nothing is selected, turns filtering off.
 
 =item OK
 
-Currently has no effect.
+Sets the currently selected list item as the active filter.  If nothing
+is selected, turns filtering off.
 
 =item Save
 
-Saves the current column format as the default.
+Saves the current filter list in F<$HOME/.ethereal/filters>.
 
 =item Cancel
 
@@ -420,15 +442,6 @@ Closes the dialog without making any changes.
 
 =back
 
-=back
-
-=item TCP Streams
-
-The I<TCP Streams> page can be used to change the color of the text
-displayed in the TCP stream window.  To change a color, simply select
-an attribute from the "Set:" menu and use the color selector to get the
-desired color.  The new text colors are displayed in a sample window.
-
 =item Capture Preferences
 
 The I<Capture Preferences> dialog lets you specify various parameters for