Don't include the filter list (which is now over 16MB) in the

wireshark-filter man page. Point to other sources for the list instead.

svn path=/trunk/; revision=33539

4 files changed, 26 insertions, 26 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ef88405808..b8a3ce45f1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -135,18 +135,14 @@ wireshark-filter.4: wireshark-filter.pod ../config.h
 	--section=4					\
 	--center="The Wireshark Network Analyzer"	\
 	--release=$(VERSION)				\
-	wireshark-filter.pod > wireshark-filter.4
+	$(srcdir)/wireshark-filter.pod > wireshark-filter.4
 
 wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(POD2HTML)								\
 	--title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)"	\
 	--css=$(top_srcdir)/docbook/ws.css					\
 	--noindex								\
-	wireshark-filter.pod > wireshark-filter.html
-
-wireshark-filter.pod: wireshark-filter.pod.template  ../tshark
-	WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | \
-	$(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
+	$(srcdir)/wireshark-filter.pod > wireshark-filter.html
 
 capinfos.1: capinfos.pod ../config.h
 	$(POD2MAN)					\
@@ -266,7 +262,6 @@ randpkt.html: randpkt.pod ../config.h $(top_srcdir)/docbook/ws.css
 	$(srcdir)/randpkt.pod > randpkt.html
 
 CLEANFILES =		\
-	wireshark-filter.pod \
 	wireshark.pod \
 	wireshark-filter.4 \
 	wireshark-filter.html \
@@ -339,6 +334,6 @@ EXTRA_DIST = \
 	sgml.doc.template	\
 	text2pcap.pod		\
 	tshark.pod		\
-	wireshark-filter.pod.template \
+	wireshark-filter.pod    \
 	wireshark.pod.template
 
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index 37dc87b523..a37f7fedb5 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -91,18 +91,6 @@ wireshark-filter.html: wireshark-filter.pod ../config.h ws.css
 	--noindex                                 \
 	wireshark-filter.pod > wireshark-filter.html
 
-tabchar=	
-# We can't generate a filter list if we can't run TShark.
-wireshark-filter.pod: wireshark-filter.pod.template  dfilter2pod.pl ../tshark.exe
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86" && "$(WIRESHARK_TARGET_PLATFORM)" != "win32"
-	$(PERL) dfilter2pod.pl -e wireshark-filter.pod.template > wireshark-filter.pod
-!else
-	cd ..
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-all
-	$(INSTALL_DIR)\tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod
-	cd doc
-!endif
-
 capinfos.1: capinfos.pod ../config.h
 	$(POD2MAN)                      \
 	--center="The Wireshark Network Analyzer" \
diff --git a/doc/doc.vcproj b/doc/doc.vcproj
index c2531eca25..fdfe9ad11a 100644
--- a/doc/doc.vcproj
+++ b/doc/doc.vcproj
@@ -155,7 +155,7 @@
 				>

 			</File>

 			<File

-				RelativePath=".\wireshark-filter.pod.template"

+				RelativePath=".\wireshark-filter.pod"

 				>

 			</File>

 			<File

diff --git a/doc/wireshark-filter.pod.template b/doc/wireshark-filter.pod
index a2e3574b35..df1e0b489e 100644
--- a/doc/wireshark-filter.pod.template
+++ b/doc/wireshark-filter.pod
@@ -368,13 +368,30 @@ lets "ip.dst ne 224.1.2.3" filter out the unwanted IP packets. The
 second filter has already been explained above where filtering with
 multiply occuring fields was discussed.
 
-=head1 FILTER PROTOCOL REFERENCE
+=head1 FILTER FIELD REFERENCE
 
-Each entry below provides an abbreviated protocol or field name.  Every
-one of these fields can be used in a display filter.  The type of the
-field is also given.
+The entire list of display filters is too large to list here. You can
+can find references and examples at the following locations:
 
-=insert_dfilter_table
+=over 4
+
+=item
+
+The online Display Filter Reference: L<http://www.wireshark.org/docs/dfref/>
+
+=item
+
+I<Help:Supported Protocols> in Wireshark
+
+=item
+
+C<tshark -G fields> on the command line
+
+=item
+
+The Wireshark wiki: L<http://wiki.wireshark.org/DisplayFilters>
+
+=back
 
 =head1 NOTES