aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc/src/edoc_macros.erl
diff options
context:
space:
mode:
authorRichard Carlsson <[email protected]>2015-07-08 16:22:01 +0200
committerRichard Carlsson <[email protected]>2016-11-23 16:34:27 +0100
commit8462a42895da3e020d3400c4c5d070ffd47cb37e (patch)
tree8296705c638facdf248c72f36c72dd60c99faeaf /lib/edoc/src/edoc_macros.erl
parent4273cbd12075265853bb4791fb74c11032b9be05 (diff)
downloadotp-8462a42895da3e020d3400c4c5d070ffd47cb37e.tar.gz
otp-8462a42895da3e020d3400c4c5d070ffd47cb37e.tar.bz2
otp-8462a42895da3e020d3400c4c5d070ffd47cb37e.zip
Update EDoc license headers to dual Apache2/LGPL
This makes it clear that Apache 2.0 applies, without dropping the old LGPL licensing, and makes all the EDoc file headers look the same as upstream.
Diffstat (limited to 'lib/edoc/src/edoc_macros.erl')
-rw-r--r--lib/edoc/src/edoc_macros.erl29
1 files changed, 17 insertions, 12 deletions
diff --git a/lib/edoc/src/edoc_macros.erl b/lib/edoc/src/edoc_macros.erl
index e1a54d5090..d5a11d438b 100644
--- a/lib/edoc/src/edoc_macros.erl
+++ b/lib/edoc/src/edoc_macros.erl
@@ -1,18 +1,23 @@
%% =====================================================================
-%% This library is free software; you can redistribute it and/or modify
-%% it under the terms of the GNU Lesser General Public License as
-%% published by the Free Software Foundation; either version 2 of the
-%% License, or (at your option) any later version.
+%% 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>
%%
-%% This library is distributed in the hope that it will be useful, but
-%% WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%% Lesser General Public License for more details.
+%% 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.
%%
-%% You should have received a copy of the GNU Lesser General Public
-%% License along with this library; if not, write to the Free Software
-%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-%% USA
+%% Alternatively, you may use this file under the terms of the GNU Lesser
+%% General Public License (the "LGPL") as published by the Free Software
+%% Foundation; either version 2.1, or (at your option) any later version.
+%% If you wish to allow use of your version of this file only under the
+%% terms of the LGPL, you should delete the provisions above and replace
+%% them with the notice and other provisions required by the LGPL; see
+%% <http://www.gnu.org/licenses/>. If you do not delete the provisions
+%% above, a recipient may use your version of this file under the terms of
+%% either the Apache License or the LGPL.
%%
%% @private
%% @copyright 2001-2005 Richard Carlsson