2 files changed, 41 insertions, 62 deletions

diff --git a/.gitignore b/.gitignore
index 197941f..db49700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,63 +1,44 @@
-aclocal.m4
-autom4te.cache
-.build*
-*.cat
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-data/apps
-data/init
-data/menu
-depcomp
+# Wildcard + in any subdir.
+*.o
+
+# Exact filename in any subdir.
 .deps
-doc/asciidoc/fluxbox-keys.xml
-doc/asciidoc/fluxbox-remote.xml
-doc/asciidoc/fluxbox.xml
-doc/fbrun.1
-doc/fbsetbg.1
-doc/fbsetroot.1
-doc/fluxbox-apps.5
-doc/fluxbox-keys.5
-doc/fluxbox-menu.5
-doc/fluxbox-remote.1
-doc/fluxbox-style.5
-doc/startfluxbox.1
-doc/fluxbox.1
-doc/fluxstyle.1
-doc/ru/fluxbox.1
-libtool
-libtool.m4
-ltmain.sh
-lt*.m4
 Makefile
 Makefile.in
-nls/*/generated-*.m
-*.o
-src/defaults.*
-src/FbTk/libFbTk.a
-src/fluxbox
-stamp-h
-stamp-h1
-util/fbrun/fbrun
-util/fbsetroot
-util/fluxbox-generate_menu
-util/fluxbox-remote
-util/fluxbox-update_configs
-util/startfluxbox
-version.h
-install-sh
-missing
-src/tests/testFont
-src/tests/testFullscreen
-src/tests/testDemandAttention
-src/tests/testKeys
-src/tests/testRectangleUtil
-src/tests/testSignals
-src/tests/testStringUtil
-src/tests/testTexture
-*~
-.*.swp
+
+# Exact wildcard, e.g., not in subdirs.
+/*.m4
+/doc/*.1
+/doc/*.5
+/doc/*/*.1
+/doc/*/*.5
+/nls/*/*.cat
+/nls/*/*.m
+
+# Exact match, if a directory then everything in directory.
+/aclocal.m4
+/autom4te.cache/
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/data/apps
+/data/init
+/data/menu
+/depcomp
+/install-sh
+/ltmain.sh
+/missing
+/src/FbTk/libFbTk.a
+/src/defaults.cc
+/src/defaults.hh
+/src/fluxbox
+/stamp-h1
+/util/fbrun/fbrun
+/util/fbsetroot
+/util/fluxbox-generate_menu
+/util/fluxbox-remote
+/util/fluxbox-update_configs
+/util/startfluxbox
+/version.h
diff --git a/doc/asciidoc/.gitignore b/doc/asciidoc/.gitignore
deleted file mode 100644
index 8c7bbbe..0000000
--- a/doc/asciidoc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.1
-*.5