use 'neither ... nor ...' instead of 'neither ... or ...' in wxFinite documentation

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

diff --git a/docs/latex/wx/socket.tex b/docs/latex/wx/socket.tex
index fae16a9068e70069f7aad0b4a228d748ac692506..ac48755b04f1d8c622bdb659540d05c2a0a91040 100644 (file)
--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -127,7 +127,7 @@ Functions to retrieve current state and miscellaneous info.
 \helpref{IsDisconnected}{wxsocketbaseisdisconnected}\\
 \helpref{LastCount}{wxsocketbaselastcount}\\
 \helpref{LastError}{wxsocketbaselasterror}\\
-\helpref{Ok}{wxsocketbaseok}\\
+\helpref{IsOk}{wxsocketbaseisok}\\
 \helpref{SaveState}{wxsocketbasesavestate}\\
 \helpref{RestoreState}{wxsocketbaserestorestate}
 
@@ -414,11 +414,11 @@ be sent to the application. If {\it notify} is false; no events
 will be sent.
 
 % 
-% Ok
+% IsOk
 %
-\membersection{wxSocketBase::Ok}\label{wxsocketbaseok}
+\membersection{wxSocketBase::IsOk}\label{wxsocketbaseisok}
 
-\constfunc{bool}{Ok}{\void}
+\constfunc{bool}{IsOk}{\void}
 
 Returns true if the socket is initialized and ready and false in other
 cases.
@@ -524,6 +524,8 @@ The following flags can be used:
 \twocolitem{{\bf wxSOCKET\_WAITALL}}{Wait for all required data to be read/written unless an error occurs.}
 \twocolitem{{\bf wxSOCKET\_BLOCK}}{Block the GUI (do not yield) while reading/writing data.}
 \twocolitem{{\bf wxSOCKET\_REUSEADDR}}{Allows the use of an in-use port (wxServerSocket only)}
+\twocolitem{{\bf wxSOCKET\_BROADCAST}}{Switches the socket to broadcast mode}
+\twocolitem{{\bf wxSOCKET\_NOBIND}}{Stops the socket from being bound to a specific adapter (normally used in conjunction with {\bf wxSOCKET\_BROADCAST})}
 \end{twocollist}
 
 A brief overview on how to use these flags follows.
@@ -561,13 +563,17 @@ The {\bf wxSOCKET\_REUSEADDR} flag controls the use of the SO\_REUSEADDR standar
 setsockopt() flag. This flag allows the socket to bind to a port that is already in use.
 This is mostly used on UNIX-based systems to allow rapid starting and stopping of a server - 
 otherwise you may have to wait several minutes for the port to become available.
-wxSOCKET_REUSEADDR can also be used with socket clients to (re)bind to a particular local port
+wxSOCKET\_REUSEADDR can also be used with socket clients to (re)bind to a particular local port
 for an outgoing connection.
 This option can have surprising platform dependent behavior, so check the documentation for
 your platform's implementation of setsockopt(). Note that on BSD-based systems (e.g. Mac OS X),
-use of wxSOCKET_REUSEADDR implies SO_REUSEPORT in addition to SO_REUSEADDR to be consistent
+use of wxSOCKET\_REUSEADDR implies SO\_REUSEPORT in addition to SO\_REUSEADDR to be consistent
 with Windows.
 
+The {\bf wxSOCKET\_BROADCAST} flag controls the use of the SO\_BROADCAST standard
+setsockopt() flag. This flag allows the socket to use the broadcast address, and is generally
+used in conjunction with {\bf wxSOCKET\_NOBIND} and \helpref{wxIPaddress::BroadcastAddress}{wxipaddressbroadcastaddress}.
+
 So:
 
 {\bf wxSOCKET\_NONE} will try to read at least SOME data, no matter how much.
@@ -589,7 +595,7 @@ reusing local addresses/ports.
 %
 \membersection{wxSocketBase::SetLocal}\label{wxsocketbasesetlocal}
 
-\func{bool}{SetLocal}{\param{wxSockAddress\&}{ local}}
+\func{bool}{SetLocal}{\param{wxIPV4address\&}{ local}}
 
 This function allows you to set the local address and port,
 useful when an application needs to reuse a particular port. When