merged 2.2 branch

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

docs/latex/wx/strmbase.tex

@@ -43,7 +43,7 @@ Destructor.
 
 \constfunc{wxStreamError}{IsOk}{\void}
 
-Returns TRUE if no error occured on the stream.
+Returns TRUE if no error occurred on the stream.
 
 \wxheading{See also}
 
@@ -57,10 +57,10 @@ This function returns the last error.
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf wxSTREAM\_NO\_ERROR}}{No error occured.}
-\twocolitem{{\bf wxSTREAM\_EOF}}{An End-Of-File occured.}
-\twocolitem{{\bf wxSTREAM\_WRITE\_ERROR}}{A generic error occured on the last write call.}
-\twocolitem{{\bf wxSTREAM\_READ\_ERROR}}{A generic error occured on the last read call.}
+\twocolitem{{\bf wxSTREAM\_NO\_ERROR}}{No error occurred.}
+\twocolitem{{\bf wxSTREAM\_EOF}}{An End-Of-File occurred.}
+\twocolitem{{\bf wxSTREAM\_WRITE\_ERROR}}{A generic error occurred on the last write call.}
+\twocolitem{{\bf wxSTREAM\_READ\_ERROR}}{A generic error occurred on the last read call.}
 \end{twocollist}
 
 \membersection{wxStreamBase::OnSysRead}\label{wxstreambaseonsysread}