Dual-life perlglossary.pod as part of perlfaq

diff --git a/MANIFEST b/MANIFEST
index ad38262..aa7e9fd 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1867,6 +1867,7 @@ cpan/perlfaq/lib/perlfaq8.pod     System Interaction
 cpan/perlfaq/lib/perlfaq9.pod  Networking
 cpan/perlfaq/lib/perlfaq.pm    Perl frequently asked questions
 cpan/perlfaq/lib/perlfaq.pod   Perl frequently asked questions
+cpan/perlfaq/lib/perlglossary.pod      Perl Glossary
 cpan/PerlIO-via-QuotedPrint/lib/PerlIO/via/QuotedPrint.pm      PerlIO::via::QuotedPrint
 cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t                    PerlIO::via::QuotedPrint
 cpan/Perl-OSType/lib/Perl/OSType.pm                    Perl::OSType
@@ -4486,7 +4487,6 @@ pod/perlfork.pod          Perl fork() information
 pod/perlform.pod               Perl formats
 pod/perlfunc.pod               Perl built-in functions
 pod/perlgit.pod                        Using git with the Perl repository
-pod/perlglossary.pod           Perl Glossary
 pod/perlgpl.pod                        GNU General Public License
 pod/perlguts.pod               Perl internal functions for those doing extensions
 pod/perlhack.pod               Perl hackers guide

diff --git a/pod/perlglossary.pod b/cpan/perlfaq/lib/perlglossary.pod
similarity index 100%
rename from pod/perlglossary.pod
rename to cpan/perlfaq/lib/perlglossary.pod

diff --git a/lib/.gitignore b/lib/.gitignore
index 5998e45..87149de 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -397,6 +397,7 @@
 /parent.pm
 /perldoc.pod
 /perlfaq*
+/perlglossary.pod
 /perlxs.pod
 /perlxstut.pod
 /re.pm

diff --git a/pod.lst b/pod.lst
index 7a5926f..1e60c79 100644 (file)
--- a/pod.lst
+++ b/pod.lst
@@ -98,7 +98,7 @@ g perlmodlib          Perl modules: how to write and use
 
   perldtrace           Perl's support for DTrace
 
-  perlglossary         Perl Glossary
+  cpan/perlfaq/lib/perlglossary                Perl Glossary
 
 h Internals and C Language Interface
 

diff --git a/win32/pod.mak b/win32/pod.mak
index fa9f784..fac6afe 100644 (file)
--- a/win32/pod.mak
+++ b/win32/pod.mak
@@ -72,7 +72,6 @@ POD = perl.pod        \
        perlform.pod    \
        perlfunc.pod    \
        perlgit.pod     \
-       perlglossary.pod        \
        perlgpl.pod     \
        perlguts.pod    \
        perlhack.pod    \
@@ -195,7 +194,6 @@ MAN = perl.man      \
        perlform.man    \
        perlfunc.man    \
        perlgit.man     \
-       perlglossary.man        \
        perlgpl.man     \
        perlguts.man    \
        perlhack.man    \
@@ -318,7 +316,6 @@ HTML = perl.html    \
        perlform.html   \
        perlfunc.html   \
        perlgit.html    \
-       perlglossary.html       \
        perlgpl.html    \
        perlguts.html   \
        perlhack.html   \
@@ -441,7 +438,6 @@ TEX = perl.tex      \
        perlform.tex    \
        perlfunc.tex    \
        perlgit.tex     \
-       perlglossary.tex        \
        perlgpl.tex     \
        perlguts.tex    \
        perlhack.tex    \