merge upstream

18 files changed, 113 insertions, 316 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f94db60f25f..7ff13a70718 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,18 @@
+2013-09-04  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
+
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+        * xresources.texi (Motif Resources):
+        Rename from LessTif Resources.  Update xrefs.  (Bug#15145)
+        * emacs.texi: Update menu.
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
 2013-08-17  Xue Fuqiao  <xfq.free@gmail.com>
 
         * text.texi (Enriched Justification): Minor fixes.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 7aeead4e2f6..bf9f8152ad4 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 8a518b82abb..985466810f2 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1189,7 +1189,7 @@ X Options and Resources
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 
 GTK resources
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 553375442d5..4a61db5509b 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1043,12 +1043,14 @@ Ignore a file under current version control system.  (@code{vc-ignore}).
 
 @kindex C-x v G
 @findex vc-ignore
-  Many source trees contain some files that do not need to be versioned,
-such as editor backups, object or bytecode files, and built programs.
-You can simply not add them, but then they’ll always crop up as
-unknown files.  You can also tell the version control system to ignore
-these files by adding them to the ignore file at the top of the tree.
-@kbd{C-x v G} (@code{vc-ignore}) can help you do this.
+  Many source trees contain some files that do not need to be
+versioned, such as editor backups, object or bytecode files, and built
+programs.  You can simply not add them, but then they’ll always crop
+up as unknown files.  You can also tell the version control system to
+ignore these files by adding them to the ignore file at the top of the
+tree.  @kbd{C-x v G} (@code{vc-ignore}) can help you do this.  When
+called with a prefix argument, you can remove a file from the ignored
+file list.
 
 @node VC Directory Mode
 @subsection VC Directory Mode
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 3723c8e5e1d..b2ebf634ba0 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -27,7 +27,7 @@ system registry (@pxref{MS-Windows Registry}).
 * Resources::           Using X resources with Emacs (in general).
 * Table of Resources::  Table of specific X resources that affect Emacs.
 * Lucid Resources::     X resources for Lucid menus.
-* LessTif Resources::   X resources for LessTif and Motif menus.
+* Motif Resources::     X resources for Motif and LessTif menus.
 * GTK resources::       Resources for GTK widgets.
 @end menu
 
@@ -260,7 +260,7 @@ compiled with GTK+ support.
 @ifnottex
 @item @code{selectionFont} (class @code{SelectionFont})
 Font name for pop-up menu items, in non-toolkit versions of Emacs.  (For
-toolkit versions, see @ref{Lucid Resources}, also see @ref{LessTif
+toolkit versions, see @ref{Lucid Resources}, also see @ref{Motif
 Resources}.)
 
 @item @code{selectionTimeout} (class @code{SelectionTimeout})
@@ -370,15 +370,15 @@ elements.  Default is 1.
 Margin of the menu bar, in characters.  Default is 1.
 @end table
 
-@node LessTif Resources
-@appendixsec LessTif Menu X Resources
-@cindex Menu X Resources (LessTif widgets)
-@cindex LessTif Widget X Resources
+@node Motif Resources
+@appendixsec Motif Menu X Resources
+@cindex Menu X Resources (Motif widgets)
+@cindex Motif Widget X Resources
 
-  If Emacs is compiled with the X toolkit support using LessTif or
-Motif widgets, you can use X resources to customize the appearance of
-the menu bar, pop-up menus, and dialog boxes.  However, the resources
-are organized differently from Lucid widgets.
+  If Emacs is compiled with the X toolkit support using Motif or
+LessTif widgets, you can use X resources to customize the appearance
+of the menu bar, pop-up menus, and dialog boxes.  However, the
+resources are organized differently from Lucid widgets.
 
   The resource names for the menu bar are in the @samp{pane.menubar}
 class, and they must be specified in this form:
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index db02a257a3a..ec082eecb52 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,18 @@
+2013-09-01  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (beginning-of-buffer complete):
+        Put back a version of the removed paragraph about raw prefix arg.
+
+2013-09-01  Dani Moncayo  <dmoncayo@gmail.com>
+
+        * emacs-lisp-intro.texi (beginning-of-buffer complete):
+        Update function details.  (Bug#15085)
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
 2013-08-12  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Complete copy-region-as-kill): Fix typo.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index ad1b978f255..363e12215b3 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 18ea8e87e19..84c9d905487 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -6323,7 +6323,7 @@ and avoids clobbering the mark."
                         (/ (+ 10 (* size (prefix-numeric-value arg)))
                            10)))
                  (point-min))))
