Commit Graph

105 Commits

Author SHA1 Message Date
Guy Harris 357cfd3b03 A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example.  It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.

Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 19:16:22 +00:00
PHO 8d08b3ed82 help/Makefile.am: Use the python command chosen by the configure script
Change-Id: I7b6e2b0c7802e214b4483990d0e7e70c58b3f96b
Reviewed-on: https://code.wireshark.org/review/18042
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-04 01:40:24 +00:00
Pascal Quantin 6baa1b544c Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15 19:21:57 +00:00
Michael Mann cad300ec92 Use file extension when capturing from multiple interfaces.
Also update faq to include new temporary file format.

Change-Id: Ie6c318bb359974b89ff3e268155315c22ba7c4e4
Reviewed-on: https://code.wireshark.org/review/15685
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-02 11:13:42 +00:00
Guy Harris 0b05086754 Apple calls it just "OS X" these days.
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4
Reviewed-on: https://code.wireshark.org/review/11703
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-10 21:08:45 +00:00
Gerald Combs 1e3be59fbe WildPackets → Savvius.
Change-Id: I2494c2b1dcc9e324535b3f659b51b44059c478bd
Reviewed-on: https://code.wireshark.org/review/8304
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-06 16:48:03 +00:00
Peter Wu 68698db8cc Always use html2text.py for FAQ, improve output
A recent commit broke compilation with Python 3. The original author of
html2text.py is deceased and the fork has increased the number of files
for this "simple" helper.

The html2text.py script in this patch was rewritten and its output
matches with lynx (except for a few newlines around lists). This means
that indentation has been added for headings, paragraphs and lists.
Also, since it was written from scratch, a new license could be chosen
that matches Wireshark.

Since now the in-tree html2text.py script provides nicer output, remove
detection of the alternative programs (elinks, links). lynx/w3m is
somehow still necessary for asciidoc though.

(I also looked into reusing html2text.py for the release notes to
replace asciidoc, but the --format=html output produces different output
(HTML adds a ToC and section numbers). For now still require lynx for
release notes)

Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and
LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing
to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch
Linux x86_64. Test:

    # For each $PATH per python version, execute (with varying LC_ALL)
    help/faq.py -b | tools/html2text.py /dev/stdin | md5sum
    help/faq.py -b | tools/html2text.py | md5sum
    help/faq.py -b | tools/html2text.py
    help/faq.py -b | tools/html2text.py >/dev/null

Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd
Reviewed-on: https://code.wireshark.org/review/7779
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25 07:08:52 +00:00
Peter Wu 83b6338673 faq: fix formatting, fix links, use HTML5
The "a:hover" styling on https://www.wireshark.org/faq.html is ugly as
it is not a real link. This patch turns questions into clickable links
(focusing at the anchor) and converts from XHTML syntax to HTML5.

Dead links have been updated and other links have been converted to
https if available.

The result passes the HTML5 validation at https://validator.nu.

Change-Id: I32b7c18baeabe7ab7fce2dadd4c1d4e6de5c593f
Reviewed-on: https://code.wireshark.org/review/7778
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-25 07:08:05 +00:00
Gerald Combs cac102eee3 Change a lot of http:// URLs to https://.
Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.

Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10 19:30:50 +00:00
Stephen Fisher fbd6caa36c Take out parenthesis around faq.txt rule so it works when automake
chooses Korn shell instead of Bourne shell.  It still works with the
Bourne shell in my testing.

Change-Id: I00bfed22fb0d9bb183637ea5fb111904b8536949
Reviewed-on: https://code.wireshark.org/review/5880
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 18:33:40 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Gerald Combs bfde80d3dc Make sure we point to the GPLv2.
svn path=/trunk/; revision=54710
2014-01-13 16:22:01 +00:00
Bill Meier 8ab9c55618 From Ville Skyttä: Spelling Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9591


