diff --git a/src/pp-main.adb b/src/pp-main.adb
index 701418ed..53f65188 100644
--- a/src/pp-main.adb
+++ b/src/pp-main.adb
@@ -45,9 +45,9 @@ begin
    --  Deprecation message to advertise about GNATformat
    Utils.Err_Out.Put
      ("\n\1\n",
-      "WARNING: GNATpp will be baselined soon. Please switch "
-      & "to GNATformat, the new Ada code formatter, for future use.");
-   Utils.Err_Out.Put ("-------\n\n");
+      "Info: AdaCore provides a new formatter GNATformat, currently in beta. "
+      & "This will supersede GNATpp when leaving the beta program.");
+   Utils.Err_Out.Put ("-----\n\n");
 
    --  Override trace settings by parsing the config file
    GNATCOLL.Traces.Parse_Config_File;
diff --git a/testsuite/tests/metric/RB16-011/test.out b/testsuite/tests/metric/RB16-011/test.out
index 8dd0324f..7c82259a 100644
--- a/testsuite/tests/metric/RB16-011/test.out
+++ b/testsuite/tests/metric/RB16-011/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Foo (I : in out Integer) is
 begin
diff --git a/testsuite/tests/pp/CS0037228/test.out b/testsuite/tests/pp/CS0037228/test.out
index e0034dab..30358864 100644
--- a/testsuite/tests/pp/CS0037228/test.out
+++ b/testsuite/tests/pp/CS0037228/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package body Foo is
 
diff --git a/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out b/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out
index b76fc6c4..2af982c2 100644
--- a/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out
+++ b/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Test is
    -- Documentation
diff --git a/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out b/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out
index 55fdc327..dd23165a 100644
--- a/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out
+++ b/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 Units remaining: 4     
 package Test_1 is
diff --git a/testsuite/tests/pp/CS0039262/test.out b/testsuite/tests/pp/CS0039262/test.out
index 9d94639e..8e776e7d 100644
--- a/testsuite/tests/pp/CS0039262/test.out
+++ b/testsuite/tests/pp/CS0039262/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
 package test is
diff --git a/testsuite/tests/pp/G905-011/test.out b/testsuite/tests/pp/G905-011/test.out
index 969d1c76..def061a9 100644
--- a/testsuite/tests/pp/G905-011/test.out
+++ b/testsuite/tests/pp/G905-011/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 procedure Gnatpp_Array_Formatting is
@@ -26,8 +26,8 @@ begin
    null;
 end Gnatpp_Array_Formatting;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO;
 procedure Gnatpp_Exdentation is
@@ -53,8 +53,8 @@ begin
    end if;
 end Gnatpp_Exdentation;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Junk is
 begin
diff --git a/testsuite/tests/pp/G913-019/test.out b/testsuite/tests/pp/G913-019/test.out
index 2fcf43c5..1e9248b6 100644
--- a/testsuite/tests/pp/G913-019/test.out
+++ b/testsuite/tests/pp/G913-019/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure TEST is
    procedure PROCEDURE_NAME
diff --git a/testsuite/tests/pp/MB21-028/test.out b/testsuite/tests/pp/MB21-028/test.out
index 6202a611..96c3446a 100644
--- a/testsuite/tests/pp/MB21-028/test.out
+++ b/testsuite/tests/pp/MB21-028/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure P is
    pragma Warnings (Off);
@@ -9,8 +9,8 @@ begin
    null;
 end P;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure P is
    pragma Warnings (Off);
@@ -21,8 +21,8 @@ begin
    null;
 end P;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package body Q is
 
diff --git a/testsuite/tests/pp/N218-043/test.out b/testsuite/tests/pp/N218-043/test.out
index a1d282f6..2744b365 100644
--- a/testsuite/tests/pp/N218-043/test.out
+++ b/testsuite/tests/pp/N218-043/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Directions is
 
diff --git a/testsuite/tests/pp/N219-016/test.out b/testsuite/tests/pp/N219-016/test.out
index f39248c4..be367cb3 100644
--- a/testsuite/tests/pp/N219-016/test.out
+++ b/testsuite/tests/pp/N219-016/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Records is
 
@@ -24,8 +24,8 @@ package Records is
 
 end Records;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Records is
 
