Integrate changes #8738,8739,8740 from maintperl.

Html files will be installed in a more logical and easier to
find directory. E.g. c:\perl\html instead of c:\perl\lib\pod\html

Html files will be generated with a header to make them look
a little less bare.

Subject: [PATCH perl-current] perlfaq3.pod, URL for vile

p4raw-link: @8740 on //depot/maint-5.6/perl: 01ae74d95ca12ccb961a994014b2e5e455604c83
p4raw-link: @8739 on //depot/maint-5.6/perl: 38f8eb688a5555e387bd9b926e4f0ae9b4016c57
p4raw-link: @8738 on //depot/maint-5.6/perl: 5c7c21200212f683312f32fb0820ee00445bda8f

p4raw-id: //depot/perl@8741
p4raw-integrated: from //depot/maint-5.6/perl@8737 'copy in'
	pod/perlfaq3.pod (@8546..) 'merge in' installhtml (@7895..)
	win32/Makefile win32/makefile.mk (@8732..)

diff --git a/installhtml b/installhtml
index b5406c5..4bbaba9 100755 (executable)
--- a/installhtml
+++ b/installhtml
@@ -601,6 +601,7 @@ sub runpod2html {
        "--htmlroot=$htmlroot",
        "--podpath=".join(":", @podpath),
        "--podroot=$podroot", "--netscape",
+       "--header",
        ($doindex ? "--index" : "--noindex"),
        "--" . ($recurse ? "" : "no") . "recurse",
        ($#libpods >= 0) ? "--libpods=" . join(":", @libpods) : "",

diff --git a/pod/perlfaq3.pod b/pod/perlfaq3.pod
index 3840a85..7b64801 100644 (file)
--- a/pod/perlfaq3.pod
+++ b/pod/perlfaq3.pod
@@ -187,8 +187,8 @@ For Windows editors: you can download GNU Emacs
 (http://www.gnu.org/software/emacs/windows/ntemacs.html) or XEmacs
 (http://www.xemacs.org/Download/index.html), or a vi clone such as
 Elvis (ftp://ftp.cs.pdx.edu/pub/elvis/, http://www.fh-wedel.de/elvis/),
-Vile (http://www.clark.net/pub/dickey/vile/vile.html), or
-Vim (http://www.vim.org/) (win32: http://www.cs.vu.nl/%7Etmgil/vi.html).
+Vile (http://vile.cx), or Vim (http://www.vim.org/)
+(win32: http://www.cs.vu.nl/%7Etmgil/vi.html).
 For vi lovers in general, Windows or elsewhere:
 http://www.thomer.com/thomer/vi/vi.html.
 
@@ -198,7 +198,7 @@ UNIX platforms you might be interested in trying it out, firstly because
 strictly speaking it is not a vi clone, it is the real vi, or the new
 incarnation of it, and secondly because you can embed Perl inside it
 to use Perl as the scripting language.  nvi is not alone in this,
-though: at least also vim offers an embedded Perl.
+though: at least also vim and vile offer an embedded Perl.
 
 The following are Win32 multilanguage editor/IDESs that support Perl: 
 Codewright (http://www.starbase.com/), MultiEdit (http://www.MultiEdit.com/),

diff --git a/win32/Makefile b/win32/Makefile
index 49edc1b..9049099 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -323,7 +323,7 @@ INST_LIB    = $(INST_TOP)$(INST_VER)\lib
 INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
 INST_COREDIR   = $(INST_ARCHLIB)\CORE
 INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
+INST_HTML      = $(INST_TOP)$(INST_VER)\html
 
 #
 # Programs to compile, build .lib files and link

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 5a4a738..5c21ebb 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -325,7 +325,7 @@ INST_LIB    = $(INST_TOP)$(INST_VER)\lib
 INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
 INST_COREDIR   = $(INST_ARCHLIB)\CORE
 INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
+INST_HTML      = $(INST_TOP)$(INST_VER)\html
 
 #
 # Programs to compile, build .lib files and link