[Emacs-diffs] Changes to emacs/lisp/url/url-vars.el

[Simon Josefsson]

Index: emacs/lisp/url/url-vars.el
diff -c emacs/lisp/url/url-vars.el:1.5 emacs/lisp/url/url-vars.el:1.6
*** emacs/lisp/url/url-vars.el:1.5      Sun Oct 10 20:39:48 2004
--- emacs/lisp/url/url-vars.el  Tue Oct 12 09:55:08 2004
***************
*** 2,8 ****
  ;; Keywords: comm, data, processes, hypermedia
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;;; Copyright (c) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
  ;;;
  ;;; This file is part of GNU Emacs.
  ;;;
--- 2,8 ----
  ;; Keywords: comm, data, processes, hypermedia
  
  
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc.
  ;;;
  ;;; This file is part of GNU Emacs.
  ;;;
***************
*** 368,379 ****
  `telnet': Run telnet in a subprocess to connect;
  `rlogin': Rlogin to another machine to connect;
  `socks': Connect through a socks server;
! `ssl': Connect with SSL;
  `native': Connect directy."
    :type '(radio (const :tag "Telnet to gateway host" :value telnet)
                (const :tag "Rlogin to gateway host" :value rlogin)
                (const :tag "Use SOCKS proxy" :value socks)
!               (const :tag "Use SSL for all connections" :value ssl)
                (const :tag "Direct connection" :value native))
    :group 'url-hairy)
  
--- 368,381 ----
  `telnet': Run telnet in a subprocess to connect;
  `rlogin': Rlogin to another machine to connect;
  `socks': Connect through a socks server;
! `tls': Connect with TLS;
! `ssl': Connect with SSL (deprecated, use `tls' instead);
  `native': Connect directy."
    :type '(radio (const :tag "Telnet to gateway host" :value telnet)
                (const :tag "Rlogin to gateway host" :value rlogin)
                (const :tag "Use SOCKS proxy" :value socks)
!               (const :tag "Use SSL/TLS for all connections" :value tls)
!               (const :tag "Use SSL for all connections (obsolete)" :value ssl)
                (const :tag "Direct connection" :value native))
    :group 'url-hairy)