fdp-primer: Add trademarks

Add the FreeBSD and Git trademarks to the the trademarks list.

Also forward commit 949582900fdaff5b8157a752fa8039a1887eba6c to
book.adoc.

Approved by: carlavilla (mentor)
Differential Revision: https://reviews.freebsd.org/D39847