diff --git a/src/pp-main.adb b/src/pp-main.adb
index 20aa4dc41..701418edc 100644
--- a/src/pp-main.adb
+++ b/src/pp-main.adb
@@ -36,12 +36,19 @@ procedure Pp.Main is
 
    Tool : Actions.Pp_Tool;
    Cmd  : Utils.Command_Lines.Command_Line
-            (Pp.Command_Lines.Descriptor'Access);
+     (Pp.Command_Lines.Descriptor'Access);
 
 begin
    --  By default, send errors to stdout
    Utils.Err_Out.Output_Enabled := True;
 
+   --  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");
+
    --  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 9c8044607..8dd0324fa 100644
--- a/testsuite/tests/metric/RB16-011/test.out
+++ b/testsuite/tests/metric/RB16-011/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Foo (I : in out Integer) is
 begin
    if I > 0 then
diff --git a/testsuite/tests/pp/CS0037228/test.out b/testsuite/tests/pp/CS0037228/test.out
index cb320fe10..e0034dab6 100644
--- a/testsuite/tests/pp/CS0037228/test.out
+++ b/testsuite/tests/pp/CS0037228/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package body Foo is
 
    procedure Create
diff --git a/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out b/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out
index 7098ee133..b76fc6c44 100644
--- a/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out
+++ b/testsuite/tests/pp/CS0038689/comments_switch_overwrite/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Test is
    -- Documentation
    --    Something
diff --git a/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out b/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out
index 8ce0331aa..55fdc327e 100644
--- a/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out
+++ b/testsuite/tests/pp/CS0038689/ignore_cmd_gpr/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 Units remaining: 4     
 package Test_1 is
    type Foo;
diff --git a/testsuite/tests/pp/CS0039262/test.out b/testsuite/tests/pp/CS0039262/test.out
index 7337e7a11..9d94639e7 100644
--- a/testsuite/tests/pp/CS0039262/test.out
+++ b/testsuite/tests/pp/CS0039262/test.out
@@ -1,4 +1,8 @@
 
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
 package test is
 
   procedure P1
diff --git a/testsuite/tests/pp/G905-011/test.out b/testsuite/tests/pp/G905-011/test.out
index 34953317a..969d1c762 100644
--- a/testsuite/tests/pp/G905-011/test.out
+++ b/testsuite/tests/pp/G905-011/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 procedure Gnatpp_Array_Formatting is
    type Rec_T is record
@@ -21,6 +25,10 @@ procedure Gnatpp_Array_Formatting is
 begin
    null;
 end Gnatpp_Array_Formatting;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO;
 procedure Gnatpp_Exdentation is
    A_String_1   : constant String  := "abc";
@@ -44,6 +52,10 @@ begin
          Integer'Image (An_Integer_3 + An_Integer_4) & ASCII.LF);
    end if;
 end Gnatpp_Exdentation;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Junk is
 begin
    Test
diff --git a/testsuite/tests/pp/G913-019/test.out b/testsuite/tests/pp/G913-019/test.out
index 232983526..2fcf43c57 100644
--- a/testsuite/tests/pp/G913-019/test.out
+++ b/testsuite/tests/pp/G913-019/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure TEST is
    procedure PROCEDURE_NAME
      (PARAM1 : in Integer;
diff --git a/testsuite/tests/pp/MB21-028/test.out b/testsuite/tests/pp/MB21-028/test.out
index 942d122cf..6202a611b 100644
--- a/testsuite/tests/pp/MB21-028/test.out
+++ b/testsuite/tests/pp/MB21-028/test.out
@@ -1,9 +1,17 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure P is
    pragma Warnings (Off);
    --  Explain why we turned warnings off.
 begin
    null;
 end P;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure P is
    pragma Warnings (Off);
 
@@ -12,6 +20,10 @@ procedure P is
 begin
    null;
 end P;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package body Q is
 
    procedure P is
diff --git a/testsuite/tests/pp/N218-043/test.out b/testsuite/tests/pp/N218-043/test.out
index 88c8cb5aa..a1d282f61 100644
--- a/testsuite/tests/pp/N218-043/test.out
+++ b/testsuite/tests/pp/N218-043/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Directions is
 
    type Direction_Type_2 is
diff --git a/testsuite/tests/pp/N219-016/test.out b/testsuite/tests/pp/N219-016/test.out
index f30fbd6c5..f39248c43 100644
--- a/testsuite/tests/pp/N219-016/test.out
+++ b/testsuite/tests/pp/N219-016/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Records is
 
   type Uncompact_Type is record
@@ -19,6 +23,10 @@ package Records is
   end record;
 
 end Records;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Records is
 
   type Uncompact_Type is
diff --git a/testsuite/tests/pp/N312-029/test.out b/testsuite/tests/pp/N312-029/test.out
index 714954ac0..94aedfc8f 100644
--- a/testsuite/tests/pp/N312-029/test.out
+++ b/testsuite/tests/pp/N312-029/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Sample_Formatting is
 
 begin
@@ -34,6 +38,10 @@ begin
    end My_Begin_Block;
 
 end Sample_Formatting;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Sample_Formatting is
 
 begin
diff --git a/testsuite/tests/pp/N428-004/test.out b/testsuite/tests/pp/N428-004/test.out
index e3f7d3c32..d6c430f80 100644
--- a/testsuite/tests/pp/N428-004/test.out
+++ b/testsuite/tests/pp/N428-004/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Ors is
 begin
    Rcc.Ahb1enr :=
diff --git a/testsuite/tests/pp/N812-011/test.out b/testsuite/tests/pp/N812-011/test.out
index 972b3fe6e..ba6bdc6b5 100644
--- a/testsuite/tests/pp/N812-011/test.out
+++ b/testsuite/tests/pp/N812-011/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package P with
   Pure
 is
@@ -12,6 +16,10 @@ is
      Pre => A > 0, Post => B = A'Old;
 
 end P;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Q is
 
    type T is new Integer;
diff --git a/testsuite/tests/pp/N827-012/test.out b/testsuite/tests/pp/N827-012/test.out
index 9ebc94706..1718d5112 100644
--- a/testsuite/tests/pp/N827-012/test.out
+++ b/testsuite/tests/pp/N827-012/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Characters.Latin_1;
 
 package P is
diff --git a/testsuite/tests/pp/O723-016/test.out b/testsuite/tests/pp/O723-016/test.out
index c0c7c0c27..f86d42cfe 100644
--- a/testsuite/tests/pp/O723-016/test.out
+++ b/testsuite/tests/pp/O723-016/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Toto, Titi;
 
 function Foo (Profondeur : in Natural; B : Natural) return Float is
diff --git a/testsuite/tests/pp/OA07-042/test.out b/testsuite/tests/pp/OA07-042/test.out
index d8097b81b..82feb5020 100644
--- a/testsuite/tests/pp/OA07-042/test.out
+++ b/testsuite/tests/pp/OA07-042/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Align_Test is
    Index       : Integer;
    Number_Test : Integer;
diff --git a/testsuite/tests/pp/P318-034/test.out b/testsuite/tests/pp/P318-034/test.out
index ad2882031..e4cf16bde 100644
--- a/testsuite/tests/pp/P318-034/test.out
+++ b/testsuite/tests/pp/P318-034/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 -- 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 6462a73b6..776cd6280 100644
--- a/testsuite/tests/pp/P408-012/test.out
+++ b/testsuite/tests/pp/P408-012/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Pretty is
 
     package Ip is
@@ -46,6 +50,10 @@ begin
     null;
 
 end Pretty;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Pretty is
 
     package Ip is
diff --git a/testsuite/tests/pp/P523-009/test.out b/testsuite/tests/pp/P523-009/test.out
index cb01dbece..af1f4801e 100644
--- a/testsuite/tests/pp/P523-009/test.out
+++ b/testsuite/tests/pp/P523-009/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 pragma Ada_95;
 pragma Warnings (Off);
 pragma Source_File_Name (ada_main, Spec_File_Name => "b__test069.2.ads");
diff --git a/testsuite/tests/pp/P817-005/test.out b/testsuite/tests/pp/P817-005/test.out
index b603ce483..f18d0f285 100644
--- a/testsuite/tests/pp/P817-005/test.out
+++ b/testsuite/tests/pp/P817-005/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Example_With_Comments is
 
    type Log_Type is
@@ -17,6 +21,10 @@ package Example_With_Comments is
      Pre => progname'Length <= 64 and filename'Length <= 4_096;
 
 end Example_With_Comments;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Example_With_Comments is -- end of line
 
    type Log_Type is
diff --git a/testsuite/tests/pp/Q724-015/test.out b/testsuite/tests/pp/Q724-015/test.out
index 62926497b..a2fdfd826 100644
--- a/testsuite/tests/pp/Q724-015/test.out
+++ b/testsuite/tests/pp/Q724-015/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Csc_Channel.Version_Handling is
    type T_Version_Handling is limited interface;
    type T_Version_Handling_Class_Access is access all T_Version_Handling'Class;
@@ -8,6 +12,10 @@ package Csc_Channel.Version_Handling is
       P1   : out Lang.Primitifs.T_Uint;
       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.
+-------
+
 package Csc_Channel.Version_Handling is
    type T_Version_Handling is limited interface;
    type T_Version_Handling_Class_Access is access all T_Version_Handling'Class;
diff --git a/testsuite/tests/pp/QA14-008/test.out b/testsuite/tests/pp/QA14-008/test.out
index 4f1326d33..79f1d3514 100644
--- a/testsuite/tests/pp/QA14-008/test.out
+++ b/testsuite/tests/pp/QA14-008/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Left_Hand_Side is
 begin
    Some_Array (I)    := @ + 1;
diff --git a/testsuite/tests/pp/QA17-028/test.out b/testsuite/tests/pp/QA17-028/test.out
index 701d2c2bf..5b091864e 100644
--- a/testsuite/tests/pp/QA17-028/test.out
+++ b/testsuite/tests/pp/QA17-028/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 WITH ibusiness_unit.synthetic_target_manager;
 
 PACKAGE BODY pp_reproducer IS
diff --git a/testsuite/tests/pp/QC06-022/P718-006/test.out b/testsuite/tests/pp/QC06-022/P718-006/test.out
index 3ae100f1d..0f90371b5 100644
--- a/testsuite/tests/pp/QC06-022/P718-006/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-006/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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 839070603..4e82df8be 100644
--- a/testsuite/tests/pp/QC06-022/P718-008/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-008/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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 de631d7cb..84f6939a7 100644
--- a/testsuite/tests/pp/QC06-022/P718-010/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-010/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Preserve_Existing_Continuation_Lines
 is
    type Array_Type is
diff --git a/testsuite/tests/pp/QC06-022/P718-011/test.out b/testsuite/tests/pp/QC06-022/P718-011/test.out
index b25268283..86cef274f 100644
--- a/testsuite/tests/pp/QC06-022/P718-011/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-011/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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 5ee067e68..d5202eb57 100644
--- a/testsuite/tests/pp/QC06-022/P718-012/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-012/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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 ec43e5387..81ca56c84 100644
--- a/testsuite/tests/pp/QC06-022/P718-013/test.out
+++ b/testsuite/tests/pp/QC06-022/P718-013/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Blank_Lines_Insertion
 is
 
diff --git a/testsuite/tests/pp/R713-024/test.out b/testsuite/tests/pp/R713-024/test.out
index c996290ce..cb8fbaad2 100644
--- a/testsuite/tests/pp/R713-024/test.out
+++ b/testsuite/tests/pp/R713-024/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Spark_Mode with
   SPARK_Mode
 is
diff --git a/testsuite/tests/pp/R813-004/test.out b/testsuite/tests/pp/R813-004/test.out
index e35955306..09d26ee65 100644
--- a/testsuite/tests/pp/R813-004/test.out
+++ b/testsuite/tests/pp/R813-004/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package body P is
 
   function F return T is
diff --git a/testsuite/tests/pp/RB02-007/test.out b/testsuite/tests/pp/RB02-007/test.out
index c2ce33fce..0fcf8dada 100644
--- a/testsuite/tests/pp/RB02-007/test.out
+++ b/testsuite/tests/pp/RB02-007/test.out
@@ -1,3 +1,15 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 out
 out.sep
 out.no-sep
diff --git a/testsuite/tests/pp/RB05-002/test.out b/testsuite/tests/pp/RB05-002/test.out
index 31fa03888..85dfe0fc6 100644
--- a/testsuite/tests/pp/RB05-002/test.out
+++ b/testsuite/tests/pp/RB05-002/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -181,6 +185,10 @@ begin
    end loop;
 end Loop_Then;
 separate-loop
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -367,6 +375,10 @@ begin
    end loop;
 end Loop_Then;
 separate-then
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -561,6 +573,10 @@ begin
    end loop;
 end Loop_Then;
 separate-loop-then
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -758,6 +774,10 @@ begin
    end loop;
 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.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -955,6 +975,10 @@ begin
    end loop;
 end Loop_Then;
 no-separate-loop
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -1131,6 +1155,10 @@ begin
    end loop;
 end Loop_Then;
 no-separate-then
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -1305,6 +1333,10 @@ begin
    end loop;
 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.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
@@ -1472,6 +1504,10 @@ begin
    end loop;
 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.
+-------
+
 procedure Loop_Then is
    X_012345, X_0123456, X_01234567,
    X_012345678, X_0123456789,
diff --git a/testsuite/tests/pp/RB28-025/test.out b/testsuite/tests/pp/RB28-025/test.out
index 2f111c5c2..a766655dc 100644
--- a/testsuite/tests/pp/RB28-025/test.out
+++ b/testsuite/tests/pp/RB28-025/test.out
@@ -1,25 +1,53 @@
 gnatpp --pipe abc.ads
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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.
+-------
+
 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.
+-------
+
 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.
+-------
+
 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.
+-------
+
 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.
+-------
+
 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.
+-------
+
 package Abc is end;
 package Abc is
 end Abc;
diff --git a/testsuite/tests/pp/RC10-055.pp/test.out b/testsuite/tests/pp/RC10-055.pp/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/RC10-055.pp/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/S213-005/test.out b/testsuite/tests/pp/S213-005/test.out
index fa56b3d75..fbb96b2ac 100644
--- a/testsuite/tests/pp/S213-005/test.out
+++ b/testsuite/tests/pp/S213-005/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure p is
 
 begin
diff --git a/testsuite/tests/pp/S220-035/test.out b/testsuite/tests/pp/S220-035/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/S220-035/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/S225-027/test.out b/testsuite/tests/pp/S225-027/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/S225-027/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/S225-063/test.out b/testsuite/tests/pp/S225-063/test.out
index 5c78bd51f..f1be6069e 100644
--- a/testsuite/tests/pp/S225-063/test.out
+++ b/testsuite/tests/pp/S225-063/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 --  This file has CRLF line endings,^M
 --  but no CRLF after the last line.^M
 ^M
diff --git a/testsuite/tests/pp/S313-033/test.out b/testsuite/tests/pp/S313-033/test.out
index cfc1fa202..6e5bf845b 100644
--- a/testsuite/tests/pp/S313-033/test.out
+++ b/testsuite/tests/pp/S313-033/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Mixed_Keywords is
 
    --  This test uses post-Ada-83 reserved words as identifiers and as reserved
diff --git a/testsuite/tests/pp/S329-035/test.out b/testsuite/tests/pp/S329-035/test.out
index 56f3006c9..3fea93e92 100644
--- a/testsuite/tests/pp/S329-035/test.out
+++ b/testsuite/tests/pp/S329-035/test.out
@@ -1,9 +1,17 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 WITH System.Multiprocessors.Dispatching_Domains;
 PACKAGE p IS
    TASK t IS
       ENTRY set (core_affinity : IN Natural; success : OUT Boolean);
    END t;
 END p;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 WITH System.Multiprocessors.Dispatching_Domains;
 PACKAGE p IS
    TASK t IS
diff --git a/testsuite/tests/pp/S412-043/test.out b/testsuite/tests/pp/S412-043/test.out
index ad1b0387a..1a108c015 100644
--- a/testsuite/tests/pp/S412-043/test.out
+++ b/testsuite/tests/pp/S412-043/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 function Cvt is new Unchecked_Conversion
   (Source => Integer, Target => Tds_Unsigned_T);
 -- Add Cvt for Tds_Integer_T if it is ever different from Integer.
diff --git a/testsuite/tests/pp/S503-002/test.out b/testsuite/tests/pp/S503-002/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/S503-002/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/S522-034/test.out b/testsuite/tests/pp/S522-034/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/S522-034/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/S709-048/test.out b/testsuite/tests/pp/S709-048/test.out
index 29ca6affc..db9eaf2d1 100644
--- a/testsuite/tests/pp/S709-048/test.out
+++ b/testsuite/tests/pp/S709-048/test.out
@@ -1,11 +1,23 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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.
+-------
+
 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.
+-------
+
 package P is
    My_Integer: Integer          := Some_Function(A - B);
    X         : constant Boolean := False;
diff --git a/testsuite/tests/pp/S809-020/test.out b/testsuite/tests/pp/S809-020/test.out
index bbcf4be82..972490254 100644
--- a/testsuite/tests/pp/S809-020/test.out
+++ b/testsuite/tests/pp/S809-020/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 pragma Ada_95;
 pragma Warnings (Off);
 pragma Source_File_Name (ada_main, Spec_File_Name => "b__test069.2.ads");
@@ -316,6 +320,10 @@ package body ada_main is
    --  END Object file/option list
 
 end ada_main;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 pragma Ada_95;
 pragma Warnings (Off);
 with System;
@@ -747,6 +755,10 @@ package ada_main is
    --  END ELABORATION ORDER
 
 end ada_main;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 pragma Ada_95;
 pragma Warnings (Off);
 pragma Source_File_Name (ada_main, Spec_File_Name => "b__test070.2.ads");
@@ -1013,6 +1025,10 @@ package body ada_main is
    --  END Object file/option list
 
 end ada_main;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 pragma Ada_95;
 pragma Warnings (Off);
 with System;
@@ -1381,6 +1397,10 @@ package ada_main is
    --  END ELABORATION ORDER
 
 end ada_main;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Csc_Channel.Version_Handling is
    type T_Version_Handling is limited interface;
    type T_Version_Handling_Class_Access is access all T_Version_Handling'Class;
@@ -1392,6 +1412,10 @@ package Csc_Channel.Version_Handling is
       P1      :    out Lang.Primitifs.T_Uint;
       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.
+-------
+
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 procedure Gnatpp_Array_Formatting is
    type Rec_T is record
@@ -1415,6 +1439,10 @@ procedure Gnatpp_Array_Formatting is
 begin
    null;
 end Gnatpp_Array_Formatting;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO;
 procedure Gnatpp_Exdentation is
    A_String_1   : constant String  := "abc";
@@ -1438,6 +1466,10 @@ begin
          Integer'Image (An_Integer_3 + An_Integer_4) & ASCII.LF);
    end if;
 end Gnatpp_Exdentation;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Loop_Then is
    X_012345,
    X_0123456,
@@ -1578,6 +1610,10 @@ begin
       null;
    end loop;
 end Loop_Then;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Ors is
 begin
    Rcc.Ahb1enr :=
@@ -1588,6 +1624,10 @@ begin
      RCC_Bits.Ahb1enr.Gpiogen or RCC_Bits.Ahb1enr.Gpiohen or
      RCC_Bits.Ahb1enr.Gpioien;
 end Ors;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Pretty is
 
    package IP is
@@ -1675,6 +1715,10 @@ begin
    null;
 
 end Pretty;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Separate_Thens is
    X_0123456789,
    X_01234567890,
@@ -1745,7 +1789,15 @@ begin
       null;
    end if;
 end Separate_Thens;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Test070;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO;
 with test_gnatpp;
 
@@ -1759,6 +1811,10 @@ 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.
+-------
+
 procedure Junk is
 begin
    Test
@@ -1766,6 +1822,10 @@ begin
       "CHECK THAT BASED REAL LITERALS WITH BASES " &
       "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.
+-------
+
 package test_gnatpp is
 
    type development_switch is
diff --git a/testsuite/tests/pp/S913-026/test.out b/testsuite/tests/pp/S913-026/test.out
index b6332d15e..feab72394 100644
--- a/testsuite/tests/pp/S913-026/test.out
+++ b/testsuite/tests/pp/S913-026/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package test is
 
    type my_type is record
diff --git a/testsuite/tests/pp/T312-041/test.out b/testsuite/tests/pp/T312-041/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/T312-041/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/T603-026/test.out b/testsuite/tests/pp/T603-026/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/T603-026/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/T603-052/test.out b/testsuite/tests/pp/T603-052/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/T603-052/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/T616-044/test.out b/testsuite/tests/pp/T616-044/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/T616-044/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/T824-031/test.out b/testsuite/tests/pp/T824-031/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/T824-031/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/TA14-049/test.out b/testsuite/tests/pp/TA14-049/test.out
index 146ca52fc..c37a57ce1 100644
--- a/testsuite/tests/pp/TA14-049/test.out
+++ b/testsuite/tests/pp/TA14-049/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package
      Q
      is
@@ -6,4 +10,8 @@ package
 return Integer 
 is (2);
 end Q;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/U206-003/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U206-007/test.out b/testsuite/tests/pp/U206-007/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/U206-007/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U208-025/test.out b/testsuite/tests/pp/U208-025/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/U208-025/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U317-012/test.out b/testsuite/tests/pp/U317-012/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/U317-012/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U506-042/test.out b/testsuite/tests/pp/U506-042/test.out
new file mode 100644
index 000000000..eb82c5464
--- /dev/null
+++ b/testsuite/tests/pp/U506-042/test.out
@@ -0,0 +1,12 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U514-018/test.out b/testsuite/tests/pp/U514-018/test.out
index e69de29bb..9e298c087 100644
--- a/testsuite/tests/pp/U514-018/test.out
+++ b/testsuite/tests/pp/U514-018/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U603-022/test.out b/testsuite/tests/pp/U603-022/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/U603-022/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/U617-041/test.out b/testsuite/tests/pp/U617-041/test.out
index 7b55a1db1..dbe165523 100644
--- a/testsuite/tests/pp/U617-041/test.out
+++ b/testsuite/tests/pp/U617-041/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
 begin
    null;
diff --git a/testsuite/tests/pp/U813-002_0/test.out b/testsuite/tests/pp/U813-002_0/test.out
index ff9b3f5d6..5151d35bf 100644
--- a/testsuite/tests/pp/U813-002_0/test.out
+++ b/testsuite/tests/pp/U813-002_0/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_garply  : Integer          := 1;
@@ -8,6 +12,10 @@ begin
    Put_Line (bar_Foo'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_garply  : Integer          := 1;
@@ -18,6 +26,10 @@ begin
    Put_Line (bar_Foo'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_garply  : Integer          := 1;
@@ -28,6 +40,10 @@ begin
    Put_Line (bar_Foo'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_garply  : Integer          := 1;
@@ -38,6 +54,10 @@ begin
    Put_Line (BAR_FOO'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_garply  : Integer          := 1;
@@ -48,6 +68,10 @@ begin
    Put_Line (bar_foo'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_garply  : Integer          := 1;
diff --git a/testsuite/tests/pp/U813-002_1/test.out b/testsuite/tests/pp/U813-002_1/test.out
index a443ce360..f98dec76c 100644
--- a/testsuite/tests/pp/U813-002_1/test.out
+++ b/testsuite/tests/pp/U813-002_1/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_Garply : Integer  := 1;
@@ -6,6 +10,10 @@ begin
    Put_Line (Foo_Bar'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_Garply : Integer  := 1;
@@ -14,6 +22,10 @@ begin
    Put_Line (Foo_Bar'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_Garply : Integer  := 1;
@@ -22,6 +34,10 @@ begin
    Put_Line (foo_Bar'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_Garply : Integer  := 1;
@@ -30,6 +46,10 @@ begin
    Put_Line (FOO_BAR'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_Garply : Integer  := 1;
@@ -38,6 +58,10 @@ begin
    Put_Line (foo_bar'Image);
 end Main;
 
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Text_IO; use Ada.Text_IO;
 procedure Main is
    Corge_Garply : Integer  := 1;
diff --git a/testsuite/tests/pp/U916-013/test.out b/testsuite/tests/pp/U916-013/test.out
index 788164453..52ad40f69 100644
--- a/testsuite/tests/pp/U916-013/test.out
+++ b/testsuite/tests/pp/U916-013/test.out
@@ -1,4 +1,8 @@
 test_OK
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure test_OK is
 
    val : Integer := 0;
@@ -10,6 +14,10 @@ begin
 end test_OK;
 0
 test_NOK
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 Syntax errors in test_NOK.adb
 8:4: Skipped token val
 8:8: Skipped token :=
diff --git a/testsuite/tests/pp/U920-030/test.out b/testsuite/tests/pp/U920-030/test.out
index 475149f60..b6a256976 100644
--- a/testsuite/tests/pp/U920-030/test.out
+++ b/testsuite/tests/pp/U920-030/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
    type Forward_Variance_Result is record
       A      : NNN :=
diff --git a/testsuite/tests/pp/V111-001/test.out b/testsuite/tests/pp/V111-001/test.out
new file mode 100644
index 000000000..d0cf853e2
--- /dev/null
+++ b/testsuite/tests/pp/V111-001/test.out
@@ -0,0 +1,8 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V117-043/test.out b/testsuite/tests/pp/V117-043/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/V117-043/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V120-021/test.out b/testsuite/tests/pp/V120-021/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/V120-021/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V203-009/test.out b/testsuite/tests/pp/V203-009/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/V203-009/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V308-029/test.out b/testsuite/tests/pp/V308-029/test.out
new file mode 100644
index 000000000..d0cf853e2
--- /dev/null
+++ b/testsuite/tests/pp/V308-029/test.out
@@ -0,0 +1,8 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V405-022/test.out b/testsuite/tests/pp/V405-022/test.out
new file mode 100644
index 000000000..d0cf853e2
--- /dev/null
+++ b/testsuite/tests/pp/V405-022/test.out
@@ -0,0 +1,8 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V414-004/test.out b/testsuite/tests/pp/V414-004/test.out
index e6d14ccdd..cdc4a4263 100644
--- a/testsuite/tests/pp/V414-004/test.out
+++ b/testsuite/tests/pp/V414-004/test.out
@@ -1,3 +1,7 @@
+
+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;
diff --git a/testsuite/tests/pp/V523-046/test.out b/testsuite/tests/pp/V523-046/test.out
index e69de29bb..eb82c5464 100644
--- a/testsuite/tests/pp/V523-046/test.out
+++ b/testsuite/tests/pp/V523-046/test.out
@@ -0,0 +1,12 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/V901-006/test.out b/testsuite/tests/pp/V901-006/test.out
index e7f3d027d..22fab8c3e 100644
--- a/testsuite/tests/pp/V901-006/test.out
+++ b/testsuite/tests/pp/V901-006/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 Units remaining: 3     
 Units remaining: 2     
 Units remaining: 1     
diff --git a/testsuite/tests/pp/VA11-017/test.out b/testsuite/tests/pp/VA11-017/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/VA11-017/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out b/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/VA11-017_insert_blank_lines/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/VA11-018/test.out b/testsuite/tests/pp/VA11-018/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/VA11-018/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/VB25-014/test.out b/testsuite/tests/pp/VB25-014/test.out
index 532e9583e..9246565c9 100644
--- a/testsuite/tests/pp/VB25-014/test.out
+++ b/testsuite/tests/pp/VB25-014/test.out
@@ -1,4 +1,8 @@
 Default layout
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
    type My_Enum is
      (One,
@@ -9,6 +13,10 @@ begin
    null;
 end Main;
 Minimal layout
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
    type My_Enum is (One, Two, Three,
                     Four);
@@ -16,12 +24,20 @@ begin
    null;
 end Main;
 Compact layout
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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.
+-------
+
 procedure Main is
 
    type My_Enum is
@@ -34,6 +50,10 @@ 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.
+-------
+
 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 d5af925e8..6eaeb1c6a 100644
--- a/testsuite/tests/pp/VC19-020-split/test.out
+++ b/testsuite/tests/pp/VC19-020-split/test.out
@@ -1,4 +1,8 @@
 Testing --split-line-before-op switch
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
    type My_Range is range 1 .. 100;
    subtype First_Dozen is My_Range with
diff --git a/testsuite/tests/pp/VC19-020/test.out b/testsuite/tests/pp/VC19-020/test.out
index 738f144f5..9f192055d 100644
--- a/testsuite/tests/pp/VC19-020/test.out
+++ b/testsuite/tests/pp/VC19-020/test.out
@@ -1,5 +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.
+-------
+
 procedure Main is
    type My_Range is range 1 .. 100;
    subtype First_Dozen is My_Range with
@@ -34,6 +38,10 @@ begin
 end Main;
 ---------------------------------------------------
 2 --layout=minimal
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
    type My_Range is range 1 .. 100;
    subtype First_Dozen is My_Range with
@@ -49,6 +57,10 @@ begin
 end Main;
 ---------------------------------------------------
 3 --layout=tall
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
 
    type My_Range is range 1 .. 100;
@@ -84,6 +96,10 @@ begin
 end Main;
 ---------------------------------------------------
 4 --layout=compact
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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 fec74190d..c28f47167 100644
--- a/testsuite/tests/pp/W213-015/test.out
+++ b/testsuite/tests/pp/W213-015/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 Units remaining: 2     
 package body Example is
    procedure A_Procedure is null;
diff --git a/testsuite/tests/pp/agg.P510-022/test.out b/testsuite/tests/pp/agg.P510-022/test.out
index b45370a25..2ae72258a 100644
--- a/testsuite/tests/pp/agg.P510-022/test.out
+++ b/testsuite/tests/pp/agg.P510-022/test.out
@@ -1,8 +1,16 @@
 test number 1
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 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.
+-------
+
 PACKAGE a IS
      TYPE Int IS RANGE 1 .. 10;
      X : Int;
@@ -12,6 +20,18 @@ PACKAGE a IS
      Z : Float;
 END a;
 test number 3
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 ----------------
 src_c/c.ads
 PACKAGE C IS
diff --git a/testsuite/tests/pp/issue_24/test.out b/testsuite/tests/pp/issue_24/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/issue_24/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/issue_38/test.out b/testsuite/tests/pp/issue_38/test.out
new file mode 100644
index 000000000..d0cf853e2
--- /dev/null
+++ b/testsuite/tests/pp/issue_38/test.out
@@ -0,0 +1,8 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/issue_39/test.out b/testsuite/tests/pp/issue_39/test.out
index 40ed39c83..e62345364 100644
--- a/testsuite/tests/pp/issue_39/test.out
+++ b/testsuite/tests/pp/issue_39/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
 begin
    --  Comment 1
@@ -5,6 +9,10 @@ begin
    --  Comment 2
    null;
 end Main;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 procedure Main is
 begin
    --  Comment 1
diff --git a/testsuite/tests/pp/issue_45/test.out b/testsuite/tests/pp/issue_45/test.out
new file mode 100644
index 000000000..d0cf853e2
--- /dev/null
+++ b/testsuite/tests/pp/issue_45/test.out
@@ -0,0 +1,8 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/issue_66/test.out b/testsuite/tests/pp/issue_66/test.out
index 640f1fdb6..1d4e0de55 100644
--- a/testsuite/tests/pp/issue_66/test.out
+++ b/testsuite/tests/pp/issue_66/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 with Ada.Containers.Indefinite_Ordered_Maps;
 
 package Test is
diff --git a/testsuite/tests/pp/issue_82/test.out b/testsuite/tests/pp/issue_82/test.out
new file mode 100644
index 000000000..9e298c087
--- /dev/null
+++ b/testsuite/tests/pp/issue_82/test.out
@@ -0,0 +1,4 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
diff --git a/testsuite/tests/pp/issue_94_W601-007/test.out b/testsuite/tests/pp/issue_94_W601-007/test.out
index f73b87103..957b7c727 100644
--- a/testsuite/tests/pp/issue_94_W601-007/test.out
+++ b/testsuite/tests/pp/issue_94_W601-007/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Test is
 
    Test_Nb : constant Integer := 0;
@@ -15,6 +19,10 @@ package Test is
      1_234_567_890_123_456_789_012_345_678_901_234_567_890_123_456_789_012_345_678_901_234_567_890_123_456_789_012_345_678_901_234_567_890;
 
 end Test;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Test is
 
    Test_Nb : constant Integer := 0;
diff --git a/testsuite/tests/pp/issue_95/test.out b/testsuite/tests/pp/issue_95/test.out
index bf691aeb7..162418334 100644
--- a/testsuite/tests/pp/issue_95/test.out
+++ b/testsuite/tests/pp/issue_95/test.out
@@ -1,3 +1,7 @@
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Test is
 
    procedure Test_P (V1 : in out My_Type; V2 : in out My_Other_Type);
@@ -14,6 +18,10 @@ package Test is
    not overriding function Test_F2 (Item : in Object) return String;
 
 end Test;
+
+WARNING: GNATpp will be baselined soon. Please switch to GNATformat, the new Ada code formatter, for future use.
+-------
+
 package Test is
 
    procedure Test_P (V1 : in out My_Type; V2 : in out My_Other_Type);