Commit graph

36 commits

Author SHA1 Message Date
Jon Siwek
9967aea52c Integrate new Broxygen functionality into Sphinx.
Add a "broxygen" domain Sphinx extension w/ directives to allow
on-the-fly documentation to be generated w/ Bro and included in files.

This means all autogenerated reST docs are now done by Bro.  The odd
CMake/Python glue scipts which used to generate some portions are now
gone.  Bro and the Sphinx extension handle checking for outdated docs
themselves.

Parallel builds of `make doc` target should now work (mostly because
I don't think there's any tasks that can be done in parallel anymore).

Overall, this seems to simplify things and make the Broxygen-generated
portions of the documentation visible/traceable from the main Sphinx
source tree.  The one odd thing still is that per-script documentation
is rsync'd in to a shadow copy of the Sphinx source tree within the
build dir.  This is less elegant than using the new broxygen extension
to make per-script docs, but rsync is faster and simpler.  Simpler as in
less code because it seems like, in the best case, I'd need to write a
custom Sphinx Builder to be able to get that to even work.
2013-11-21 14:34:32 -06:00
Robin Sommer
0fe474e232 Polishing the reference section of the manual.
Mostly resorting and renaming a few things.
2013-10-07 15:53:46 -07:00
Robin Sommer
ac66db286a Merge remote-tracking branch 'origin/topic/documentation'
I'm merging in the documentation branch to avoid that it keeps getting
out of sync. We still need to work on this a bit more, I'll summarize
in a mail.

