Commit Graph

1198 Commits

Author SHA1 Message Date
Gerald Combs af3e2dbdc6 WSUG: Convert ``Advanced Topics'' to AsciiDoc.
Leave most of the content intact for now.

Change-Id: Ie91fda8a3fe6ea2eb4c47acf7c41d7e6979235b0
Reviewed-on: https://code.wireshark.org/review/3938
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01 05:16:14 +00:00
Gerald Combs 5e6e0600c5 WSUG: Convert ``Working with captured packets'' to AsciiDoc.
Leave most of the content intact for now.

Change-Id: Ic264814aa8e442df100ae8533098843ef6a2e6c9
Reviewed-on: https://code.wireshark.org/review/3937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01 02:38:16 +00:00
Gerald Combs eb14a1f932 WSUG: Convert the ``File I/O'' chapter to AsciiDoc.
Leave most of the content intact for now. Remove images for
no-longer-supported versions of GTK+. Add an example for building the
Guides to README.cmake.

Change-Id: Id9e6a308c91b594d1fb7f107d7b9b28074a92a8b
Reviewed-on: https://code.wireshark.org/review/3931
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01 01:07:08 +00:00
Gerald Combs 37c23fc910 WSUG: Fix URLs
Fix broken download URLs in the introduction. Update some macros to use
https:// URLs.

Change-Id: I145e74e14ec04ce5fcf94a65cd5623059875c6e1
Reviewed-on: https://code.wireshark.org/review/3932
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-31 18:32:15 +00:00
Joerg Mayer 827d8995d7 The remaining build systems didn't know about the change of the
capture chapter from xml to asciidoc either.

Change-Id: Ia48d4e0e4b445aedabd29a8483bcc19f12c13b20
Reviewed-on: https://code.wireshark.org/review/3857
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-26 04:35:25 +00:00
Joerg Mayer 1c98a1261b WSUG_chapter_capture is now an asciidoc file that gets converted
into an xml file.

Change-Id: I43ae59d14cbdcf460250cf62005aea4a2772d11f
Reviewed-on: https://code.wireshark.org/review/3846
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25 22:42:11 +00:00
Joerg Mayer 7f05ae67d3 As long as NEWS is still part of the git tree: At least don't differ
because of different timezones.

Change-Id: I93809447db29c2cc5f848edb438ee16372b57453
Reviewed-on: https://code.wireshark.org/review/3824
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25 22:16:02 +00:00
Gerald Combs a84937198b WSUG: Convert the "Capturing" chapter to AsciiDoc.
Leave most of the content intact for now. Add a section on markup
conventions to README.txt. Remove the .mediaobject border.

Change-Id: I06cfd482a4c8ea63c90b9f59fcdf2afaf636a4a2
Reviewed-on: https://code.wireshark.org/review/3821
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-25 22:15:17 +00:00
Graham Bloice d3728738dd Updates for docbook builds on Windows
In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1
In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows)
and not the Cygwin python used in asciidoc
In Readme.txt update some Cygwin package info

Change-Id: I117ec6bbdabc34829b421fd514508383b925090f
Reviewed-on: https://code.wireshark.org/review/3816
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-25 22:00:29 +00:00
Gerald Combs e2acc23edf Use Segoe UI to render the HTML Help text.
Change-Id: I0ff717dda35a39f34c3140f920f8ac2fe74e24bc
Reviewed-on: https://code.wireshark.org/review/3840
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-25 16:01:36 +00:00
Gerald Combs 7d81eabb4b Fix Autotools AsciiDoc configuration + CSS updates.
Fix --asciidoc-opts in Makefile.am.

Add borders around menu and keycap markup. I like the latter but the
former could probably use more work.

Change-Id: If02e3d00875106d6b8f8bcf01cd52b1df4f9b6c8
Reviewed-on: https://code.wireshark.org/review/3817
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 18:25:11 +00:00
Gerald Combs 7de88cc147 Try to get HTML Help to render SVG.
Add a custom stylesheet that inserts

    <meta http-equiv="X-UA-Compatible" content="IE=9" >

at the top of our HTML Help output. This *should* convince the
WebBrowser control to draw our new SVG images.