-  (if arg (forward-line 1)))
+  (if (and arg (not (consp arg))) (forward-line 1)))
 @end group
 @end smallexample
 
@@ -6390,7 +6390,7 @@ to move point to the beginning of the next line if the command is
 invoked with an argument:
 
 @smallexample
-(if arg (forward-line 1)))
+(if (and arg (not (consp arg))) (forward-line 1))
 @end smallexample
 
 @noindent
@@ -6399,14 +6399,10 @@ appropriate tenths position in the buffer.  This is a flourish that
 means that the cursor is always located @emph{at least} the requested
 tenths of the way through the buffer, which is a nicety that is,
 perhaps, not necessary, but which, if it did not occur, would be sure
-to draw complaints.
-
-On the other hand, it also means that if you specify the command with
-a @kbd{C-u}, but without a number, that is to say, if the `raw prefix
-argument' is simply a cons cell, then the command puts you at the
-beginning of the second line @dots{}  I don't know whether this is
-intended or whether no one has dealt with the code to avoid this
-happening.
+to draw complaints.  (The @code{(not (consp arg))} portion is so that
+if you specify the command with a @kbd{C-u}, but without a number,
+that is to say, if the `raw prefix argument' is simply a cons cell,
+the command does not put you at the beginning of the second line.)
 
 @node Second Buffer Related Review
 @section Review
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d27f58c0efa..145d595b1d2 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,13 @@
+2013-09-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * macros.texi (Defining Macros): Prefer "function" to "lambda
+        expression" (bug#15296).
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
 2013-08-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * variables.texi (File Local Variables): Don't recommend quoting!  Ever!
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index c7aa5ac1a28..164646ac433 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # NB If you add any more configure variables,
 # update the sed rules in the dist target below.
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 5520bbbd1df..a2526f383aa 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -191,8 +191,8 @@ During Compile}).
 @section Defining Macros
 
   A Lisp macro object is a list whose @sc{car} is @code{macro}, and
-whose @sc{cdr} is a lambda expression.  Expansion of the macro works
-by applying the lambda expression (with @code{apply}) to the list of
+whose @sc{cdr} is a function.  Expansion of the macro works
+by applying the function (with @code{apply}) to the list of
 @emph{unevaluated} arguments from the macro call.
 
   It is possible to use an anonymous Lisp macro just like an anonymous
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8b550dc4417..0235b5f7b9b 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-31  Ulrich Müller  <ulm@gentoo.org>
+
+        * emacs.1: Update manual links.
+
 2013-04-20  Petr Hracek  <phracek@redhat.com>  (tiny change)
 
         * emacs.1: Add some more command-line options.  (Bug#14165)
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 9149be2c523..a306edc3ca9 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -445,7 +445,7 @@ Gives frames menu bars if
 .IR on ;
 don't have menu bars if
 .IR off .
-See the Emacs manual, sections "Lucid Resources" and "LessTif
+See the Emacs manual, sections "Lucid Resources" and "Motif
 Resources", for how to control the appearance of the menu bar
 if you have one.
 .TP
@@ -492,7 +492,7 @@ The scroll bar width in pixels, equivalent to the frame parameter
 Font name for pop-up menu items, in non-toolkit versions of
 .IR Emacs .
 (For toolkit versions, see the Emacs manual, sections
-"Lucid Resources" and "LessTif Resources".)
+"Lucid Resources" and "Motif Resources".)
 .TP
 .BR selectionTimeout " (class " SelectionTimeout )
 Number of milliseconds to wait for a selection reply.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ca620a15b4f..e3ad5688f22 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,27 @@
