diff options
| author | Dan Gudmundsson <[email protected]> | 2017-11-27 16:16:55 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-11-27 16:16:55 +0100 |
| commit | b0f407e20502f386b6c974f38a755417aaacf6a4 (patch) | |
| tree | 131e2dc97eff769a9753bcc60bd5e391e23e945e /lib | |
| parent | 5833bc53f9b785146a58d17fc171a5f049ac1cb7 (diff) | |
| parent | 7716381b10e23709b3c383e3fb5c8fcd579bf799 (diff) | |
| download | otp-b0f407e20502f386b6c974f38a755417aaacf6a4.tar.gz otp-b0f407e20502f386b6c974f38a755417aaacf6a4.tar.bz2 otp-b0f407e20502f386b6c974f38a755417aaacf6a4.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_docgen/src/docgen_edoc_xml_cb.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/kernel.appup.src | 6 |
2 files changed, 6 insertions, 2 deletions
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+ }. |