Change-Id: Iae491128195d3738951f3d19e2f82dd3fc73d1d8
Reviewed-on: https://code.wireshark.org/review/3814
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 17:47:22 +00:00
Gerald Combs f88eca47c3 Fix admon.graphics.path.
Change-Id: I43d7d56f0fc2bd73efc54a685aea90f635b145ff
Reviewed-on: https://code.wireshark.org/review/3807
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 05:23:58 +00:00
Gerald Combs d31011572d Convert admon graphics to SVG.
Use a common set of SVG files for AsciiDoc / DocBook admonition
graphics. Put them in a common directory. According to
http://caniuse.com/svg all common browsers have had SVG support for
a while now.

The graphics themselves were created with Inkscape. If you would like
to refine them further you are more than welcome.

Use variables to assemble xsltproc commands in Autotools and Nmake
while we're here.

Try to update Debian rules to reflect ga92c3fb.

Change-Id: If82647af27a60117c517125dff0aca81c033be72
Reviewed-on: https://code.wireshark.org/review/3206
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 02:56:35 +00:00
Gerald Combs 7d035a12b3 WSUG: Minor fixups for the statistics chapter.
Fix a quotation warning. Use the menu:[] and button:[] macros. Other
minor changes. Clean up whitespace.

Change-Id: I3ae98ddcbd90c8d22284a9ef467268dabee8f829
Reviewed-on: https://code.wireshark.org/review/3806
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 01:15:21 +00:00
Gerald Combs a92c3fb2fa CMake: More a2x / asciidoc fixes.
Create graphics directories and copy files into them similar
to Autotools and Nmake. Adjust some xsltproc arguments. Fix the
--asciidoc-opts flag.

Note: Admon graphics are broken pending change 3206.

Change-Id: I94d498de36150a7cb4ffd080581523300b222bd4
Reviewed-on: https://code.wireshark.org/review/3805
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24 00:11:32 +00:00
Gerald Combs 40c367ec88 Windows: Fix AsciiDoc / DocBook builds.
The "quotes" section of the Asciidoctor compatibility file appears to
be incompatible with Cygwin's version of AsciiDoc (8.6.3).

Change-Id: Ifd08095effa07bc7277a2fff9de322dda51a8d47
Reviewed-on: https://code.wireshark.org/review/3804
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-23 20:00:53 +00:00
Gerald Combs 02c5a12ee4 WSUG: Convert the "User Interface" chapter to AsciiDoc.
Add the "asciidoc.conf" compatibility configuration file from
Asciidoctor. Although we don't use Asciidoctor it gives us macros that
keep us from losing some useful DocBook elements. Update various CMake
files to support multiple AsciiDoc configuration files.

Leave most of the content intact for now. Hopefully the other chapters
aren't as laden with markup.

Change-Id: Id69757342b86abb2b3130cb61e90f5695a26ea8a
Reviewed-on: https://code.wireshark.org/review/3680
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-23 18:32:51 +00:00
Jeff Morriss 0c3e0db5f1 Add a few more NEWS items.
Fix a typo in the generation of top_srcdir NEWS.

Change-Id: I20a140a68b9afca5096d33d99a3ea5d24e776f05
Reviewed-on: https://code.wireshark.org/review/3626
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-17 04:16:52 +00:00
Gerald Combs 673247f04f Windows: Clean up text file packaging.
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending
conversion so that we don't depend on unix2dos.

Only copy the help toc and text files to the staging directory.

Add PowerShell to the Developer's Guide. Fixup some other content.

(asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not
a problem.)

Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71
Reviewed-on: https://code.wireshark.org/review/3487
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
2014-08-14 10:26:31 +00:00
Eugene Sukhodolin 9deb769096 Minor typo corrections
Change-Id: I5962ba6a9b9285095ddacf00307a3094c697461a
Reviewed-on: https://code.wireshark.org/review/3546
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-11 06:37:56 +00:00
Gerald Combs 8a34884bf0 Update the Developer's Guide for Chocolatey's Win flex-bison.
Change-Id: Id86a00b521e112e445856251f0c242fbb7a2573b
Reviewed-on: https://code.wireshark.org/review/3482
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-07 23:59:44 +00:00
Jeff Morriss 7bf2f2edfd Support building the NEWS file in out-of-source-tree builds.
Copy the built file into the source directory (since it's generated but checked
in).  Don't fail to build, though, if we can't do that copy.

