merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/latex/wx/psbox.tex

@@ -150,7 +150,7 @@ include "##1"}}}
 \newdimen\psxoffset\newdimen\psyoffset
 \newbox\drawingBox
 \newif\ifNotB@undingBox
-\newhelp\PShelp{Proceed: you'll have a 5cm square blank box instead of
+\newhelp\PShelp{Proceed: you will have a 5cm square blank box instead of
 your graphics (Jean Orloff).}
 \def\@mpty{}
 \def\s@tsize#1 #2 #3 #4\@ndsize{
@@ -388,7 +388,7 @@ press x or e) and rename it before retrying.}
  \w@{%-make sure you can \string\input\space psbox.tex (version>=1.3);}
  \w@{%-tex JOINTFIL using Plain, or LaTeX, or whatever is needed by}
  \w@{% the first part in the joining (after splitting JOINTFIL into}
- \w@{% it's constituents, TeX will try to process it as it stands).}
+ \w@{% it is constituents, TeX will try to process it as it stands).}
  \w@{\string\input\space psbox.tex}
  \w@{\string\splitfile{\string\jobname}}
  }