merged 2.4 branch into the trunk

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

docs/latex/wx/config.tex

@@ -368,18 +368,13 @@ a local or global config file is created or used. If the flag is present but
 the parameter is empty, the parameter will be set to a default. If the
 parameter is present but the style flag not, the relevant flag will be added
 to the style. For wxFileConfig you can also add wxCONFIG\_USE\_RELATIVE\_PATH 
-by logicaly or'ing it to either of the \_FILE options to tell wxFileConfig to 
+by logically or'ing it to either of the \_FILE options to tell wxFileConfig to 
 use relative instead of absolute paths.  For wxFileConfig, you can also 
 add wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS which will turn off character 
 escaping for the values of entries stored in the config file: for example 
-a {\it foo} key with some backslash characters will be stored as 
-\begin{verbatim}
-  foo=C:\mydir
-\end{verbatim}
-instead of the usual storage of 
-\begin{verbatim}
-  foo=C:\\mydir
-\end{verbatim}
+a {\it foo} key with some backslash characters will be stored as {\tt foo=C:$\backslash$mydir} instead
+of the usual storage of {\tt foo=C:$\backslash\backslash$mydir}.
+
 The wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS style can be helpful if your config 
 file must be read or written to by a non-wxWindows program (which might not 
 understand the escape characters). Note, however, that if