+2013-09-08  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-gnutls.texi: Tweak direntry.
+
+2013-09-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Alternative Syntax): Remove chapter.
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Try to reduce redundancy in doc/misc/Makefile.in.
+        * Makefile.in (DOCMISC_W32): New var to replace DOCMISC_*_W32.
+        (TARGETS): New intermediate variable.
+        (DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS): Use it.
+
 2013-08-27  Glenn Morris  <rgm@gnu.org>
 
+        * efaq.texi (Emacs for MS-Windows): Update location of MS FAQ.
+
         * efaq.texi: Rename from faq.texi, to match its output files.
         * Makefile.in: Update for faq.texi name change.
 
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 0ae1edf7069..30fc4953172 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # Where to find the source code.  $(srcdir) will be the man-aux
 # subdirectory of the source tree.  This is
@@ -60,11 +60,7 @@ MAKEINFO = @MAKEINFO@
 MAKEINFO_OPTS = --force -I$(emacsdir)
 
 ## On MS Windows, efaq-w32; otherwise blank.
-DOCMISC_DVI_W32 = @DOCMISC_DVI_W32@
-DOCMISC_HTML_W32 = @DOCMISC_HTML_W32@
-DOCMISC_INFO_W32 = @DOCMISC_INFO_W32@
-DOCMISC_PDF_W32 = @DOCMISC_PDF_W32@
-DOCMISC_PS_W32 = @DOCMISC_PS_W32@
+DOCMISC_W32 = @DOCMISC_W32@
 
 ## Info files to build and install on all platforms.
 INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
@@ -84,237 +80,15 @@ INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
 ## because the info files are pre-built in release tarfiles.
 INFO_TARGETS = $(INFO_COMMON) efaq-w32
 
