Merge branch 'bmk/megaco/prep_for_r17'

3 files changed, 50 insertions, 26 deletions

diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index a1039cbda0..f71166b1b1 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2013</year>
+      <year>2000</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,14 +13,14 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-
+      
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-
+      
     </legalnotice>
-
+    
     <title>Megaco Release Notes</title>
     <prepared>Lars Thors&eacute;n, H&aring;kan Mattsson, Micael Karlberg</prepared>
     <docno></docno>
@@ -29,30 +29,43 @@
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the Megaco system
-    from version to version. The intention of this document is to
-    list all incompatibilities as well as all enhancements and
-    bugfixes for every release of Megaco. Each release of Megaco
-    thus constitutes one section in this document. The title of each
-    section is the version number of Megaco.</p>
-
-
-  <section><title>Megaco 3.17.0.2</title>
+  from version to version. The intention of this document is to
+  list all incompatibilities as well as all enhancements and
+  bugfixes for every release of Megaco. Each release of Megaco
+  thus constitutes one section in this document. The title of each
+  section is the version number of Megaco.</p>
+  
+  
+  <section><title>Megaco 3.17.0.3</title>
 
     <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Introduced functionality for inspection of system and
-	    build configuration.</p>
-          <p>
-	    Own Id: OTP-11196</p>
-        </item>
-      </list>
+    <list>
+      <item>
+	<p>Updated doc files to utf8.</p>
+	<p>Own Id: OTP-10907</p>
+      </item>
+    </list>
     </section>
+  
+  </section>
 
-</section>
+  <section><title>Megaco 3.17.0.2</title>
 
-<section><title>Megaco 3.17.0.1</title>
+    <section><title>Improvements and New Features</title>
+    <list>
+      <item>
+	<p>
+	  Introduced functionality for inspection of system and
+	build configuration.</p>
+	<p>
+	Own Id: OTP-11196</p>
+      </item>
+    </list>
+    </section>
+  
+  </section>
+
+  <section><title>Megaco 3.17.0.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index da171e0c18..db59f55b55 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -165,11 +165,21 @@
 %%      |          |           |         |         |
 %%      v          v           v         v         v
 %%    3.17  <-  3.16.1  <-  3.15.2 <- 3.14.2 <- 3.11.4
+%%      | 
+%%      v 
+%%   3.17.0.1
+%%      | 
+%%      v 
+%%   3.17.0.2
+%%      | 
+%%      v 
+%%   3.17.0.3  
 %%
 %%
 
 {"%VSN%",
  [
+  {"3.17.0.2", []},
   {"3.17.0.1", []},
   {"3.17", []}, 
   {"3.16.0.3", 
@@ -180,6 +190,7 @@
   }
  ],
  [
+  {"3.17.0.2", []},
   {"3.17.0.1", []},
   {"3.17", []}, 
   {"3.16.0.3", 
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index ea4e9f2eb8..01d429d0ae 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2013. All Rights Reserved.
+# Copyright Ericsson AB 1997-2014. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.17.0.2
+MEGACO_VSN  = 3.17.0.3
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"