[Emacs-diffs] Changes to emacs/man/url.texi

[Luc Teirlinck]

Index: emacs/man/url.texi
diff -c emacs/man/url.texi:1.4 emacs/man/url.texi:1.5
*** emacs/man/url.texi:1.4      Fri Dec 17 03:14:07 2004
--- emacs/man/url.texi  Fri Dec 17 03:22:06 2004
***************
*** 414,421 ****
  @end example
  
  These schemes are defined in RFC 1808.
! @samp{ftp:} and @samp{file:} are synonomous in this library.  They
! allow reading arbitary files from hosts.  Either @samp{ange-ftp}
  (Emacs) or @samp{efs} (XEmacs) is used to retrieve them from remote
  hosts.  Local files are accessed directly.
  
--- 414,421 ----
  @end example
  
  These schemes are defined in RFC 1808.
! @samp{ftp:} and @samp{file:} are synonymous in this library.  They
! allow reading arbitrary files from hosts.  Either @samp{ange-ftp}
  (Emacs) or @samp{efs} (XEmacs) is used to retrieve them from remote
  hosts.  Local files are accessed directly.
  
***************
*** 468,474 ****
  @example
  @samp{mailto:@address@hidden@var{contents}[&@address@hidden
  @end example
! @noindent where an arbitary number of @var{header}s can be added.  If the
  @var{header} is @samp{body}, then @var{contents} is put in the body
  otherwise a @var{header} header field is created with @var{contents}
  as its contents.  Note that the URL library does not consider any
--- 468,474 ----
  @example
  @samp{mailto:@address@hidden@var{contents}[&@address@hidden
  @end example
! @noindent where an arbitrary number of @var{header}s can be added.  If the
  @var{header} is @samp{body}, then @var{contents} is put in the body
  otherwise a @var{header} header field is created with @var{contents}
  as its contents.  Note that the URL library does not consider any
***************
*** 510,516 ****
  @samp{snews} is the same as @samp{nntp} except that the default port
  is :563.
  @cindex SSL
! (It is tunnelled through SSL.)
  
  An @samp{nntp} URL is the same as a news URL, except that the URL may
  specify an article by its number.
--- 510,516 ----
  @samp{snews} is the same as @samp{nntp} except that the default port
  is :563.
  @cindex SSL
! (It is tunneled through SSL.)
  
  An @samp{nntp} URL is the same as a news URL, except that the URL may
  specify an article by its number.
***************
*** 940,946 ****
  where @var{version} can be either 4 or 5.
  @end defopt
  @defvar socks-password
! If this is @code{nil} then you will be asked for the passward,
  otherwise it will be used as the password for authenticating you to
  the @sc{socks} server.
  @end defvar
--- 940,946 ----
  where @var{version} can be either 4 or 5.
  @end defopt
  @defvar socks-password
! If this is @code{nil} then you will be asked for the password,
  otherwise it will be used as the password for authenticating you to
  the @sc{socks} server.
  @end defvar
***************
*** 1010,1016 ****
  @c @cindex resolver, hostname
  @c Some C libraries do not include the hostname resolver routines in
  @c their static libraries.  If Emacs was linked statically, and was not
! @c linked with the resolver libraries, it wil not be able to get to any
  @c machines off the local network.  This is characterized by being able
  @c to reach someplace with a raw ip number, but not its hostname
  @c (@url{http://129.79.254.191/} works, but
--- 1010,1016 ----
  @c @cindex resolver, hostname
  @c Some C libraries do not include the hostname resolver routines in
  @c their static libraries.  If Emacs was linked statically, and was not
! @c linked with the resolver libraries, it will not be able to get to any
  @c machines off the local network.  This is characterized by being able
  @c to reach someplace with a raw ip number, but not its hostname
  @c (@url{http://129.79.254.191/} works, but
***************
*** 1052,1059 ****
  strings.  The times are in the format returned by @code{current-time}.
  
  @defun url-history-update-url url time
! This function updates the hsitory table with an entry for @var{url}
! accessed at the gievn @var{time}.
  @end defun
  
  @defopt url-history-track
--- 1052,1059 ----
  strings.  The times are in the format returned by @code{current-time}.
  
  @defun url-history-update-url url time
! This function updates the history table with an entry for @var{url}
! accessed at the given @var{time}.
  @end defun
  
  @defopt url-history-track