Change-Id: Ia94a19b6f813ee78b191cd09d51198462f95b223
Reviewed-on: https://code.wireshark.org/review/3425
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-06 17:24:46 +00:00
Jeff Morriss edbb9edf39 Add Stateless Transport Tunneling to the list of new protocols and its author
to AUTHORS.

Change-Id: I2afcdb88b43fc8360b05d69ebc7d261e9bc84b32
Reviewed-on: https://code.wireshark.org/review/3421
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-05 00:44:23 +00:00
Kevin Cox 7bc0b9bfc6 Initial Ceph Dissector.
This is the first version of a Ceph dissector.  It is not complete but
is far enough along to be helpful to many people working with Ceph.

Currently the dissector can fully dissect the Ceph protocol and has
support for full dissection of most common messages.  For the other
messages for which full dissection is not available their metadata is
parsed and shown along with the raw data of the different message
sections.

Change-Id: Ic7917a3d01148c6fe2f9ea2c13ecd09ecc06c2d7
Reviewed-on: https://code.wireshark.org/review/1889
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-04 21:50:25 +00:00
Guy Harris 6af0631457 Remove duplicate line.
Change-Id: I0b32ccaaa7c9e0294ee7bc96fe4937a98d8461d5
Reviewed-on: https://code.wireshark.org/review/3394
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03 20:54:28 +00:00
Gerald Combs 43eea3cfe8 Convert the Statistics chapter to AsciiDoc.
Don't update any content for now.

Change-Id: Ib4f6402d9b23bd1ad57a57831b63c63a150391aa
Reviewed-on: https://code.wireshark.org/review/3372
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02 23:23:11 +00:00
Gerald Combs 27c68f0b69 Fix markup.
Change-Id: I370af51abca6156a5ce293485970896b417bd7bf
Reviewed-on: https://code.wireshark.org/review/3371
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02 22:47:58 +00:00
Gerald Combs a722f83ff1 Convert the build and install chapter to AsciiDoc.
Add OS X content. Remove GTK+ content. Update the names in the NSIS
package to match the documentation (untested).

Change-Id: Id8fd08982bc26871bb8a319b0319808bcdba878c
Reviewed-on: https://code.wireshark.org/review/3366
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-02 21:05:01 +00:00
Guy Harris acea064009 Missing end-of-line backslash.
Change-Id: I99b72e4d38b12e0356f27d29f919484e40b7443b
Reviewed-on: https://code.wireshark.org/review/3287
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 08:57:28 +00:00
Guy Harris 067beb0210 Add a bunch of missing files to the distribution.
Files from the debian directory, documents from the doc directory,
graphics from the docbook/wsug_graphics directory, and the echld
Makefile.nmake.

Change-Id: Iccccc58811753581b0b180053defd937aea22f95
Reviewed-on: https://code.wireshark.org/review/3283
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 07:43:41 +00:00
Jeff Morriss b99d964275 Document some new features (and API changes) since 1.12.0.
Change-Id: I404f038a739ca41cb124a979fe6cf807a0b7e978
Reviewed-on: https://code.wireshark.org/review/3235
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-29 01:50:43 +00:00
Jeff Morriss 251ee715a5 Add OptoMMP to the Release Notes and NEWS. Add its author to AUTHORS.
Change-Id: I899dafbdf0f1aa94b71ca1dcb93d1ef1b2039386
Reviewed-on: https://code.wireshark.org/review/3200
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-25 23:28:08 +00:00
Gerald Combs 700a474d3b Start converting the User's Guide to AsciiDoc.
Convert the preface and introduction. Update various makefiles.

Change-Id: Id998cabadb6de458f04b7a43bdba4f98e4edb052
Reviewed-on: https://code.wireshark.org/review/3139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
2014-07-21 15:31:16 +00:00
Joerg Mayer 87895d7d0e Remove some $Id$ lines
Change-Id: Idec3769750f5a433b184e6e9fb44cbad23a29c60
Reviewed-on: https://code.wireshark.org/review/3023
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-07-12 14:31:51 +00:00
Tim Furlong 09839e3a6a Update WSDG win32/win64 quick start guide to include dependencies and
instructions for building QtShark; note alternate cygwin package for
'patch' utility; update example setup script to add Qt bin directory to PATH,
and extract out paths as variables.

