--- Merging r21333 into '.':

C    rtl/unix/unix.pp
Summary of conflicts:
  Text conflicts: 1

# revisions: 21333
r21333 | marco | 2012-05-19 13:58:59 +0200 (Sat, 19 May 2012) | 2 lines
Changed paths:
   M /trunk/rtl/unix/unix.pp

 * improve deprecation message.

git-svn-id: branches/fixes_2_6@22698 -

rtl/unix/unix.pp

@@ -85,7 +85,7 @@ function FpExecVPE(Const PathName:AnsiString;args,env:ppchar):cint;
 
 Function Shell   (const Command:String):cint;     deprecated;
 Function Shell   (const Command:AnsiString):cint; deprecated;
-Function fpSystem(const Command:string):cint; deprecated; // because of shortstring
+Function fpSystem(const Command:string):cint; deprecated  'use ansistring version';
 Function fpSystem(const Command:AnsiString):cint;
 
 Function WaitProcess (Pid:cint):cint;