diff --git a/testsuite/tests/pp/N312-029/test.out b/testsuite/tests/pp/N312-029/test.out
index 94aedfc8..b2861371 100644
--- a/testsuite/tests/pp/N312-029/test.out
+++ b/testsuite/tests/pp/N312-029/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Sample_Formatting is
 
@@ -39,8 +39,8 @@ begin
 
 end Sample_Formatting;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Sample_Formatting is
 
diff --git a/testsuite/tests/pp/N428-004/test.out b/testsuite/tests/pp/N428-004/test.out
index d6c430f8..f10f7b7e 100644
--- a/testsuite/tests/pp/N428-004/test.out
+++ b/testsuite/tests/pp/N428-004/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Ors is
 begin
diff --git a/testsuite/tests/pp/N812-011/test.out b/testsuite/tests/pp/N812-011/test.out
index ba6bdc6b..cf7cfe4f 100644
--- a/testsuite/tests/pp/N812-011/test.out
+++ b/testsuite/tests/pp/N812-011/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package P with
   Pure
@@ -17,8 +17,8 @@ is
 
 end P;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Q is
 
diff --git a/testsuite/tests/pp/N827-012/test.out b/testsuite/tests/pp/N827-012/test.out
index 1718d511..59450ded 100644
--- a/testsuite/tests/pp/N827-012/test.out
+++ b/testsuite/tests/pp/N827-012/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Characters.Latin_1;
 
diff --git a/testsuite/tests/pp/O723-016/test.out b/testsuite/tests/pp/O723-016/test.out
index f86d42cf..e7942308 100644
--- a/testsuite/tests/pp/O723-016/test.out
+++ b/testsuite/tests/pp/O723-016/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Toto, Titi;
 
diff --git a/testsuite/tests/pp/OA07-042/test.out b/testsuite/tests/pp/OA07-042/test.out
index 82feb502..6512fee3 100644
--- a/testsuite/tests/pp/OA07-042/test.out
+++ b/testsuite/tests/pp/OA07-042/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Align_Test is
    Index       : Integer;
diff --git a/testsuite/tests/pp/P318-034/test.out b/testsuite/tests/pp/P318-034/test.out
index e4cf16bd..96343667 100644
--- a/testsuite/tests/pp/P318-034/test.out
+++ b/testsuite/tests/pp/P318-034/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 -- Testing pretty printing of enums with inline documentation
 procedure test_main is
diff --git a/testsuite/tests/pp/P408-012/test.out b/testsuite/tests/pp/P408-012/test.out
index 776cd628..5e4ae439 100644
--- a/testsuite/tests/pp/P408-012/test.out
+++ b/testsuite/tests/pp/P408-012/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Pretty is
 
@@ -51,8 +51,8 @@ begin
 
 end Pretty;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Pretty is
 
diff --git a/testsuite/tests/pp/P523-009/test.out b/testsuite/tests/pp/P523-009/test.out
index af1f4801..6d1a8c59 100644
--- a/testsuite/tests/pp/P523-009/test.out
+++ b/testsuite/tests/pp/P523-009/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 pragma Ada_95;
 pragma Warnings (Off);
diff --git a/testsuite/tests/pp/P817-005/test.out b/testsuite/tests/pp/P817-005/test.out
index f18d0f28..c1a6d17d 100644
--- a/testsuite/tests/pp/P817-005/test.out
+++ b/testsuite/tests/pp/P817-005/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Example_With_Comments is
 
@@ -22,8 +22,8 @@ package Example_With_Comments is
 
 end Example_With_Comments;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Example_With_Comments is -- end of line
 
diff --git a/testsuite/tests/pp/Q724-015/test.out b/testsuite/tests/pp/Q724-015/test.out
index a2fdfd82..98878b56 100644
--- a/testsuite/tests/pp/Q724-015/test.out
+++ b/testsuite/tests/pp/Q724-015/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Csc_Channel.Version_Handling is
    type T_Version_Handling is limited interface;
@@ -13,8 +13,8 @@ package Csc_Channel.Version_Handling is
       P2   : out Lang.Primitifs.T_Uint) is abstract;
 end Csc_Channel.Version_Handling;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Csc_Channel.Version_Handling is
    type T_Version_Handling is limited interface;
