oops - now actually adding --help-options and doc updates

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 516712d3eb261ae73b8755f9c9d97a9a5f8a1e9f..9c571e7bd3ae7c9be6e346989265e0cee0d90a27 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -41,19 +41,19 @@ dist_doc_DATA += $(EXTRA_DIST)
 snort = $(top_srcdir)/src/snort
 
 builtin.txt: $(snort)
-       $(snort) --markup --help-builtin > $@
+       $(snort) --markup --help-builtin | sort -n -t : -k 1.4 -k 2 > $@
 
 commands.txt: $(snort)
-       $(snort) --markup --help-commands > $@
+       $(snort) --markup --help-commands | sort > $@
 
 config.txt: $(snort)
-       $(snort) --markup --help-config > $@
+       $(snort) --markup --help-config | sort -k 3 > $@
 
 gids.txt: $(snort)
-       $(snort) --markup --help-gids > $@
+       $(snort) --markup --help-gids | sort -n  -k 1.4 > $@
 
 options.txt: $(snort)
-       $(snort) --markup --help > $@
+       $(snort) --markup --help-options | sort > $@
 
 version.txt: $(snort)
        $(snort) -V 2>&1 | grep -v Using > $@

diff --git a/doc/snort_manual.txt b/doc/snort_manual.txt
index ffe82cd68dc6e27f89cc2de54d1a2fed631e5dd6..7eeb000bea5b5d14a81da61e2b7880f115f07859 100644 (file)
--- a/doc/snort_manual.txt
+++ b/doc/snort_manual.txt
@@ -26,13 +26,11 @@ include::options.txt[]
 
 include::config.txt[]
 
-== Builtin Rules
-
-The following generators are available:
+== Generators
 
 include::gids.txt[]
 
-These rules are from the decoders and inspectors:
+== Builtin Rules
 
 include::builtin.txt[]
 

diff --git a/src/parser/cmd_line.cc b/src/parser/cmd_line.cc
index 0240b49f0923ed9acae3a9c3095a049b32118901..b856cf665011bdb4208f79253ea68e91ca6f917e 100644 (file)
--- a/src/parser/cmd_line.cc
+++ b/src/parser/cmd_line.cc
@@ -857,6 +857,9 @@ static ConfigFunc basic_opts[] =
     { "help-module", config_help_module,
       "output config, commands, and builtin rules for given module" },
 
+    { "help-options", config_help_options,
+      "<option prefix> (same as --help)" },
+
     { "lua", config_lua,
       "<chunk> extend/override conf with chunk; may be repeated" },