diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
| commit | 0858753e829fd399b55700688b4b2cb9c3ea6908 (patch) | |
| tree | 55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/socket.c | |
| parent | 0aed71aa51e89e714de2392c2a5f44694dca77ea (diff) | |
| parent | 817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff) | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
libguile/gc-malloc.c
libguile/ports.c
Diffstat (limited to 'libguile/socket.c')
| -rw-r--r-- | libguile/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/socket.c b/libguile/socket.c index d085d330e..149ec005f 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -515,10 +515,10 @@ SCM_DEFINE (scm_getsockopt, "getsockopt", 3, 0, 0, "@end defvar\n" "\n" "@defvar SO_LINGER\n" - "The @var{value} returned is a pair of integers\n" - "@code{(@var{ENABLE} . @var{TIMEOUT})}. On old systems without\n" + "The value returned is a pair of integers\n" + "@code{(@var{enable} . @var{timeout})}. On old systems without\n" "timeout support (ie.@: without @code{struct linger}), only\n" - "@var{ENABLE} has an effect but the value in Guile is always a\n" + "@var{enable} has an effect but the value in Guile is always a\n" "pair.\n" "@end defvar") #define FUNC_NAME s_scm_getsockopt @@ -1560,7 +1560,7 @@ SCM_DEFINE (scm_sendto, "sendto", 3, 1, 1, (SCM sock, SCM message, SCM fam_or_sockaddr, SCM address, SCM args_and_flags), "Transmit bytevector @var{message} on socket port\n" "@var{sock}. The\n" - "destination address is specified using the @var{fam},\n" + "destination address is specified using the @var{fam_or_sockaddr},\n" "@var{address} and\n" "@var{args_and_flags} arguments, or just a socket address object " "returned by @code{make-socket-address}, in a similar way to the\n" |