summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Ragwitz <rafl@debian.org>2011-09-26 18:53:55 +0200
committerFlorian Ragwitz <rafl@debian.org>2011-09-26 19:00:48 +0200
commit83083feaedd84cf12545b4f5b0a7b037c12236ee (patch)
tree5948cfce44f8b0ed1af4c9bf3333fc53ef77b4e1
parent8721516917ee7d8753a6aca258690cd7fe1e3d5a (diff)
downloadperl-83083feaedd84cf12545b4f5b0a7b037c12236ee.tar.gz
Dual-life perlglossary.pod as part of perlfaq
-rw-r--r--MANIFEST2
-rw-r--r--cpan/perlfaq/lib/perlglossary.pod (renamed from pod/perlglossary.pod)0
-rw-r--r--lib/.gitignore1
-rw-r--r--pod.lst2
-rw-r--r--win32/pod.mak4
5 files changed, 3 insertions, 6 deletions
diff --git a/MANIFEST b/MANIFEST
index ad38262ce7..aa7e9fdae9 100644
--- 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
index 014eb99fd5..014eb99fd5 100644
--- a/pod/perlglossary.pod
+++ b/cpan/perlfaq/lib/perlglossary.pod
diff --git a/lib/.gitignore b/lib/.gitignore
index 5998e457cd..87149deb2b 100644
--- 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 7a5926f214..1e60c7901c 100644
--- 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 fa9f784457..fac6afe453 100644
--- 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 \