aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2014-03-20 12:20:33 +0100
committerSiri Hansen <[email protected]>2014-03-20 12:20:33 +0100
commitccd7ac51b630b985fc9cf50124e69c70bdb07982 (patch)
treec465bb95d5c4a6ae7b3f71404cfb44c019e8b9c2 /erts
parent41fe9a38393fde81298e722abdb1013ac8224c17 (diff)
parent9affa3092500693077f1ca61a544eea886b417b0 (diff)
downloadotp-ccd7ac51b630b985fc9cf50124e69c70bdb07982.tar.gz
otp-ccd7ac51b630b985fc9cf50124e69c70bdb07982.tar.bz2
otp-ccd7ac51b630b985fc9cf50124e69c70bdb07982.zip
Merge branch 'siri/master-cuddle-with-tests'
* siri/master-cuddle-with-tests: Remove "coding: utf-8" from test files Change encoding for XML files to utf-8
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/time_correction.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/time_correction.xml b/erts/doc/src/time_correction.xml
index d52cc7f3e2..7f7c28fc30 100644
--- a/erts/doc/src/time_correction.xml
+++ b/erts/doc/src/time_correction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE chapter SYSTEM "chapter.dtd">
<chapter>
<header>
<copyright>
- <year>1999</year><year>2013</year>
+ <year>1999</year><year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>