diff --git a/testsuite/tests/pp/QA14-008/test.out b/testsuite/tests/pp/QA14-008/test.out
index 79f1d351..cf89b980 100644
--- a/testsuite/tests/pp/QA14-008/test.out
+++ b/testsuite/tests/pp/QA14-008/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Left_Hand_Side is
 begin
diff --git a/testsuite/tests/pp/QA17-028/test.out b/testsuite/tests/pp/QA17-028/test.out
index 5b091864..139f3988 100644
--- a/testsuite/tests/pp/QA17-028/test.out
+++ b/testsuite/tests/pp/QA17-028/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 WITH ibusiness_unit.synthetic_target_manager;
 
diff --git a/testsuite/tests/pp/QC06-022/P718-006/test.out b/testsuite/tests/pp/QC06-022/P718-006/test.out
index 0f90371b..d8db6eab 100644
--- a/testsuite/tests/pp/QC06-022/P718-006/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-006/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Gnatpp_Playground
 is
diff --git a/testsuite/tests/pp/QC06-022/P718-008/test.out b/testsuite/tests/pp/QC06-022/P718-008/test.out
index 4e82df8b..c349890d 100644
--- a/testsuite/tests/pp/QC06-022/P718-008/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-008/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Compact_Array_Type_Declaration
 is
diff --git a/testsuite/tests/pp/QC06-022/P718-010/test.out b/testsuite/tests/pp/QC06-022/P718-010/test.out
index 84f6939a..346b2815 100644
--- a/testsuite/tests/pp/QC06-022/P718-010/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-010/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Preserve_Existing_Continuation_Lines
 is
diff --git a/testsuite/tests/pp/QC06-022/P718-011/test.out b/testsuite/tests/pp/QC06-022/P718-011/test.out
index 86cef274..2e9e85a4 100644
--- a/testsuite/tests/pp/QC06-022/P718-011/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-011/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Named_Aggregate_Affectation
 is
diff --git a/testsuite/tests/pp/QC06-022/P718-012/test.out b/testsuite/tests/pp/QC06-022/P718-012/test.out
index d5202eb5..f05b9e98 100644
--- a/testsuite/tests/pp/QC06-022/P718-012/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-012/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Split_Lines_Before_Vertical_Bars
 is
diff --git a/testsuite/tests/pp/QC06-022/P718-013/test.out b/testsuite/tests/pp/QC06-022/P718-013/test.out
index 81ca56c8..610929e9 100644
--- a/testsuite/tests/pp/QC06-022/P718-013/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-013/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Blank_Lines_Insertion
 is
diff --git a/testsuite/tests/pp/R713-024/test.out b/testsuite/tests/pp/R713-024/test.out
index cb8fbaad..43a08010 100644
--- a/testsuite/tests/pp/R713-024/test.out
+++ b/testsuite/tests/pp/R713-024/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Spark_Mode with
   SPARK_Mode
diff --git a/testsuite/tests/pp/R813-004/test.out b/testsuite/tests/pp/R813-004/test.out
index 09d26ee6..e1b7acf6 100644
--- a/testsuite/tests/pp/R813-004/test.out
+++ b/testsuite/tests/pp/R813-004/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package body P is
 
diff --git a/testsuite/tests/pp/RB02-007/test.out b/testsuite/tests/pp/RB02-007/test.out
index 0fcf8dad..57f5ccff 100644
--- a/testsuite/tests/pp/RB02-007/test.out
+++ b/testsuite/tests/pp/RB02-007/test.out
@@ -1,14 +1,14 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 out
 out.sep
diff --git a/testsuite/tests/pp/RB05-002/test.out b/testsuite/tests/pp/RB05-002/test.out
index 85dfe0fc..f7aa0f73 100644
--- a/testsuite/tests/pp/RB05-002/test.out
+++ b/testsuite/tests/pp/RB05-002/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -186,8 +186,8 @@ begin
 end Loop_Then;
 separate-loop
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -376,8 +376,8 @@ begin
 end Loop_Then;
 separate-then
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -574,8 +574,8 @@ begin
 end Loop_Then;
 separate-loop-then
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -775,8 +775,8 @@ begin
 end Loop_Then;
 separate-loop separate-then
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -976,8 +976,8 @@ begin
 end Loop_Then;
 no-separate-loop
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -1156,8 +1156,8 @@ begin
 end Loop_Then;
 no-separate-then
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -1334,8 +1334,8 @@ begin
 end Loop_Then;
 no-separate-loop-then
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
@@ -1505,8 +1505,8 @@ begin
 end Loop_Then;
 no-separate-loop no-separate-then
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
diff --git a/testsuite/tests/pp/RB28-025/test.out b/testsuite/tests/pp/RB28-025/test.out
index a766655d..8b719ce8 100644
--- a/testsuite/tests/pp/RB28-025/test.out
+++ b/testsuite/tests/pp/RB28-025/test.out
@@ -1,52 +1,52 @@
 gnatpp --pipe abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Abc is
 end Abc;
 gnatpp --replace_backup abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Abc is end;
 package Abc is
 end Abc;
 gnatpp --replace_backup abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 gnatpp: file abc.ads.npp exists
  use '--replace-force-backup' option to override
 gnatpp --replace_force_backup abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Abc is end;
 package Abc is
 end Abc;
 gnatpp --replace_backup --output-dir=out abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Abc is end;
 package Abc is
 end Abc;
 gnatpp --replace_backup --output-dir=out abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 gnatpp: file out/abc.ads.npp exists
  use '--replace-force-backup' option to override
 gnatpp --replace_force_backup --output-dir=out abc.ads
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Abc is end;
 package Abc is
diff --git a/testsuite/tests/pp/RC10-055.pp/test.out b/testsuite/tests/pp/RC10-055.pp/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/RC10-055.pp/test.out
+++ b/testsuite/tests/pp/RC10-055.pp/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/S213-005/test.out b/testsuite/tests/pp/S213-005/test.out
index fbb96b2a..d0f3fa1a 100644
--- a/testsuite/tests/pp/S213-005/test.out
+++ b/testsuite/tests/pp/S213-005/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure p is
 
diff --git a/testsuite/tests/pp/S220-035/test.out b/testsuite/tests/pp/S220-035/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/S220-035/test.out
+++ b/testsuite/tests/pp/S220-035/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/S225-027/test.out b/testsuite/tests/pp/S225-027/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/S225-027/test.out
+++ b/testsuite/tests/pp/S225-027/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/S225-063/test.out b/testsuite/tests/pp/S225-063/test.out
index f1be6069..ce1465d0 100644
--- a/testsuite/tests/pp/S225-063/test.out
+++ b/testsuite/tests/pp/S225-063/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 --  This file has CRLF line endings,^M
 --  but no CRLF after the last line.^M
diff --git a/testsuite/tests/pp/S313-033/test.out b/testsuite/tests/pp/S313-033/test.out
index 6e5bf845..1c4892db 100644
--- a/testsuite/tests/pp/S313-033/test.out
+++ b/testsuite/tests/pp/S313-033/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Mixed_Keywords is
 
diff --git a/testsuite/tests/pp/S329-035/test.out b/testsuite/tests/pp/S329-035/test.out
index 3fea93e9..874ecb3e 100644
--- a/testsuite/tests/pp/S329-035/test.out
+++ b/testsuite/tests/pp/S329-035/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 WITH System.Multiprocessors.Dispatching_Domains;
 PACKAGE p IS
@@ -9,8 +9,8 @@ PACKAGE p IS
    END t;
 END p;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 WITH System.Multiprocessors.Dispatching_Domains;
 PACKAGE p IS
diff --git a/testsuite/tests/pp/S412-043/test.out b/testsuite/tests/pp/S412-043/test.out
index 1a108c01..700776be 100644
--- a/testsuite/tests/pp/S412-043/test.out
+++ b/testsuite/tests/pp/S412-043/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 function Cvt is new Unchecked_Conversion
   (Source => Integer, Target => Tds_Unsigned_T);
diff --git a/testsuite/tests/pp/S503-002/test.out b/testsuite/tests/pp/S503-002/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/S503-002/test.out
+++ b/testsuite/tests/pp/S503-002/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/S522-034/test.out b/testsuite/tests/pp/S522-034/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/S522-034/test.out
+++ b/testsuite/tests/pp/S522-034/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/S709-048/test.out b/testsuite/tests/pp/S709-048/test.out
index db9eaf2d..172cfe15 100644
--- a/testsuite/tests/pp/S709-048/test.out
+++ b/testsuite/tests/pp/S709-048/test.out
@@ -1,22 +1,22 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package P is
    My_Integer : Integer          := Some_Function (A - B);
    X          : constant Boolean := False;
 end P;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package P is
    My_Integer: Integer := Some_Function(A - B);
    X: constant Boolean := False;
 end P;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package P is
    My_Integer: Integer          := Some_Function(A - B);
diff --git a/testsuite/tests/pp/S809-020/test.out b/testsuite/tests/pp/S809-020/test.out
index 97249025..f0944f41 100644
--- a/testsuite/tests/pp/S809-020/test.out
+++ b/testsuite/tests/pp/S809-020/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 pragma Ada_95;
 pragma Warnings (Off);
@@ -321,8 +321,8 @@ package body ada_main is
 
 end ada_main;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 pragma Ada_95;
 pragma Warnings (Off);
@@ -756,8 +756,8 @@ package ada_main is
 
 end ada_main;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 pragma Ada_95;
 pragma Warnings (Off);
@@ -1026,8 +1026,8 @@ package body ada_main is
 
 end ada_main;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 pragma Ada_95;
 pragma Warnings (Off);
@@ -1398,8 +1398,8 @@ package ada_main is
 
 end ada_main;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Csc_Channel.Version_Handling is
    type T_Version_Handling is limited interface;
@@ -1413,8 +1413,8 @@ package Csc_Channel.Version_Handling is
       P2      :    out Lang.Primitifs.T_Uint) is abstract;
 end Csc_Channel.Version_Handling;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 procedure Gnatpp_Array_Formatting is
@@ -1440,8 +1440,8 @@ begin
    null;
 end Gnatpp_Array_Formatting;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO;
 procedure Gnatpp_Exdentation is
@@ -1467,8 +1467,8 @@ begin
    end if;
 end Gnatpp_Exdentation;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Loop_Then is
    X_012345,
@@ -1611,8 +1611,8 @@ begin
    end loop;
 end Loop_Then;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Ors is
 begin
@@ -1625,8 +1625,8 @@ begin
      RCC_Bits.Ahb1enr.Gpioien;
 end Ors;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Pretty is
 
@@ -1716,8 +1716,8 @@ begin
 
 end Pretty;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Separate_Thens is
    X_0123456789,
@@ -1790,13 +1790,13 @@ begin
    end if;
 end Separate_Thens;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Test070;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO;
 with test_gnatpp;
@@ -1812,8 +1812,8 @@ begin
    Ada.Text_IO.Put_Line ("Test070 End");
 end test070;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Junk is
 begin
@@ -1823,8 +1823,8 @@ begin
       "2 THROUGH 16 ALL YIELD CORRECT VALUES");
 end Junk;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package test_gnatpp is
 
diff --git a/testsuite/tests/pp/S913-026/test.out b/testsuite/tests/pp/S913-026/test.out
index feab7239..b4283ef0 100644
--- a/testsuite/tests/pp/S913-026/test.out
+++ b/testsuite/tests/pp/S913-026/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package test is
 
diff --git a/testsuite/tests/pp/T312-041/test.out b/testsuite/tests/pp/T312-041/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/T312-041/test.out
+++ b/testsuite/tests/pp/T312-041/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/T603-026/test.out b/testsuite/tests/pp/T603-026/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/T603-026/test.out
+++ b/testsuite/tests/pp/T603-026/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/T603-052/test.out b/testsuite/tests/pp/T603-052/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/T603-052/test.out
+++ b/testsuite/tests/pp/T603-052/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/T616-044/test.out b/testsuite/tests/pp/T616-044/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/T616-044/test.out
+++ b/testsuite/tests/pp/T616-044/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/T824-031/test.out b/testsuite/tests/pp/T824-031/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/T824-031/test.out
+++ b/testsuite/tests/pp/T824-031/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/TA14-049/test.out b/testsuite/tests/pp/TA14-049/test.out
index c37a57ce..3921861c 100644
--- a/testsuite/tests/pp/TA14-049/test.out
+++ b/testsuite/tests/pp/TA14-049/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package
      Q
@@ -11,7 +11,7 @@ return Integer
 is (2);
 end Q;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 gnatpp: q.ads is from externally built project Q
diff --git a/testsuite/tests/pp/U206-003/test.out b/testsuite/tests/pp/U206-003/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/U206-003/test.out
+++ b/testsuite/tests/pp/U206-003/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U206-007/test.out b/testsuite/tests/pp/U206-007/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/U206-007/test.out
+++ b/testsuite/tests/pp/U206-007/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U208-025/test.out b/testsuite/tests/pp/U208-025/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/U208-025/test.out
+++ b/testsuite/tests/pp/U208-025/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U317-012/test.out b/testsuite/tests/pp/U317-012/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/U317-012/test.out
+++ b/testsuite/tests/pp/U317-012/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U506-042/test.out b/testsuite/tests/pp/U506-042/test.out
index eb82c546..acf6db25 100644
--- a/testsuite/tests/pp/U506-042/test.out
+++ b/testsuite/tests/pp/U506-042/test.out
@@ -1,12 +1,12 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U514-018/test.out b/testsuite/tests/pp/U514-018/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/U514-018/test.out
+++ b/testsuite/tests/pp/U514-018/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U603-022/test.out b/testsuite/tests/pp/U603-022/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/U603-022/test.out
+++ b/testsuite/tests/pp/U603-022/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/U617-041/test.out b/testsuite/tests/pp/U617-041/test.out
index dbe16552..9809d31b 100644
--- a/testsuite/tests/pp/U617-041/test.out
+++ b/testsuite/tests/pp/U617-041/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Main is
 begin
diff --git a/testsuite/tests/pp/U813-002_0/test.out b/testsuite/tests/pp/U813-002_0/test.out
index 5151d35b..0556be18 100644
--- a/testsuite/tests/pp/U813-002_0/test.out
+++ b/testsuite/tests/pp/U813-002_0/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -13,8 +13,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -27,8 +27,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -41,8 +41,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -55,8 +55,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -69,8 +69,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
diff --git a/testsuite/tests/pp/U813-002_1/test.out b/testsuite/tests/pp/U813-002_1/test.out
index f98dec76..ae3e0eae 100644
--- a/testsuite/tests/pp/U813-002_1/test.out
+++ b/testsuite/tests/pp/U813-002_1/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -11,8 +11,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -23,8 +23,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -35,8 +35,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -47,8 +47,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
@@ -59,8 +59,8 @@ begin
 end Main;
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
diff --git a/testsuite/tests/pp/U916-013/test.out b/testsuite/tests/pp/U916-013/test.out
index 52ad40f6..a1f65742 100644
--- a/testsuite/tests/pp/U916-013/test.out
+++ b/testsuite/tests/pp/U916-013/test.out
@@ -1,7 +1,7 @@
 test_OK
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure test_OK is
 
@@ -15,8 +15,8 @@ end test_OK;
 0
 test_NOK
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 Syntax errors in test_NOK.adb
 8:4: Skipped token val
diff --git a/testsuite/tests/pp/U920-030/test.out b/testsuite/tests/pp/U920-030/test.out
index b6a25697..8d2870d5 100644
--- a/testsuite/tests/pp/U920-030/test.out
+++ b/testsuite/tests/pp/U920-030/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Main is
    type Forward_Variance_Result is record
diff --git a/testsuite/tests/pp/V111-001/test.out b/testsuite/tests/pp/V111-001/test.out
index d0cf853e..54b8bf42 100644
--- a/testsuite/tests/pp/V111-001/test.out
+++ b/testsuite/tests/pp/V111-001/test.out
@@ -1,8 +1,8 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V117-043/test.out b/testsuite/tests/pp/V117-043/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/V117-043/test.out
+++ b/testsuite/tests/pp/V117-043/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V120-021/test.out b/testsuite/tests/pp/V120-021/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/V120-021/test.out
+++ b/testsuite/tests/pp/V120-021/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V203-009/test.out b/testsuite/tests/pp/V203-009/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/V203-009/test.out
+++ b/testsuite/tests/pp/V203-009/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V308-029/test.out b/testsuite/tests/pp/V308-029/test.out
index d0cf853e..54b8bf42 100644
--- a/testsuite/tests/pp/V308-029/test.out
+++ b/testsuite/tests/pp/V308-029/test.out
@@ -1,8 +1,8 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V405-022/test.out b/testsuite/tests/pp/V405-022/test.out
index d0cf853e..54b8bf42 100644
--- a/testsuite/tests/pp/V405-022/test.out
+++ b/testsuite/tests/pp/V405-022/test.out
@@ -1,8 +1,8 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V414-004/test.out b/testsuite/tests/pp/V414-004/test.out
index cdc4a426..a717ebf8 100644
--- a/testsuite/tests/pp/V414-004/test.out
+++ b/testsuite/tests/pp/V414-004/test.out
@@ -1,16 +1,16 @@
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
-procedure Test is
-   type T is (A, B, C);
-   V : T;
-begin
-   case V is
-      pragma List (On);
-      when A =>
-         I := 1;
-      when others =>
-         I := 2;
-   end case;
-end Test;
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
+procedure Test is
+   type T is (A, B, C);
+   V : T;
+begin
+   case V is
+      pragma List (On);
+      when A =>
+         I := 1;
+      when others =>
+         I := 2;
+   end case;
+end Test;
diff --git a/testsuite/tests/pp/V523-046/test.out b/testsuite/tests/pp/V523-046/test.out
index eb82c546..acf6db25 100644
--- a/testsuite/tests/pp/V523-046/test.out
+++ b/testsuite/tests/pp/V523-046/test.out
@@ -1,12 +1,12 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/V901-006/test.out b/testsuite/tests/pp/V901-006/test.out
index 22fab8c3..84788df1 100644
--- a/testsuite/tests/pp/V901-006/test.out
+++ b/testsuite/tests/pp/V901-006/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 Units remaining: 3     
 Units remaining: 2     
diff --git a/testsuite/tests/pp/VA11-017/test.out b/testsuite/tests/pp/VA11-017/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/VA11-017/test.out
+++ b/testsuite/tests/pp/VA11-017/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out b/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out
+++ b/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/VA11-018/test.out b/testsuite/tests/pp/VA11-018/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/VA11-018/test.out
+++ b/testsuite/tests/pp/VA11-018/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/VB25-014/test.out b/testsuite/tests/pp/VB25-014/test.out
index 9246565c..fbe631b4 100644
--- a/testsuite/tests/pp/VB25-014/test.out
+++ b/testsuite/tests/pp/VB25-014/test.out
@@ -1,8 +1,8 @@
-Default layout
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+Default layout
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
    type My_Enum is
      (One,
@@ -12,32 +12,32 @@ procedure Main is
 begin
    null;
 end Main;
-Minimal layout
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+Minimal layout
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
    type My_Enum is (One, Two, Three,
                     Four);
 begin
    null;
 end Main;
-Compact layout
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+Compact layout
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
    type My_Enum is (One, Two, Three, Four);
 begin
    null;
 end Main;
-Tall layout
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+Tall layout
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
 
    type My_Enum is
@@ -49,11 +49,11 @@ procedure Main is
 begin
    null;
 end Main;
-Shorthand Tall layout with space syntax
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+Shorthand Tall layout with space syntax
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
 
    type My_Enum is
diff --git a/testsuite/tests/pp/VC19-020-split/test.out b/testsuite/tests/pp/VC19-020-split/test.out
index 6eaeb1c6..b2effc97 100644
--- a/testsuite/tests/pp/VC19-020-split/test.out
+++ b/testsuite/tests/pp/VC19-020-split/test.out
@@ -1,7 +1,7 @@
 Testing --split-line-before-op switch
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Main is
    type My_Range is range 1 .. 100;
diff --git a/testsuite/tests/pp/VC19-020/test.out b/testsuite/tests/pp/VC19-020/test.out
index 9f192055..8394fa54 100644
--- a/testsuite/tests/pp/VC19-020/test.out
+++ b/testsuite/tests/pp/VC19-020/test.out
@@ -1,9 +1,9 @@
-Testing --layout switch
-1 --layout=default
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+Testing --layout switch
+1 --layout=default
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
    type My_Range is range 1 .. 100;
    subtype First_Dozen is My_Range with
@@ -36,12 +36,12 @@ procedure Main is
 begin
    null;
 end Main;
----------------------------------------------------
-2 --layout=minimal
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+---------------------------------------------------
+2 --layout=minimal
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
    type My_Range is range 1 .. 100;
    subtype First_Dozen is My_Range with
@@ -55,12 +55,12 @@ procedure Main is
 begin
    null;
 end Main;
----------------------------------------------------
-3 --layout=tall
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+---------------------------------------------------
+3 --layout=tall
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
 
    type My_Range is range 1 .. 100;
@@ -94,12 +94,12 @@ procedure Main is
 begin
    null;
 end Main;
----------------------------------------------------
-4 --layout=compact
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+---------------------------------------------------
+4 --layout=compact
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
 procedure Main is
    type My_Range is range 1 .. 100;
    subtype First_Dozen is My_Range with
diff --git a/testsuite/tests/pp/W213-015/test.out b/testsuite/tests/pp/W213-015/test.out
index c28f4716..92dd93cd 100644
--- a/testsuite/tests/pp/W213-015/test.out
+++ b/testsuite/tests/pp/W213-015/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 Units remaining: 2     
 package body Example is
diff --git a/testsuite/tests/pp/agg.P510-022/test.out b/testsuite/tests/pp/agg.P510-022/test.out
index 2ae72258..0d12cec8 100644
--- a/testsuite/tests/pp/agg.P510-022/test.out
+++ b/testsuite/tests/pp/agg.P510-022/test.out
@@ -1,15 +1,15 @@
 test number 1
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 PACKAGE a1 IS
      I : Integer;
 END a1;
 test number 2
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 PACKAGE a IS
      TYPE Int IS RANGE 1 .. 10;
@@ -21,16 +21,16 @@ PACKAGE a IS
 END a;
 test number 3
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 ----------------
 src_c/c.ads
diff --git a/testsuite/tests/pp/issue_24/test.out b/testsuite/tests/pp/issue_24/test.out
index 9e298c08..725821ca 100644
--- a/testsuite/tests/pp/issue_24/test.out
+++ b/testsuite/tests/pp/issue_24/test.out
@@ -1,4 +1,4 @@
-
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
-
+
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
+
diff --git a/testsuite/tests/pp/issue_38/test.out b/testsuite/tests/pp/issue_38/test.out
index d0cf853e..54b8bf42 100644
--- a/testsuite/tests/pp/issue_38/test.out
+++ b/testsuite/tests/pp/issue_38/test.out
@@ -1,8 +1,8 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/issue_39/test.out b/testsuite/tests/pp/issue_39/test.out
index e6234536..b27960aa 100644
--- a/testsuite/tests/pp/issue_39/test.out
+++ b/testsuite/tests/pp/issue_39/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Main is
 begin
@@ -10,8 +10,8 @@ begin
    null;
 end Main;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 procedure Main is
 begin
diff --git a/testsuite/tests/pp/issue_45/test.out b/testsuite/tests/pp/issue_45/test.out
index d0cf853e..54b8bf42 100644
--- a/testsuite/tests/pp/issue_45/test.out
+++ b/testsuite/tests/pp/issue_45/test.out
@@ -1,8 +1,8 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/issue_66/test.out b/testsuite/tests/pp/issue_66/test.out
index 1d4e0de5..4f7fff83 100644
--- a/testsuite/tests/pp/issue_66/test.out
+++ b/testsuite/tests/pp/issue_66/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 with Ada.Containers.Indefinite_Ordered_Maps;
 
diff --git a/testsuite/tests/pp/issue_82/test.out b/testsuite/tests/pp/issue_82/test.out
index 9e298c08..e96e19e0 100644
--- a/testsuite/tests/pp/issue_82/test.out
+++ b/testsuite/tests/pp/issue_82/test.out
@@ -1,4 +1,4 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
diff --git a/testsuite/tests/pp/issue_94_W601-007/test.out b/testsuite/tests/pp/issue_94_W601-007/test.out
index 957b7c72..ecd6981e 100644
--- a/testsuite/tests/pp/issue_94_W601-007/test.out
+++ b/testsuite/tests/pp/issue_94_W601-007/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Test is
 
@@ -20,8 +20,8 @@ package Test is
 
 end Test;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Test is
 
diff --git a/testsuite/tests/pp/issue_95/test.out b/testsuite/tests/pp/issue_95/test.out
index 16241833..4f2ccbd7 100644
--- a/testsuite/tests/pp/issue_95/test.out
+++ b/testsuite/tests/pp/issue_95/test.out
@@ -1,6 +1,6 @@
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Test is
 
@@ -19,8 +19,8 @@ package Test is
 
 end Test;
 
-WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
--------
+Info: AdaCore provides a new formatter GNATformat, currently in beta. This will supersede GNATpp when leaving the beta program.
+-----
 
 package Test is