Change-Id: Id404b8757dbfd0dc1119b89e01bbe2fa139e2b38
Reviewed-on: https://code.wireshark.org/review/2751
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02 06:08:39 +00:00
Tim Furlong f737381896 Add a note to Doc/docbook-xml42 requirement in docbook/README.txt indicating
that a later version may be required; e.g. my a2x (from cygwin64) generates a
developer-guide.xml that needs docbook-xml45.

Change-Id: Iea9d4b45e32157a9317e3fcf6794668e3a810c54
Reviewed-on: https://code.wireshark.org/review/2750
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-02 01:21:24 +00:00
Yan Burman 1f724bc891 iSER: Add iSER dissector support
Bug: 10189
Change-Id: Ie99d99a1736b3c6446d5a00edf201a49dfcd4780
Reviewed-on: https://code.wireshark.org/review/2247
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26 15:26:18 +00:00
Guy Harris 9fe540c35b dos2unix is now in Utils, not Base.
Change-Id: Ib430582270a2b788843785fd5aa7148ebe0f8871
Reviewed-on: https://code.wireshark.org/review/2597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 00:55:55 +00:00
Guy Harris 858c48acc6 Point the user at http://www.cygwin.com/install.html for downloads.
That page gives a bit more information.

Change-Id: Id0c708ede50aa9e6c6583f6957c355a630fa7e7e
Reviewed-on: https://code.wireshark.org/review/2578
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23 17:04:58 +00:00
Guy Harris d51faaaee7 Point to the Cygwin mirrors page.
If you choose to install from the Intertubes, you probably want to
choose a nearby mirror site, rather than downloading from halfway across
the world; the list of download sites in setup*.exe's UI gives no
indication of where the mirror sites are, so you could end up picking
one to which you have a slow Internet path.  Tell the user about the
list of mirror sites on the Cygwin Web site, as that list *does* give
geographical locations.

Change-Id: Idf035d288885ee45db7b3627af969e64270487a1
Reviewed-on: https://code.wireshark.org/review/2555
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 18:39:12 +00:00
Guy Harris a59d62ef2d 64-bit Cygwin's dependencies for Bison are wrong; it doesn't require m4.
Change-Id: Id6a6c0a7c09ed1d9eb1e1d522930e3f94e7b20d6
Reviewed-on: https://code.wireshark.org/review/2554
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 18:32:36 +00:00
Guy Harris c935411f9b Remove trailing white space, copyedit, add a missing period.
Change-Id: I300d723a6f93293ebdf97c5ef6ac3e9b72c692ee
Reviewed-on: https://code.wireshark.org/review/2533
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 02:53:50 +00:00
Guy Harris e088923059 Update to reflect current reality.
Cygwin has both 32-bit and 64-bit versions, with separate installers.

Change-Id: I02b2699b9b3dbd3b3c65f7a372c6d423829f449b
Reviewed-on: https://code.wireshark.org/review/2532
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-22 02:51:11 +00:00
Pascal Quantin 7186b8a60d Fix documentation generation on Windows
Change-Id: I7166528e312c99b8477361140869ebeb2b7c03b9
Reviewed-on: https://code.wireshark.org/review/2487
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-20 17:38:04 +00:00
Pascal Quantin 158a329292 Update User Guide
Change-Id: I947085e2bffa3141dac20e3fe92077c515801297
Reviewed-on: https://code.wireshark.org/review/2466
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 22:18:25 +00:00
Jesse Gross c95ff6b42f Add dissector for Generic Network Virtualization Encapsulation (Geneve).
Change-Id: I3ecf655d8e49bb7b519c4ba95d4e45c7b114bdd6
Reviewed-on: https://code.wireshark.org/review/2359
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-19 18:24:03 +00:00
Jeff Morriss a9a73a8cc0 Get the Windows doc builds going again: define top_srcdir because it's used in Makefile.common.
Change-Id: I4e8905b28bd6fb8c7bf3d38dbf3882c393732bcf
Reviewed-on: https://code.wireshark.org/review/2291
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 05:44:05 +00:00
Joerg Mayer 1496111f99 Fix a whitepace error that got committed in the last change
Change-Id: I5344d04916998263710c16b506250062c1c11b37
Reviewed-on: https://code.wireshark.org/review/2275
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 21:05:38 +00:00
Bill Meier 27c5eaf947 Update info as to packages needed for Windows and Fedora.
Change-Id: Ie477760abd8232eb646526aeb7cd0eab377ce541
Reviewed-on: https://code.wireshark.org/review/2264
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-16 19:16:58 +00:00