12 files changed, 19 insertions, 22 deletions
diff --git a/lib/compiler/src/rec_env.erl b/lib/compiler/src/rec_env.erl
index 8298a51706..48d39776dc 100644
--- a/lib/compiler/src/rec_env.erl
+++ b/lib/compiler/src/rec_env.erl
@@ -10,8 +10,8 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% @author Richard Carlsson <[email protected]>
 %% @copyright 1999-2004 Richard Carlsson
+%% @author Richard Carlsson <[email protected]>
 %% @doc Abstract environments, supporting self-referential bindings and
 %% automatic new-key generation.
 
diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl
index 2fb5152e66..616e8834f5 100644
--- a/lib/dialyzer/src/dialyzer_options.erl
+++ b/lib/dialyzer/src/dialyzer_options.erl
@@ -13,7 +13,7 @@
 %% limitations under the License.
 %%
 %% @copyright 2004 Richard Carlsson
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @doc Provides a better way to start Dialyzer from a script.
 
 -module(dialyzer_options).
diff --git a/lib/hipe/cerl/cerl_cconv.erl b/lib/hipe/cerl/cerl_cconv.erl
index 108bef9ed4..122e6ef039 100644
--- a/lib/hipe/cerl/cerl_cconv.erl
+++ b/lib/hipe/cerl/cerl_cconv.erl
@@ -10,8 +10,8 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% @author Richard Carlsson <[email protected]>
 %% @copyright 2000-2004 Richard Carlsson
+%% @author Richard Carlsson <[email protected]>
 %% @doc Closure conversion of Core Erlang modules. This is done as a
 %% step in the translation from Core Erlang down to HiPE Icode, and is
 %% very much tied to the calling conventions used in HiPE native code.
diff --git a/lib/hipe/cerl/cerl_hipe_primops.hrl b/lib/hipe/cerl/cerl_hipe_primops.hrl
index 4c8bcb478b..6e4d830b61 100644
--- a/lib/hipe/cerl/cerl_hipe_primops.hrl
+++ b/lib/hipe/cerl/cerl_hipe_primops.hrl
@@ -1,4 +1,3 @@
-%% ========================-*-erlang-*-=================================
 %% 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
@@ -11,12 +10,9 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% Predefined Core Erlang primitive operations used by HiPE
-%%
-%% Copyright (C) 2000 Richard Carlsson
-%%
-%% Author contact: [email protected]
-%% =====================================================================
+%% @copyright 2000 Richard Carlsson
+%% @author Richard Carlsson <[email protected]>
+%% @doc Predefined Core Erlang primitive operations used by HiPE.
 
 %% These definitions give the names of Core Erlang primops recognized by
 %% HiPE. Many of them (e.g., 'not'/'and'/'or', and the type tests), are
diff --git a/lib/hipe/cerl/cerl_hipeify.erl b/lib/hipe/cerl/cerl_hipeify.erl
index be866f7617..137a54ba32 100644
--- a/lib/hipe/cerl/cerl_hipeify.erl
+++ b/lib/hipe/cerl/cerl_hipeify.erl
@@ -10,8 +10,8 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% @author Richard Carlsson <[email protected]>
 %% @copyright 2000-2004 Richard Carlsson
+%% @author Richard Carlsson <[email protected]>
 %% @doc HiPE-ification of Core Erlang code. Prepares Core Erlang code
 %% for translation to ICode.
 %% @see cerl_to_icode
diff --git a/lib/hipe/cerl/cerl_messagean.erl b/lib/hipe/cerl/cerl_messagean.erl
index 4031bb427e..c79e045bd0 100644
--- a/lib/hipe/cerl/cerl_messagean.erl
+++ b/lib/hipe/cerl/cerl_messagean.erl
@@ -11,7 +11,7 @@
 %% limitations under the License.
 %%
 %% @copyright 2002 Richard Carlsson
-%% @author [email protected]
+%% @author Richard Carlsson <[email protected]>
 %% @doc Message analysis of Core Erlang programs.
 
 %% TODO: might need a "top" (`any') element for any-length value lists.
diff --git a/lib/hipe/cerl/cerl_pmatch.erl b/lib/hipe/cerl/cerl_pmatch.erl
index 3b116ae331..fd7f589f08 100644
--- a/lib/hipe/cerl/cerl_pmatch.erl
+++ b/lib/hipe/cerl/cerl_pmatch.erl
@@ -10,8 +10,8 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% @author Richard Carlsson <[email protected]>
 %% @copyright 2000-2006 Richard Carlsson
+%% @author Richard Carlsson <[email protected]>
 %%
 %% @doc Core Erlang pattern matching compiler.
 %%
diff --git a/lib/hipe/cerl/cerl_to_icode.erl b/lib/hipe/cerl/cerl_to_icode.erl
index fa1899ae0f..acad8a9da4 100644
--- a/lib/hipe/cerl/cerl_to_icode.erl
+++ b/lib/hipe/cerl/cerl_to_icode.erl
@@ -12,8 +12,8 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% @author Richard Carlsson <[email protected]>
 %% @copyright 2000-2006 Richard Carlsson
+%% @author Richard Carlsson <[email protected]>
 %% @doc Translation from Core Erlang to HiPE Icode.
 
 %% TODO: annotate Icode leaf functions as such.
diff --git a/lib/hipe/cerl/cerl_typean.erl b/lib/hipe/cerl/cerl_typean.erl
index da78eb196b..c5d84bdf2b 100644
--- a/lib/hipe/cerl/cerl_typean.erl
+++ b/lib/hipe/cerl/cerl_typean.erl
@@ -13,7 +13,7 @@
 %% limitations under the License.
 %%
 %% @copyright 2001-2002 Richard Carlsson
-%% @author [email protected]
+%% @author Richard Carlsson <[email protected]>
 %% @doc Type analysis of Core Erlang programs.
 
 %% TODO: filters must handle conjunctions for better precision!
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 59bfa006f1..8c96e60229 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -15,9 +15,9 @@
 %% @doc Type information for Erlang Built-in functions (implemented in C)
 %% @copyright 2002 Richard Carlsson, 2006 Richard Carlsson, Tobias Lindahl
 %% and Kostis Sagonas
-%% @author [email protected]
-%% @author [email protected]
-%% @author [email protected]
+%% @author Richard Carlsson <[email protected]>
+%% @author Tobias Lindahl <[email protected]>
+%% @author Kostis Sagonas <[email protected]>
 
 -module(erl_bif_types).
 
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index aba84b9654..5a4cf77b81 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -13,9 +13,10 @@
 %% limitations under the License.
 %%
 %% @copyright 2000-2003 Richard Carlsson, 2006-2009 Tobias Lindahl
-%% @author [email protected]
-%% @author [email protected]
-%% @author [email protected]
+%% @author Richard Carlsson <[email protected]>
+%% @author Tobias Lindahl <[email protected]>
+%% @author Kostis Sagonas <[email protected]>
+%% @author Manouk Manoukian
 %% @doc Provides a representation of Erlang types.
 
 %% The initial author of this file is Richard Carlsson (2000-2004).
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index 6feb74c24d..079b761463 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -12,7 +12,7 @@
 %%
 %% Copyright (C) 2006-2016 Richard Carlsson and Ericsson AB
 %%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @author Dan Gudmundsson <[email protected]>
 %%
 %% @doc Functional, extendible arrays. Arrays can have fixed size, or