DERBY-4592-2.diff, DERBY-4592-2.stat, and DERBY-4592-2.zip, with changes to 11 additional files:
This patch fixes the Trademarks topics in the manuals and removes most references to Sun elsewhere in the Derby docs. Most such references are in trademark elements, which are not really necessary because of the Trademarks topic. I've also taken the opportunity to correct some trademark usages (JVM, for example) in the topics that needed changes anyway.
Some of the changes involved replacing specific references to the Sun JDK with more general statements about the JDK. I'd be grateful if someone from IBM would take a look at these to make sure that they apply to both JDKs. For example, does IBM's JDK have a keytool utility as Sun's does?
In a few cases, I've left the Sun name in: one Developer's Guide topic draws a specific contrast between the IBM and Sun JDK behavior. I put Sun in the past tense here.
I also left in a couple of references to "com.sun.crypto.provider.SunJCE" because I understand these package names are not changing. I also left the output of the sysinfo command as is in the Tools manual, because an Oracle-branded JVM is not available yet.
The Reference Manual topic on the derby.storage.pageCacheSize property has long contained an extremely obsolete paragraph about the 1.1.7 JVM. I think I asked a while ago, when I moved these topics to the Reference Manual, if anyone could provide information to update this. I didn't get any, so I left it as is. This seems to be a good time to remove it entirely, though it leaves us without any advice as to what a suitable page cache size might be. I'm still open to update suggestions.
Another Ref Man topic talked about the 4 JDBC driver types "defined by Sun" but didn't say where they are defined. I found the reference. Links to java.sun.com web pages will be valid for quite a while (though they will be redirected at some point).
I will commit this in 2-3 days if I don't hear of any needed changes.