diff options
author | Bruce Yinhe <[email protected]> | 2015-06-22 15:42:56 +0200 |
---|---|---|
committer | Bruce Yinhe <[email protected]> | 2015-06-22 15:44:54 +0200 |
commit | 8f63667b316cdff10e666b8f5b0b6a92bd722e5a (patch) | |
tree | 0c4497adc35cdcffc411e5168e2b052bf495ca8d /lib/diameter/doc/src/diameter_using.xml | |
parent | 35b20eb172a077b363af37d27c320b759d42869d (diff) | |
parent | 6bed12016e0d300b8afc65b5aa8f282dcaa6525e (diff) | |
download | otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.tar.gz otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.tar.bz2 otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.zip |
Merge branch 'bruce/change-license'
OTP-12845
* bruce/change-license:
fix errors caused by changed line numbers
Change license text to APLv2
Diffstat (limited to 'lib/diameter/doc/src/diameter_using.xml')
-rw-r--r-- | lib/diameter/doc/src/diameter_using.xml | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/diameter/doc/src/diameter_using.xml b/lib/diameter/doc/src/diameter_using.xml index 4427d29c3c..596a6861a1 100644 --- a/lib/diameter/doc/src/diameter_using.xml +++ b/lib/diameter/doc/src/diameter_using.xml @@ -10,16 +10,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/. - -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. +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 + +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> |