Commit graph

171 commits

Author SHA1 Message Date
Bernhard Amann
59967d40ac Merge remote-tracking branch 'origin/master' into topic/bernhard/input
Conflicts:
	src/LogMgr.cc
	src/LogMgr.h
2011-12-19 12:36:53 -08:00
Robin Sommer
719557a05b Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Enable warnings for malformed Broxygen xref roles.
  Broxygen fix for function parameter recognition; better than 80b2451.
  Allow Broxygen markup "##<" for more general use.
2011-12-18 15:10:49 -08:00
Jon Siwek
23177aa081 Enable warnings for malformed Broxygen xref roles. 2011-12-16 14:36:15 -06:00
Jon Siwek
cc1459ef35 Fix some malformed Broxygen xref roles. 2011-12-16 14:30:36 -06:00
Jon Siwek
3b91df8cf5 Allow Broxygen markup "##<" for more general use. 2011-12-16 11:21:49 -06:00
Jon Siwek
bd00fb7894 Merge branch 'master' into topic/script-reference 2011-12-16 11:12:11 -06:00
Robin Sommer
84e6caed2c Merge remote branch 'origin/master'
* origin/master:
  Cleanup some misc Broxygen css/js stuff.
  Add search box to Broxygen docs (fixes #726).

Some markup for the tracker to close the recently addresses tickets:

Closes #726.
Closes #433.
Closes #311.
Closes #664.
2011-12-16 02:41:43 -08:00
Robin Sommer
4e17ef63f0 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix missing action in notice policy for looking up GeoIP data.
  Better persistent state config warning messages (fixes #433).
  A few updates for SQL injection detection.
  Fixed some DPD signatures for IRC.  Fixes ticket #311.
  Removing Off_Port_Protocol_Found notice.
  SSH::Interesting_Hostname_Login cleanup.  Fixes #664.
  Teach Broxygen to more generally reference attribute values by name.
  Fixed a really dumb bug that was causing the malware hash registry script to break.
  Fix Broxygen confusing scoped id at start of line as function parameter.
  Remove remnant of libmagic optionality
2011-12-16 02:36:43 -08:00
Jon Siwek
fc9a38a796 Cleanup some misc Broxygen css/js stuff. 2011-12-15 13:01:23 -06:00
Jon Siwek
d04558dc45 Add search box to Broxygen docs (fixes #726). 2011-12-15 13:00:29 -06:00
Jon Siwek
d89658c19b Add more signature framework documentation. 2011-12-14 12:50:54 -06:00
Jon Siwek
1f57827e54 Add more logging framework documentation. 2011-12-09 14:30:21 -06:00
Jon Siwek
6d3b29b0ec Add builtin type documentation, clean up format of attribute docs. 2011-12-08 15:55:38 -06:00
Jon Siwek
80b24513e7 Fix Broxygen confusing scoped id at start of line as function parameter. 2011-12-07 17:08:38 -06:00
Jon Siwek
9ac338341e Merge branch 'master' into topic/script-reference 2011-12-07 15:47:29 -06:00
Bernhard Amann
89a29c3d7d Merge remote-tracking branch 'origin/master' into topic/bernhard/input 2011-12-07 13:13:43 -08:00
Jon Siwek
749e510fc7 Merge branch 'master' into topic/script-reference
Conflicts:
	src/event.bif
2011-12-06 09:37:13 -06:00
Bernhard Amann
949ec6897a Merge remote-tracking branch 'origin/master' into topic/bernhard/localnet 2011-12-03 20:15:05 -08:00
Jon Siwek
a43ed633a4 Changes to Broxygen master script package index
- Now only lists packages as those directories in the script hierarchy
  that contain an __load__.bro file.
- Script packages (dirs with a __load__.bro file), can now include a
  README (in reST format) that will automatically be appended under
  the link to a specific package in the master package index.
2011-12-02 13:59:33 -06:00
Matthias Vallentin
be3913fe54 Merge branch 'topic/script-reference' of ssh://git.bro-ids.org/bro into topic/script-reference 2011-12-01 20:57:59 -08:00
Matthias Vallentin
30399d86e9 Document some attributes.
I am not going to edit the attributes any further, please go ahead and text to
the missing TODOs.
2011-12-01 20:42:05 -08:00
Jon Siwek
f6494a09c9 Add missing doc targets to top Makefile; remove old doc/Makefile. (fixes #705) 2011-12-01 09:16:38 -06: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
Robin Sommer
a690199613 Merge remote-tracking branch 'origin/master' into topic/script-reference 2011-11-30 15:39:41 -08:00
Robin Sommer
01b4ea1f5d Merge branch 'master' of ssh://git.bro-ids.org/bro 2011-11-30 14:04:03 -08:00
Jon Siwek
cf30559df6 Merge branch 'master' into topic/script-reference 2011-11-30 10:29:11 -06:00
Jon Siwek
9be652f8ff Rearrange packet filter and dpd documentation. 2011-11-30 10:13:20 -06:00
Jon Siwek
95ca102546 Sphinx-built docs now adopt 960.css style from website 2011-11-30 09:44:59 -06:00
Jon Siwek
4fc5dea3d7 Add Broxygen links to notice frameworks docs. 2011-11-29 13:31:27 -06:00
Bernhard Amann
2a6387129c documentation 2011-11-29 11:25:11 -08: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
Robin Sommer
59a6187f42 Checkpointing work on event.bif.
Much there, not all yet.
2011-11-28 18:41:39 -08:00
Jon Siwek
5991eaa564 Turn off Broxygen's sticky/floating sidebar. 2011-11-28 18:12:46 -06: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
305621672f Teach Broxygen the .. bro:see:: directive 2011-11-19 07:19:57 -06:00
Jon Siwek
d3d09b798a More Broxygen stylesheet tweaks. 2011-11-18 16:06:21 -06:00
Jon Siwek
05d107db17 Change external Broxygen links to render same as internals. 2011-11-18 14:06:44 -06:00
Jon Siwek
8d8f5dd006 Teach Broxygen to generate an index of Bro notices 2011-11-18 13:58:23 -06:00
Jon Siwek
5227eb73c8 Teach Broxygen :bro:see: role for referencing any identifier in Bro domain. 2011-11-17 16:55:51 -06:00
Jon Siwek
ec33453d2d Add a "last updated date" to Broxygen docs. 2011-11-17 16:51:27 -06:00
Robin Sommer
7696c8b365 Merge remote-tracking branch 'origin/topic/jsiwek/require-libmagic-libz'
* origin/topic/jsiwek/require-libmagic-libz:
  Promote libz and libmagic to required dependencies.

Conflicts:
	doc/quickstart.rst

Closes #674
2011-11-15 17:08:24 -08:00
Jon Siwek
72aa13968b Fix documentation interlinkage and normalize console directive bodies. 2011-11-15 16:27:06 -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