* origin/topic/documentation: (68 commits)
  Going over initial parts of the scripting overview.
  Adding lines in scripting/index.txt. No other change.
  Updating submodule.
  Pass over the Using Bro section.
  Applying doc updates from BIT-1063. (Anthony Verez)
  Breaking lines in using/*.
  More doc reorg, and a light pass over the first 3 sections.
  Starting to put a new structure in place.
  Updating submodule(s).
  Updating submodule(s).
  Adding some temporary testing/demonstration to front page.
  Switching btest to topic/robin/parts branch.
  Basic cross-referencing UIDs between files, btests, and baselines.
  A truly embarassing number of spelling corrections.
  Using redirection with bro-cut.  Include initial btests for this document.
  Corrected a mis-typed RST include.
  Initial start for "Using Bro".
  Spelling corrections.
  Include Notice Policy shortcuts in the Scripting User Manual.
  Notice::policy hooks and tests.
  ...

Conflicts:
	src/3rdparty
2013-08-31 16:07:44 -07:00
Robin Sommer
b74bf10565 Going over initial parts of the scripting overview.
I made a light pass over the text. Switched the includes over to the
new btest-include and adapted the other TEXT-EXECs a bit.

Also includes more tweaking all over the Sphinx setup.
2013-08-30 16:23:17 -07:00
Robin Sommer
867e4b52d8 More doc reorg, and a light pass over the first 3 sections. 2013-08-19 22:08:30 -07:00
Robin Sommer
534d4934b7 Starting to put a new structure in place.
I'll go through the various parts next and clean things up for the new
structure.
2013-08-13 17:18:28 -07:00
Robin Sommer
aec77c7cfe Merge remote-tracking branch 'origin/master' into topic/documentation
Conflicts:
	doc/index.rst
	doc/scripts/builtins.rst
	testing/btest/btest.cfg
2013-08-12 14:03:49 -07:00
Jon Siwek
d84f6e012c Fix various documentation, mostly related to file analysis.
- Fix examples/references in the file analysis how-to/usage doc.

- Add Broxygen-generated docs for file analyzer plugins.

- Break FTP::Info type declaration out in to its own file to get
  rid of some circular dependencies (between s/b/p/ftp/main and
  s/b/p/ftp/utils).
2013-07-29 16:15:37 -05:00
Robin Sommer
ef6b4885dd Adding some temporary testing/demonstration to front page. 2013-07-10 15:07:44 -07:00
Robin Sommer
a329c3e7c3 Merge remote-tracking branch 'origin/topic/jsiwek/plugin-docs'
Closes #1019.

* origin/topic/jsiwek/plugin-docs:
  Teach broxygen to generate protocol analyzer plugin reference.
  const adjustments
2013-07-03 16:32:00 -07:00
Jon Siwek
e56a17102e Teach broxygen to generate protocol analyzer plugin reference. 2013-06-07 13:21:18 -05:00
Jon Siwek
9c86a3ee0e Add a general file analysis overview/how-to document. 2013-05-23 14:29:13 -05:00
Robin Sommer
25bf563e1c Restructuring the main documentation index.
I'm merging in the remaining pieces from the former doc directory and
restructuring things into sub-directories.
2013-04-01 17:30:12 -07:00
Robin Sommer
f830ed3edf s/bro-ids.org/bro.org/g 2013-03-07 19:33:04 -08:00
Scott Runnels
1f45d5df1e Merge remote-tracking branch 'origin/master' into topic/documentation
Conflicts:
	doc/index.rst
2012-11-08 16:38:17 -05:00
Daniel Thayer
ba51974848 Add version-specific upgrade info
Rename the upgrade document so that it will be relevant for all
future releases, and add version-specific upgrade info (2.0 to 2.1).
2012-10-24 18:25:27 -05:00
Robin Sommer
5f5bc53b85 New branch for documentation, with an initial skeleton. 2012-10-24 11:13:02 -07:00
Bernhard Amann
d476e9f3f4 Merge remote-tracking branch 'origin/master' into topic/bernhard/input 2012-01-12 11:07:12 -08:00
Robin Sommer
4dd898131e Slight reordering on main doc page. 2012-01-10 19:17:22 -08:00
Bernhard Amann
949ec6897a Merge remote-tracking branch 'origin/master' into topic/bernhard/localnet 2011-12-03 20:15:05 -08:00
Jon Siwek
2913a990c4 Merge branch 'master' into fastpath 2011-12-01 09:12:42 -06:00
Robin Sommer
eb3af25e57 Fine-tuning the Sphinx layout to better match www.
Still needs some more tweaking, but it's getting there.
2011-11-30 20:16:09 -08:00
Jon Siwek
9be652f8ff Rearrange packet filter and dpd documentation. 2011-11-30 10:13:20 -06:00
Bernhard Amann
37773da9e6 Merge remote-tracking branch 'origin/master' into topic/bernhard/input 2011-11-29 10:23:14 -08:00
Jon Siwek
01693672bc Submodule README conformity changes
Broccoli API reference docs now also get copied into sphinx output
directory by the broxygen target if they exist.
2011-11-29 12:18:42 -06:00
Bernhard Amann
c7eda1907b Merge remote-tracking branch 'origin/master' into topic/bernhard/input 2011-11-29 09:56:54 -08:00
Jon Siwek
26296f9fb1 Add header/footer iframes to Broxygen docs to mimic website 2011-11-28 16:41:36 -06:00
Bernhard Amann
1abb1424b8 begin documenting... 2011-11-28 14:15:04 -08:00
Jon Siwek
be1b3ce5e1 Add note about independent component releases to Broxygen index. 2011-11-28 13:38:45 -08:00
Jon Siwek
286c8fd859 Add note about independent component releases to Broxygen index. 2011-11-28 13:29:02 -06:00
Jon Siwek
8d8f5dd006 Teach Broxygen to generate an index of Bro notices 2011-11-18 13:58:23 -06:00
Jon Siwek
ea2c89f2d7 Adapt more www niceties to broxygen (stylesheets, pygments); add more docs 2011-11-15 15:39:31 -06:00
Jon Siwek
fdf01a1ba6 Finished dissolving the sphinx source directory into doc/ and doc/scripts/ 2011-11-15 11:52:52 -06:00
Seth Hall
42e82b99cb Slightly changing some doc wording. 2011-11-02 09:51:54 -04:00
Robin Sommer
c2683afc01 Fixing links. 2011-10-31 13:30:45 -07:00
Robin Sommer
194c9c21d1 Distribution cleanup and documentation setupt tweaks. 2011-10-18 12:00:28 -07:00