diff options
author | Bruce Yinhe <[email protected]> | 2015-06-18 11:31:02 +0200 |
---|---|---|
committer | Bruce Yinhe <[email protected]> | 2015-06-18 11:31:02 +0200 |
commit | 738c34d4bb8f1a3811acd00af8c6c12107f8315b (patch) | |
tree | 3e29144e3d6890e2da3762e2eb48cf56a6c9de5b /lib/asn1/doc/users_guide | |
parent | ef3dd7ebc24c6bbc74d4b823cd057222bccbe1cf (diff) | |
download | otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.tar.gz otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.tar.bz2 otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.zip |
Change license text to APLv2
Diffstat (limited to 'lib/asn1/doc/users_guide')
-rw-r--r-- | lib/asn1/doc/users_guide/Makefile | 21 | ||||
-rw-r--r-- | lib/asn1/doc/users_guide/users_guide.sgml | 21 |
2 files changed, 22 insertions, 20 deletions
diff --git a/lib/asn1/doc/users_guide/Makefile b/lib/asn1/doc/users_guide/Makefile index 996b2582af..ae3a55b945 100644 --- a/lib/asn1/doc/users_guide/Makefile +++ b/lib/asn1/doc/users_guide/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 1997-2009. 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 -# 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. # # %CopyrightEnd% # diff --git a/lib/asn1/doc/users_guide/users_guide.sgml b/lib/asn1/doc/users_guide/users_guide.sgml index 9387e6b9ab..ff4289c419 100644 --- a/lib/asn1/doc/users_guide/users_guide.sgml +++ b/lib/asn1/doc/users_guide/users_guide.sgml @@ -1,15 +1,16 @@ <!doctype userguide PUBLIC "-//Stork//DTD userguide//EN"> <!-- - ``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 via the world wide web 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. The Initial Developer of the Original Code is Ericsson Utvecklings AB. Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings |