From ec4c80f6d29156d9a608f84183561bb5e5639e96 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Wed, 22 Nov 2017 10:08:18 +0100
Subject: https should be mapped to url and not seealso

external https links was generated as seealso which doens't work.
---
 lib/erl_docgen/src/docgen_edoc_xml_cb.erl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index 7cdbb502d9..91422c8910 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),
-- 
cgit v1.2.3


From d0b55d7d14ac0ce8b0e2ebe1f930c9ad0ebfc238 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Wed, 22 Nov 2017 13:18:02 +0100
Subject: Update HOWTO with wxWidgets build examples

It lacked build examples for linux, also suggest using wxWidgets-3.0.3
also add information about wxWidgets-3.1
---
 HOWTO/INSTALL.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index 36365799e3..1262bb0373 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -520,12 +520,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 git@github.com: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):
 
-- 
cgit v1.2.3