summaryrefslogtreecommitdiff
path: root/docbook/asciidoc.conf
AgeCommit message (Collapse)AuthorFilesLines
2016-11-11AsciiDoc: Create an include file for attributes.Gerald Combs1-58/+2
Move the replacement definitions in asciidoc.conf to attributes.asciidoc. This makes the markup a bit cleaner and is more compatible with AsciiDoctor. Use a standard naming scheme for URLs. Change-Id: Ica73aaadb013be2a4e6a3963fb54e6db6e02e98f Reviewed-on: https://code.wireshark.org/review/18655 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-23WSDG: Layout and content updates.Gerald Combs1-0/+1
Adjust the column widths of some tables to that they render more cleanly and without FOP warnings. Move some table content to plain text instead of trying to shove it into table cells. Fix some other layout and formatting. Change-Id: I40e40fd7ca5c3cc594ea30c8b1ad233afd4cdca4 Reviewed-on: https://code.wireshark.org/review/17880 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-13WSUG: Fixup PDF images.Gerald Combs1-0/+9
Pass relative image directory paths to xsltproc. The DocBook documentation says you can use a URI, but trying to get that to work with CMake and Windows appears to be a path to tears and undignified wails of frustration. Add attributes for our different types of images and use them so that the PDFs don't scale our screenshots to an unusable size. Change-Id: I786d09d9ef9be3d423b2af426a8867739ae12c1a Reviewed-on: https://code.wireshark.org/review/17688 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-13asciidoc.conf, sort-and-group: remove "and" if we have only one elementMartin Kaiser1-1/+1
--sort-and-group-- One --sort-and-group-- used to be converted into and One Remove the leading and in this case. Change-Id: I3332b316c4fcce164c94e36c3c7b4480947bdf68 Reviewed-on: https://code.wireshark.org/review/17003 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-212.1.2 → 2.3.0.Gerald Combs1-1/+1
Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b Reviewed-on: https://code.wireshark.org/review/16575 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-14More 2.1.1 → 2.1.2 changesPascal Quantin1-1/+1
Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4 Reviewed-on: https://code.wireshark.org/review/16441 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-082.1.0 → 2.1.1.Gerald Combs1-1/+1
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5 Reviewed-on: https://code.wireshark.org/review/15785 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-08Switch some AsciiDoc replacements to attributes.Gerald Combs1-3/+5
Many of our AsciiDoc "macros" are simple string replacements. Start converting them to attributes. Update the release notes. Change-Id: I23d9ffd311f13a34c16cde3b4898b7f7bb8ba638 Reviewed-on: https://code.wireshark.org/review/15778 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-11-10Fix Developers Guide link to source snapshotsGraham Bloice1-0/+1
Change-Id: I16280d3fd4023c5a16026e8e10f1d12dfca45641 Reviewed-on: https://code.wireshark.org/review/11657 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05Initialize 2.1.Gerald Combs1-2/+2
Change-Id: I515c53bb56cf82d1911b58f2cb2103afd0e597a5 Reviewed-on: https://code.wireshark.org/review/10810 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-201.99.5 → 1.99.6.Gerald Combs1-1/+1
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10Update the buildbot URL.Gerald Combs1-1/+1
Change-Id: Ia3a9e8e919d3702a4499351df0289294cd10f808 Reviewed-on: https://code.wireshark.org/review/7634 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs1-5/+5
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-051.99.3 → 1.99.4.Gerald Combs1-1/+1
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-041.99.2 → 1.99.3.Gerald Combs1-1/+1
Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-28Move Windows build to be VS2013 based using the Community EditionGraham Bloice1-0/+1
Drop references to long obsolete compilers. Added Chocolatey installer instructions for some packages. Change-Id: I416d4091b6acaa1ed0d5e586f0427708c4b2d646 Reviewed-on: https://code.wireshark.org/review/5986 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-101.99.1 → 1.99.2.Gerald Combs1-1/+1
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 Reviewed-on: https://code.wireshark.org/review/5705 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-09WSUG: Convert ``Command Line Tools'' to AsciiDoc.Gerald Combs1-0/+1
Move the idl2wrs section to the Developer's Guide. Leave most of the other content intact for now. Change-Id: I98c6eeab62af5cc55e3ce23ab1107df02b1a22cf Reviewed-on: https://code.wireshark.org/review/5214 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-09WSUG: Convert ``Protocols'', ``Messages'', and ``How Wireshark Works''Gerald Combs1-0/+1
to AsciiDoc. ``How Wireshark Works'' is disabled, so its final output hasn't been checked. Leave most of the content intact for now. Change-Id: Ia78951faa3ffd9c6d2e23067dbfb954ab4042f60 Reviewed-on: https://code.wireshark.org/review/5210 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-071.99.0 → 1.99.1.Gerald Combs1-1/+1
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6 Reviewed-on: https://code.wireshark.org/review/4532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-01WSUG: Convert ``Advanced Topics'' to AsciiDoc.Gerald Combs1-0/+4
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-08-31WSUG: Fix URLsGerald Combs1-6/+6
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-25WSUG: Convert the "Capturing" chapter to AsciiDoc.Gerald Combs1-0/+3
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-02Convert the build and install chapter to AsciiDoc.Gerald Combs1-1/+7
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-07-21Start converting the User's Guide to AsciiDoc.Gerald Combs1-1/+6
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-06-19Update User GuidePascal Quantin1-1/+1
Change-Id: I947085e2bffa3141dac20e3fe92077c515801297 Reviewed-on: https://code.wireshark.org/review/2466 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-231.11.4 → 1.99.0.Gerald Combs1-1/+1
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044 Reviewed-on: https://code.wireshark.org/review/1761 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-151.11.3 → 1.11.4.Gerald Combs1-1/+1
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019 Reviewed-on: https://code.wireshark.org/review/1154 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-1/+0
(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-02-25Add Git+Gerrit command line instructions.Gerald Combs1-0/+1
Add a Git+Gerrit command line example to the Developer's Guide. Convert some Subversion text to Git. Skip building the Developer's Guide if we don't have a2x. Change-Id: I62e9e71eb3ffc07d8677df35b4b197f53f77b4f2 Reviewed-on: https://code.wireshark.org/review/384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-27Migrate the build environment introduction to AsciiDoc.Gerald Combs1-4/+10
svn path=/trunk/; revision=54971
2014-01-27Convert the preface to AsciiDoc with minor edits.Gerald Combs1-0/+7
svn path=/trunk/; revision=54970
2014-01-25Migrate some of the SVN-specific content to Git.Gerald Combs1-1/+5
svn path=/trunk/; revision=54953
2014-01-24Start migrating the Developer's Guide to AsciiDoc. So far only oneGerald Combs1-1/+8
chapter (WSDG_chapter_sources) has been converted. Conversion was done using the script in https://code.wireshark.org/review/#/c/9/ along with manual cleanup. Changes are mostly limited formatting. It's helpful to have a copy of the pre-conversion guide for comparison. I've placed a chunked copy online at http://www.wireshark.org/~gerald/wsdg_html_2014_01/ . Tested under Autotools. Nmake and CMake will likely break. I'll take a look shortly. If only we had documention adding a feature branch to Gerrit and using it to test different platforms... svn path=/trunk/; revision=54945
2013-11-181.11.2 → 1.11.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=53412
2013-11-151.11.1 → 1.11.2.Gerald Combs1-1/+1
svn path=/trunk/; revision=53346
2013-10-31Fix up some macros.Gerald Combs1-2/+2
svn path=/trunk/; revision=52996
2013-10-161.11.0 -> 1.11.1Pascal Quantin1-1/+1
svn path=/trunk/; revision=52647
2013-07-29asciidoc.conf: Have sort-and-group remove commas.Gerald Combs1-1/+1
gen-bugnote: Create proper bug links. svn path=/trunk/; revision=51022
2013-06-05Forward-port part of r49794 from trunk-1.10.Gerald Combs1-1/+13
svn path=/trunk/; revision=49799
2013-04-221.9.3 → 1.11.0.Gerald Combs1-1/+1
svn path=/trunk/; revision=48972
2013-03-281.9.2 → 1.9.3.Gerald Combs1-1/+1
svn path=/trunk/; revision=48627
2013-03-18Add a wireshark-version:[] replacement and --sort-and-group-- blockGerald Combs1-0/+30
definition to asciidoc.conf. Add support for asciidoc.conf to make-version.pl. Set some SVN keywords. Fill in the new protocol list. svn path=/trunk/; revision=48405
2013-03-15Use the correct inline macro form for the ws-buglink and cve-idlinkGerald Combs1-8/+11
macros. Add an optional bug text attribute to ws-buglink. svn path=/trunk/; revision=48325
2013-03-15Add missing Asciidoc configuration.Gerald Combs1-0/+32
svn path=/trunk/; revision=48315