Merge branch 'master' into master

Author: 霸都丶傲天

topics/java/index.md

@@ -1,13 +1,13 @@
 ---
-aliases: java-8, java8
+aliases: java-8, java8, java11, java-11, jvm, jdk, openjdk, javase, java-se
 created_by: James Gosling
 display_name: Java
 logo: java.png
 released: May 23, 1995
 short_description: Java is an object-oriented programming language used mainly for
-  desktop and mobile applications.
+  web, desktop, embedded devices and mobile applications.
 topic: java
-url: https://www.java.com/en/
+url: https://www.oracle.com/technetwork/java/javase/overview/index.html
 wikipedia_url: https://en.wikipedia.org/wiki/Java_(software_platform)
 ---
-Java was originally developed as an alternative to the C/C++ programming languages. It is now mainly used for building desktop, Android, and web server applications. Java is owned and licensed through Oracle.
+Java was originally developed as an alternative to the C/C++ programming languages. It is now mainly used for building web, desktop, mobile, and embedded applications. Java is owned and licensed through Oracle, with free and open source implementations available from Oracle and other vendors.

topics/javafx/index.md

@@ -1,12 +1,13 @@
 ---
-aliases: javafx-application, javafx-desktop-apps, javafx-gui, javafx-library
+aliases: javafx-application, javafx-desktop-apps, javafx-gui, javafx-library, openjfx
 created_by: Oracle
 display_name: JavaFX
 logo: javafx.png
 related: java, swing
 released: December 4, 2008
-short_description: JavaFX is a Java library used to create graphical user interfaces.
+short_description: JavaFX is a Java library used to create graphical user interfaces for desktop, as well mobile and embedded devices.
 topic: javafx
+url: https://openjfx.io
 wikipedia_url: https://en.wikipedia.org/wiki/JavaFX
 ---
-JavaFX is a Java library used to build consistent graphical user interfaces across a wide range of platforms. Applications developed with JavaFX can be run on devices such as desktop computers, mobile phones, TVs, tablets, and more.
+JavaFX is an open source, next generation client application platform for desktop, mobile and embedded systems built with Java. It is offered as a cross-platform Java library and it delivers consistent graphical user interfaces across a wide range of operating systems and devices. Applications developed with JavaFX can be run on devices such as desktop computers, mobile phones, TVs, tablets, and more.