-DVI_TARGETS = $(DOCMISC_DVI_W32) \
-        ada-mode.dvi \
-        auth.dvi \
-        autotype.dvi \
-        bovine.dvi \
-        calc.dvi \
-        cc-mode.dvi \
-        cl.dvi \
-        dbus.dvi \
-        dired-x.dvi \
-        ebrowse.dvi \
-        ede.dvi \
-        ediff.dvi \
-        edt.dvi \
-        efaq.dvi \
-        eieio.dvi \
-        emacs-mime.dvi \
-        epa.dvi \
-        erc.dvi \
-        ert.dvi \
-        eshell.dvi \
-        eudc.dvi \
-        flymake.dvi \
-        forms.dvi \
-        gnus.dvi \
-        emacs-gnutls.dvi \
-        htmlfontify.dvi \
-        idlwave.dvi \
-        ido.dvi \
-        info.dvi \
-        mairix-el.dvi \
-        message.dvi \
-        mh-e.dvi \
-        newsticker.dvi \
-        nxml-mode.dvi \
-        org.dvi \
-        pcl-cvs.dvi \
-        pgg.dvi \
-        rcirc.dvi \
-        reftex.dvi \
-        remember.dvi \
-        sasl.dvi \
-        sc.dvi \
-        semantic.dvi \
-        ses.dvi \
-        sieve.dvi \
-        smtpmail.dvi \
-        speedbar.dvi \
-        srecode.dvi \
-        todo-mode.dvi \
-        tramp.dvi \
-        url.dvi \
-        vip.dvi \
-        viper.dvi \
-        widget.dvi \
-        wisent.dvi \
-        woman.dvi
-
-HTML_TARGETS = $(DOCMISC_HTML_W32) \
-        ada-mode.html \
-        auth.html \
-        autotype.html \
-        bovine.html \
-        calc.html \
-        cc-mode.html \
-        cl.html \
-        dbus.html \
-        dired-x.html \
-        ebrowse.html \
-        ede.html \
-        ediff.html \
-        edt.html \
-        efaq.html \
-        eieio.html \
-        emacs-mime.html \
-        epa.html \
-        erc.html \
-        ert.html \
-        eshell.html \
-        eudc.html \
-        flymake.html \
-        forms.html \
-        gnus.html \
-        emacs-gnutls.html \
-        htmlfontify.html \
-        idlwave.html \
-        ido.html \
-        info.html \
-        mairix-el.html \
-        message.html \
-        mh-e.html \
-        newsticker.html \
-        nxml-mode.html \
-        org.html \
-        pcl-cvs.html \
-        pgg.html \
-        rcirc.html \
-        reftex.html \
-        remember.html \
-        sasl.html \
-        sc.html \
-        semantic.html \
-        ses.html \
-        sieve.html \
-        smtpmail.html \
-        speedbar.html \
-        srecode.html \
-        todo-mode.html \
-        tramp.html \
-        url.html \
-        vip.html \
-        viper.html \
-        widget.html \
-        wisent.html \
-        woman.html
-
-PDF_TARGETS = $(DOCMISC_PDF_W32) \
-        ada-mode.pdf \
-        auth.pdf \
-        autotype.pdf \
-        bovine.pdf \
-        calc.pdf \
-        cc-mode.pdf \
-        cl.pdf \
-        dbus.pdf \
-        dired-x.pdf \
-        ebrowse.pdf \
-        ede.pdf \
-        ediff.pdf \
-        edt.pdf \
-        efaq.pdf \
-        eieio.pdf \
-        emacs-mime.pdf \
-        epa.pdf \
-        erc.pdf \
-        ert.pdf \
-        eshell.pdf \
-        eudc.pdf \
-        flymake.pdf \
-        forms.pdf \
-        gnus.pdf \
-        htmlfontify.pdf \
-        emacs-gnutls.pdf \
-        idlwave.pdf \
-        ido.pdf \
-        info.pdf \
-        mairix-el.pdf \
-        message.pdf \
-        mh-e.pdf \
-        newsticker.pdf \
-        nxml-mode.pdf \
-        org.pdf \
-        pcl-cvs.pdf \
-        pgg.pdf \
-        rcirc.pdf \
-        reftex.pdf \
-        remember.pdf \
-        sasl.pdf \
-        sc.pdf \
-        semantic.pdf \
-        ses.pdf \
-        sieve.pdf \
-        smtpmail.pdf \
-        speedbar.pdf \
-        srecode.pdf \
-        todo-mode.pdf \
-        tramp.pdf \
-        url.pdf \
-        vip.pdf \
-        viper.pdf \
-        widget.pdf \
-        wisent.pdf \
-        woman.pdf
-
-PS_TARGETS = $(DOCMISC_PS_W32) \
-        ada-mode.ps \
-        auth.ps \
-        autotype.ps \
-        bovine.ps \
-        calc.ps \
-        cc-mode.ps \
-        cl.ps \
-        dbus.ps \
-        dired-x.ps \
-        ebrowse.ps \
-        ede.ps \
-        ediff.ps \
-        edt.ps \
-        efaq.ps \
-        eieio.ps \
-        emacs-mime.ps \
-        epa.ps \
-        erc.ps \
-        ert.ps \
-        eshell.ps \
-        eudc.ps \
-        flymake.ps \
-        forms.ps \
-        gnus.ps \
-        htmlfontify.ps \
-        emacs-gnutls.ps \
-        idlwave.ps \
-        ido.ps \
-        info.ps \
-        mairix-el.ps \
-        message.ps \
-        mh-e.ps \
-        newsticker.ps \
-        nxml-mode.ps \
-        org.ps \
-        pcl-cvs.ps \
-        pgg.ps \
-        rcirc.ps \
-        reftex.ps \
-        remember.ps \
-        sasl.ps \
-        sc.ps \
-        semantic.ps \
-        ses.ps \
-        sieve.ps \
-        smtpmail.ps \
-        speedbar.ps \
-        srecode.ps \
-        todo-mode.ps \
-        tramp.ps \
-        url.ps \
-        vip.ps \
-        viper.ps \
-        widget.ps \
-        wisent.ps \
-        woman.ps
+# There are some naming differences between the info targets and the other
+# targets, so let's resolve them here.
+TARGETS_1 = $(INFO_INSTALL:ccmode=cc-mode)
+TARGETS = $(TARGETS_1:info.info=info)
+
+DVI_TARGETS  = $(TARGETS:=.dvi)
+HTML_TARGETS = $(TARGETS:=.html)
+PDF_TARGETS  = $(TARGETS:=.pdf)
+PS_TARGETS   = $(TARGETS:=.ps)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 1354f68cc9f..54e067d65bd 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -3452,8 +3452,9 @@ lack certain features, such as the Emacs Lisp extension language.
 @cindex Emacs for MS-Windows
 @cindex Microsoft Windows, Emacs for
 
