I'll address the trademark issue in the next revision of the patch, which will also include other required changes.
Regarding the links to the different parts of the API documentation:
o The public API is already linked to for each version of Derby on the documentation page.
o The Apache Derby Papers page probably doesn't include testing because it's all about the engine (I'm just guessing here). Not sure if Tools fits into that theory though...
Regarding the documentation page, we can (a) use "API documentation" and duplicate the link to the published API, or (b) use "Internal API documentation" with the engine, language, testing, and tools links.
I lean towards (b) - i.e. a kind of Derby user vs Derby developer distinction  - but can happily go with (a) too
Of course, the content can be organized in a totally different way too. For instance, we could add the links into the latest alpha docs table. My reason for not doing that, is that I doubt these links will be used much by Derby users.
 Tools may not fit here, but then again BNF isn't the most user friendly documentation in my opinion... At least this one has comments and some helpful text