merge upstream

5 files changed, 37 insertions, 282 deletions

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