aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src/diameter_intro.xml
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2015-06-18 11:31:02 +0200
committerBruce Yinhe <[email protected]>2015-06-18 11:31:02 +0200
commit738c34d4bb8f1a3811acd00af8c6c12107f8315b (patch)
tree3e29144e3d6890e2da3762e2eb48cf56a6c9de5b /lib/diameter/doc/src/diameter_intro.xml
parentef3dd7ebc24c6bbc74d4b823cd057222bccbe1cf (diff)
downloadotp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.tar.gz
otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.tar.bz2
otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.zip
Change license text to APLv2
Diffstat (limited to 'lib/diameter/doc/src/diameter_intro.xml')
-rw-r--r--lib/diameter/doc/src/diameter_intro.xml19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/diameter/doc/src/diameter_intro.xml b/lib/diameter/doc/src/diameter_intro.xml
index 93293f2d8e..1718d1c612 100644
--- a/lib/diameter/doc/src/diameter_intro.xml
+++ b/lib/diameter/doc/src/diameter_intro.xml
@@ -12,16 +12,17 @@
</copyright>
<legalnotice>
-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
-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/.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
-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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
</legalnotice>