diff options
| author | Peter Andersson <[email protected]> | 2016-03-09 10:29:02 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-03-09 10:29:02 +0100 |
| commit | fb44a4de532ae97b3424078577dee7370078dea0 (patch) | |
| tree | a6d60e090ff237de7513016c7f2d53db9cd4a8a2 /lib/test_server/src/erl2html2.erl | |
| parent | b68ec56d44ff7f94289670ca0f10c8bbce927be5 (diff) | |
| parent | 9b9879b1ccbeff9ec87494ba7ed59273d679740e (diff) | |
| download | otp-fb44a4de532ae97b3424078577dee7370078dea0.tar.gz otp-fb44a4de532ae97b3424078577dee7370078dea0.tar.bz2 otp-fb44a4de532ae97b3424078577dee7370078dea0.zip | |
Merge branch 'peppe/common_test/html_improvements' into maint
* peppe/common_test/html_improvements:
Fix problems with formatted test_server printouts
Make sure special characters are escaped in e.g. pal and log printouts
Conflicts:
lib/test_server/src/test_server.erl
Diffstat (limited to 'lib/test_server/src/erl2html2.erl')
| -rw-r--r-- | lib/test_server/src/erl2html2.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl index 2c63103264..e69383acea 100644 --- a/lib/test_server/src/erl2html2.erl +++ b/lib/test_server/src/erl2html2.erl @@ -44,7 +44,7 @@ convert(File, Dest, InclPath) -> "<html>\n" "<head>\n" "<meta http-equiv=\"Content-Type\" content=\"text/html;" - "charset=",html_encoding(Encoding),"\"/>\n" + "charset=",html_encoding(Encoding),"\"/></meta>\n" "<title>", to_raw_list(File,Encoding), "</title>\n" "</head>\n\n" "<body bgcolor=\"white\" text=\"black\"" |