Merge branch 'maint'

* maint:
  Update HOWTO with wxWidgets build examples
  https should be mapped to url and not seealso
  Update kernel appup for OTP-20.2

3 files changed, 23 insertions, 5 deletions

diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index f62429a3ff..f7de69166a 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -506,12 +506,26 @@ If you have Xcode 4.3, or later, you will also need to download
 #### Building with wxErlang ####
 
 If you want to build the `wx` application, you will need to get wxWidgets-3.0
-(`wxWidgets-3.0.0.tar.bz2` from <http://sourceforge.net/projects/wxwindows/files/3.0.0/>) or get it from github with bug fixes:
+(`wxWidgets-3.0.3.tar.bz2` from <https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2>) or get it from github with bug fixes:
 
     $ git clone --branch WX_3_0_BRANCH [email protected]:wxWidgets/wxWidgets.git
 
-Be aware that the wxWidgets-3.0 is a new release of wxWidgets, it is not as
-mature as the old releases and the OS X port still lags behind the other ports.
+The wxWidgets-3.1 version should also work if 2.8 compatibility is enabled,
+add `--enable-compat28` to configure commands below.
+
+Configure and build wxWidgets (shared library on linux):
+
+    $ ./configure --prefix=/usr/local
+    $ make && sudo make install
+    $ export PATH=/usr/local/bin:$PATH
+
+Configure and build wxWidgets (static library on linux):
+
+    $ export CFLAGS=-fPIC
+    $ export CXXFLAGS=-fPIC
+    $ ./configure --prefix=/usr/local --disable-shared
+    $ make && sudo make install
+    $ export PATH=/usr/local/bin:$PATH
 
 Configure and build wxWidgets (on Mavericks - 10.9):
 
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 67e6e33c93..b065c18cda 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -489,6 +489,8 @@ otp_xmlify_a_href("#"++_ = Marker, Es0) -> % <seealso marker="#what">
     {Marker, Es0};
 otp_xmlify_a_href("http:"++_ = URL, Es0) -> % external URL
     {URL, Es0};
+otp_xmlify_a_href("https:"++_ = URL, Es0) -> % external URL
+    {URL, Es0};
 otp_xmlify_a_href("OTPROOT"++AppRef, Es0) -> % <.. marker="App:FileRef
     [AppS, "doc", FileRef1] = split(AppRef, "/"),
     FileRef = AppS++":"++otp_xmlify_a_fileref(FileRef1, AppS),
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index fc5417597f..4ee497bbbd 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -18,7 +18,9 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max one major revision back
- [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-20.*
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
+  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}],    % OTP-20.1+
  %% Down to - max one major revision back
- [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-20.*
+ [{<<"5\\.[0-3](\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-19.*, OTP-20.0
+  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}]     % OTP-20.1+
 }.