merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/docs/latex/wx/texpr.tex
+++ b/docs/latex/wx/texpr.tex
@@ -140,7 +140,7 @@ way to the current compilation.
 These are the known bugs:

 \begin{enumerate}\itemsep=0pt
-\item Functors are permissable only in the main clause (object).
+\item Functors are permissible only in the main clause (object).
 Therefore nesting of structures must be done using lists, not predicates
 as in Prolog.
 \item There is a limit to the size of strings read in (about 5000 bytes).