update note
Merge branch 'master' of https://github.com/1for/garbage

Conflicts:
	Linux/org/apue.org