Merge the following from the English version:
1.5 -> 1.6 java/links/api.sgml 1.5 -> 1.10 java/links/development.sgml 1.4 -> 1.5 java/links/documentation.sgml 1.5 -> 1.8 java/links/freebsd.sgml 1.5 -> 1.6 java/links/index.sgml 1.5 -> 1.8 java/links/resources.sgml 1.4 -> 1.6 java/links/servlets.sgml 1.4 -> 1.5 java/links/tools.sgml 1.4 -> 1.6 java/links/tutorials.sgml 1.4 -> 1.5 java/links/vendor.sgml
Approved by: phantom (mentor)