aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-09-21 12:31:47 +0200
committerHenrik Nord <[email protected]>2017-09-21 12:31:47 +0200
commit835f082a5e8ec070a41ee281c773504656425b0e (patch)
tree0e77d65b62a1989f37c306982b07b065618a1f45
parent83bd98cc0502fa1f16a9b5f44ec7cf3185ede882 (diff)
parent6972369837f9004d23883acce1271d1b53bb0a24 (diff)
downloadotp-835f082a5e8ec070a41ee281c773504656425b0e.tar.gz
otp-835f082a5e8ec070a41ee281c773504656425b0e.tar.bz2
otp-835f082a5e8ec070a41ee281c773504656425b0e.zip
Merge branch 'maint'
-rw-r--r--system/doc/design_principles/des_princ.xml2
-rw-r--r--system/doc/oam/oam_intro.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/doc/design_principles/des_princ.xml b/system/doc/design_principles/des_princ.xml
index af5904ce78..e21f2a7f4e 100644
--- a/system/doc/design_principles/des_princ.xml
+++ b/system/doc/design_principles/des_princ.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1997</year><year>2016</year>
+ <year>1997</year><year>2017</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/system/doc/oam/oam_intro.xml b/system/doc/oam/oam_intro.xml
index b4142b3cc5..d3867f03ca 100644
--- a/system/doc/oam/oam_intro.xml
+++ b/system/doc/oam/oam_intro.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1997</year><year>2016</year>
+ <year>1997</year><year>2017</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>