-There is a @uref{http://www.gnu.org/software/emacs/windows/ntemacs.html,
-separate FAQ} for Emacs on MS-Windows.  For MS-DOS, @pxref{Emacs for MS-DOS}.
+There is a separate FAQ for Emacs on MS-Windows,
+@pxref{Top,,,efaq-w32,FAQ for Emacs on MS Windows}.
+For MS-DOS, @pxref{Emacs for MS-DOS}.
 
 
 @node Emacs for GNUstep
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 740dfee41ed..b1c4c13c5ff 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -25,7 +25,7 @@ modify this GNU manual.''
 
 @dircategory Emacs network features
 @direntry
-* GnuTLS: (emacs-gnutls).       The Emacs GnuTLS integration.
+* Emacs GnuTLS: (emacs-gnutls). The Emacs GnuTLS integration.
 @end direntry
 
 @titlepage
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 03c6da3b73f..aa4cea58f04 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -225,7 +225,6 @@ Configuring @value{tramp} for use
 Using @value{tramp}
 
 * Filename Syntax::             @value{tramp} filename conventions.
-* Alternative Syntax::          URL-like filename syntax.
 * Filename completion::         Filename completion.
 * Ad-hoc multi-hops::           Declaring multiple hops in the file name.
 * Remote processes::            Integration with other @value{emacsname} packages.
@@ -2356,7 +2355,6 @@ minute you have already forgotten that you hit that key!
 
 @menu
 * Filename Syntax::             @value{tramp} filename conventions.
-* Alternative Syntax::          URL-like filename syntax.
 * Filename completion::         Filename completion.
 * Ad-hoc multi-hops::           Declaring multiple hops in the file name.
 * Remote processes::            Integration with other @value{emacsname} packages.
@@ -2453,46 +2451,6 @@ by adding @file{#<port>} to the host name, like in @file{@trampfn{ssh,
 daniel, melancholia#42, .emacs}}.
 
 
-@node Alternative Syntax
-@section URL-like filename syntax
-@cindex filename syntax
-@cindex filename examples
-
-Additionally to the syntax described in the previous chapter, it is
-possible to use a URL-like syntax for @value{tramp}.  This can be
-switched on by customizing the variable @code{tramp-syntax}.  Please
-note that this feature is experimental for the time being.
-
-The variable @code{tramp-syntax} must be set before requiring @value{tramp}:
-
-@lisp
-(setq tramp-syntax 'url)
-(require 'tramp)
-@end lisp
-
-Then, a @value{tramp} filename would look like this:
-@file{/@var{method}://@var{user}@@@var{machine}:@var{port}/@var{path/to.file}}.
-@file{/@var{method}://} is mandatory, all other parts are optional.
-@file{:@var{port}} is useful for methods only who support this.
-
-The last example from the previous section would look like this:
-@file{/ssh://daniel@@melancholia/.emacs}.
-
-For the time being, @code{tramp-syntax} can have the following values:
-
-@itemize @w{}
-@ifset emacs
-@item @code{ftp}---That is the default syntax
-@item @code{url}---URL-like syntax
-@end ifset
-@ifset xemacs
-@item @code{sep}---That is the default syntax
-@item @code{url}---URL-like syntax
-@item @code{ftp}---EFS-like syntax
-@end ifset
-@end itemize
-
-
 @node Filename completion
 @section Filename completion
 @cindex filename completion