svn path=/trunk/; revision=54387
2013-12-23 15:53:13 +00:00
Evan Huus 2693e1243e Add some license headers after emailing the respective authors to confirm.
svn path=/trunk/; revision=52471
2013-10-09 17:30:50 +00:00
Jeff Morriss 9fd357b174 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :
As per http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script
the portable way to find out if a particular command is available is with "command -v" not
"which".

svn path=/trunk/; revision=50610
2013-07-15 13:28:53 +00:00
Gerald Combs cdab66760a <tt> → <code>
svn path=/trunk/; revision=48912
2013-04-18 17:10:47 +00:00
Gerald Combs 05cb9ac17c Convert a couple of Docbook-style "href"s to "a href"s.
svn path=/trunk/; revision=48906
2013-04-18 00:05:54 +00:00
Gerald Combs 594aa110aa Remove some no-longer-relevant content.
svn path=/trunk/; revision=48905
2013-04-17 23:34:31 +00:00
Evan Huus 1983b55379 From Alex Brinister via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8492
Correctly escape slashes in faq.py so that it will run under python 3.x

It still runs fine under 2.x, at least on my machine.

svn path=/trunk/; revision=48394
2013-03-18 18:55:58 +00:00
Gerald Combs c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Chris Maynard 688cb5c6fa Fix the temp file description. Wwhen capturing on multiple interface, pcapng is implied so the file format is not included as part of the temp file name.
svn path=/trunk/; revision=47269
2013-01-25 04:07:35 +00:00
Chris Maynard 5f3af16c08 Update the description of the temporary file name.
svn path=/trunk/; revision=47268
2013-01-25 03:48:55 +00:00
Chris Maynard 5bdfe5a5e8 Fix copy-and-paste, changing "protocols" to "capture file formats".
svn path=/trunk/; revision=44140
2012-07-30 17:01:35 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Chris Maynard 56ef1c4817 Update the paragraph in 7.12 describing the name of the temp file to include the name used when capturing on multiple interfaces.
svn path=/trunk/; revision=41871
2012-03-31 16:25:22 +00:00
Jeff Morriss 1cf31238ff As suggested by multipleinterfaces in http://ask.wireshark.org/questions/9194/can-i-recover-a-discarded-capture :
Add the location of the temporary file on Windows 7.

svn path=/trunk/; revision=41183
2012-02-24 21:43:48 +00:00
Gerald Combs aac47f7ce4 Run 2to3 on faq.py.
svn path=/trunk/; revision=38946
2011-09-09 00:12:20 +00:00
Gerald Combs c600dbe7c1 Update the help question.
svn path=/trunk/; revision=38928
2011-09-07 23:20:42 +00:00
Gerald Combs 482f0fa5a4 Add Python 3 support via 2to3.
svn path=/trunk/; revision=36221
2011-03-20 23:09:36 +00:00
Gerald Combs b029a19159 Don't assume everyone knows what Wireshark is.
svn path=/trunk/; revision=35110
2010-12-03 18:48:05 +00:00
Chris Maynard bfc0ad6824 Update the description of the temporary file name.
svn path=/trunk/; revision=34903
2010-11-16 16:15:04 +00:00
Jaap Keuter ebb477cbfd From Reinhard Speyerer:
This patch fixes several misspellings/typos in Wireshark documentation.

svn path=/trunk/; revision=28249
2009-05-02 06:47:26 +00:00
Bill Meier 642e4a3e36 temp file prefix changed from ether to wireshark
svn path=/trunk/; revision=27997
2009-04-08 15:01:26 +00:00
Jörg Mayer 5667e75a50 Get rid of FAQ file completely: It's still available as help/faq.txt
svn path=/trunk/; revision=27359
2009-02-03 08:49:03 +00:00
Gerald Combs c9c32db187 Remove lynx as a dependency on Windows. By default, create the FAQ using
html2text.py. You can override this by adjusting config.nmake or by setting
HTML2TXT.

svn path=/trunk/; revision=27041
2008-12-17 21:11:20 +00:00
Gerald Combs f49377e0e7 Update html2text.py to suit our needs. Add spaces in the faq.txt target
so to fix a problem with OS X 10.4. Add html2text.py to the end of the
faq.txt target.

