fixed results of strange cvs code merge

[wxWidgets.git] / docs / latex / wx / ddeclint.tex

diff --git a/docs/latex/wx/ddeclint.tex b/docs/latex/wx/ddeclint.tex
index 5bc85beb16d4348db1ad546bf80e446e03b17e4a..2f5fc7a858af3b02a7d52289c2ccacaa52a3d027 100644 (file)
--- a/docs/latex/wx/ddeclint.tex
+++ b/docs/latex/wx/ddeclint.tex
@@ -7,7 +7,7 @@ To create a client which can communicate with a suitable server,
 you need to derive a class from wxDDEConnection and another from wxDDEClient.
 The custom wxDDEConnection class will intercept communications in
 a `conversation' with a server, and the custom wxDDEServer is required
 you need to derive a class from wxDDEConnection and another from wxDDEClient.
 The custom wxDDEConnection class will intercept communications in
 a `conversation' with a server, and the custom wxDDEServer is required

-so that a user-overriden \helpref{wxDDEClient::OnMakeConnection}{wxddeclientonmakeconnection} member can return
+so that a user-overridden \helpref{wxDDEClient::OnMakeConnection}{wxddeclientonmakeconnection} member can return

 a wxDDEConnection of the required class, when a connection is made.
 
 This DDE-based implementation is
 a wxDDEConnection of the required class, when a connection is made.
 
 This DDE-based implementation is