updated ignores

diff --git a/.gitignore b/.gitignore
index 5281308b28a545fc734f465e9f23362961de84b1..17e1136a4873d67e6e684d8f5dc45ae9e099116d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,17 @@
 *.[oac]
-*.rej
-*.swp
-*.out
-*.log
+*.deps/
 *.la
+*.libs/
 *.lo
+*.log
+*.out
+*.rej
+*.swp
 *~
-*.deps/
-*.libs/
 ._Xcode*
 Cbuild/
+Makefile
+Makefile.in
 Xcode*/
 aclocal.m4
 autom4te.cache/
@@ -21,49 +23,49 @@ config.status
 config.sub
 configure
 depcomp
+doc/basic.txt
 doc/builtin.txt
+doc/codec.txt
 doc/commands.txt
 doc/config.txt
 doc/config_changes.txt
+doc/data.txt
 doc/docbook-xsl.css
 doc/gids.txt
+doc/help.txt
 doc/images.tgz
+doc/inspector.txt
+doc/ips_action.txt
+doc/ips_option.txt
+doc/logger.txt
 doc/modules.txt
 doc/options.txt
-doc/version.txt
+doc/plugins.txt
 doc/signals.txt
 doc/snort_manual.chunked/
 doc/snort_manual.html
 doc/snort_manual.pdf
 doc/snort_manual.tgz
 doc/snort_manual.xml
-doc/basic.txt
-doc/codec.txt
-doc/data.txt
-doc/inspector.txt
-doc/ips_action.txt
-doc/ips_option.txt
-doc/logger.txt
+doc/version.txt
 extra/rule.xxd
 extra/snort_examples-1.0.tar.gz
 install-sh
 libtool
 ltmain.sh
 m4/
-Makefile
-Makefile.in
 missing
 snort
 snort.pc
 src/snort
 src/tags
-tools/snort2lua/tags
 src/target_based/sf_attribute_table.h
 src/target_based/y.tab.c
 src/test/suite_decl.h
 src/test/suite_list.h
 stamp-h1
 tools/snort2lua/snort2lua
+tools/snort2lua/tags
 tools/u2boat/u2boat
 tools/u2spewfoo/u2spewfoo
 ylwrap

diff --git a/ChangeLog b/ChangeLog
index 981a0cdb729efa18c90fcecb9362e052498bdb12..e3c07805d088a94a297fc1b12bc842e1691d53c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
 -- split doc for modules into separate sections by type
 -- reworked manual again to include terms and lists of modules and plugins
 -- added non-Lua error message
+-- updated .gitignore and sorted it
 
 123
 -- refactored documentation