modified:   notes/bib.bib
	new file:   notes/expand-disk.tex
	new file:   notes/install-db2.tex
	modified:   notes/main.tex
	modified:   notes/os.tex
Merge branch 'master' of https://github.com/coanor/various-docs

Conflicts:
	notes/bib.bib
	notes/install-db2.tex

	modified:   .gitignore
	new file:   db-firewall/Makefile
	new file:   db-firewall/bib.bib
	new file:   db-firewall/db-firewall.tex
	new file:   db-firewall/f5.png
	new file:   db-firewall/lst.tex
	new file:   db-firewall/main.tex
	new file:   db-firewall/more-key.tex
	new file:   db-firewall/new-cmd.tex
	new file:   db-firewall/notes.pdf
	new file:   db-firewall/os.tex
	new file:   db-firewall/utils.tex
	modified:   notes/bib.bib
	modified:   notes/install-db2.tex
	modified:   notes/learn-py-from-django.tex
	modified:   notes/new-cmd.tex
	deleted:    suricata-mysql/Makefile
	deleted:    suricata-mysql/suricata-mysql.pdf
	new file:   suricata/Makefile
	new file:   suricata/bib.bib
	new file:   suricata/db2-drda.tex
	renamed:    suricata-mysql/ids-ips.eps -> suricata/ids-ips.eps
	renamed:    suricata-mysql/ids-ips.pic -> suricata/ids-ips.pic
	renamed:    suricata-mysql/ids-ips.ps -> suricata/ids-ips.ps
	renamed:    suricata-mysql/lst.tex -> suricata/lst.tex
	renamed:    suricata-mysql/main.tex -> suricata/main.tex
	new file:   suricata/more-key.tex
	new file:   suricata/mssql-tds.tex
	new file:   suricata/mysql-flow.eps
	new file:   suricata/mysql-flow.pic
	new file:   suricata/mysql-flow.ps
	new file:   suricata/mysql-mysql.tex
	renamed:    suricata-mysql/mysql.json -> suricata/mysql.json
	renamed:    suricata-mysql/new-cmd.tex -> suricata/new-cmd.tex
	new file:   suricata/oracle-tns.tex
	renamed:    suricata-mysql/os.tex -> suricata/os.tex
	new file:   suricata/sc-dev.pdf
	renamed:    suricata-mysql/suricata-mysql.tex -> suricata/suricata-mysql.tex
	renamed:    suricata-mysql/suricata.eps -> suricata/suricata.eps
	renamed:    suricata-mysql/suricata.pic -> suricata/suricata.pic
	renamed:    suricata-mysql/suricata.ps -> suricata/suricata.ps
	renamed:    suricata-mysql/utils.tex -> suricata/utils.tex