server: docs: remove deprecated configuration and user upgrade.

[disorder] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1e2f748ba99d30618a73ef64d9e4ec3783c61005..a3683abe300dd720ad6ba493830ca4f828ad329a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ config.aux/ltmain.sh
 config.aux/missing
 config.aux/py-compile
 ,*
-ChangeLog.d/bzr-changelog
 *.la
 *.lo
 .deps
@@ -82,7 +81,6 @@ server/disorderd
 server/trackname
 sounds/Makefile
 templates/Makefile
-.bzr.backup
 doc/disorder-speaker.8.html
 .gdb_history
 core
@@ -208,3 +206,5 @@ disobedience/manual/Makefile
 /m4
 libtests/t-timeval
 *.[oa]
+*~
+*.pyc