From the diffs:
master -> changed to main/parent (depending on context)
slave -> changed to child
blacklist -> changed to blocklist
black magic -> changed to magic
white space -> changed to whitespace/empty space (depending on context)
master -> changed to main/parent (depending on context)
slave -> changed to child
blacklist -> changed to blocklist
black magic -> changed to magic
white space -> changed to whitespace/empty space (depending on context)
A variant of PNG called PNG-16 uses the term "black magic", and it is appropriate there, because it is indeed black!