svn path=/trunk/; revision=27040
2008-12-17 19:49:18 +00:00
Gerald Combs 9ef162199f Suggest an alternative to hunting for elinks/links/lynx.
svn path=/trunk/; revision=27003
2008-12-15 16:44:47 +00:00
Balint Reczey 4607e187df Serialize faq.txt creation steps.
svn path=/trunk/; revision=27001
2008-12-15 12:54:35 +00:00
Balint Reczey 40385b9ab0 Try browsers for faq.txt generation silently.
svn path=/trunk/; revision=26999
2008-12-15 12:35:23 +00:00
Balint Reczey bc79c1f13a Fixed links parameters.
Tested with Links 2.1pre37.

svn path=/trunk/; revision=26997
2008-12-15 10:34:37 +00:00
Stig Bjørlykke adf9b77ac1 From Didier Gautheron (bug 3121):
User srcdir in Makefiles for faq.py.

svn path=/trunk/; revision=26996
2008-12-14 23:56:51 +00:00
Bill Meier 157f478a23 Fix to make faq.txt when one or more of elinks,... don't exist
svn path=/trunk/; revision=26986
2008-12-13 15:00:11 +00:00
Bill Meier 40fd3c770b Default target should create the faq.txt file (no delete it)
svn path=/trunk/; revision=26983
2008-12-13 03:13:38 +00:00
Gerald Combs 9dcdec852b Try to get the FAQ targets working on Windows. Add lynx to the list of
required tools.

svn path=/trunk/; revision=26982
2008-12-13 02:59:42 +00:00
Gerald Combs 6906e79600 Fix FAQ targets.
svn path=/trunk/; revision=26981
2008-12-13 02:53:34 +00:00
Gerald Combs 8a1109396a Update faq.py to generate a full HTML document by default. Pull in a typo
fix from FAQ. Update the makefiles to build help/faq.txt and FAQ. Remove
help/faq.txt and FAQ from the repository, since they're automatically
generated now. Remove the make-faq script.

svn path=/trunk/; revision=26980
2008-12-13 00:58:43 +00:00
Gerald Combs 8cb89f2645 Add the script used to generate the FAQ on the web site. It's not very useful
in its current state.

svn path=/trunk/; revision=26978
2008-12-12 23:56:33 +00:00
Anders Broman 245d0ea29a From William Pursell:
Minor errors in the documentation, and an Ethereal reference

svn path=/trunk/; revision=24673
2008-03-17 21:26:54 +00:00
Jörg Mayer be8219c1c9 Update manuf and faq
svn path=/trunk/; revision=24400
2008-02-20 13:33:11 +00:00
Sake Blok 9b6f806089 This patch adds (ten) temporary coloring rules which will only live until Wireshark is
quit. Temporary coloring filters can be set by:

- pressing <ctrl>-<digit> will create a conversation coloring filter based on the
  addresses of the currently selected packet (order TCP/UDP/IP/Ethernet)
  This can also be achieved from the "View|Colorize Conversation" menu.

- Rightclicking on a packet in the packet-list will give the option to
  "Colorize Conversation" just as "Conversation Filter" does.

- Rightclicking on an item in the packet-detail-list will give the option to
  "Colorize with filter" which works similar to "Apply as filter"

Temporary filters can be cleared from the same menus or by pressing <ctrl>-<space>.

This patch also adds an item to the above mentioned menu's to add a permanent color filter
in the same way.


The colors for the temporary coloring rules are now hardcoded as I do not know
how to change the color of menu-items and therefore I chose to use icons to
show the actual color of each of the ten temporary coloring rules. Is it at all
possible to have different menu items in different colors?

One other way of solving this is to recreate the icons on the fly after changing
the colors. I will have a look into that once it is clear whether I can use 
different colors within the menu structure.


svn path=/trunk/; revision=23560
2007-11-24 11:38:16 +00:00