Author: stas Date: Fri Nov 19 21:23:25 2004 New Revision: 105935 Modified: perl/modperl/docs/trunk/lib/DocSet/Config.pm perl/modperl/docs/trunk/src/config.cfg perl/modperl/docs/trunk/src/docs/1.0/guide/config.cfg perl/modperl/docs/trunk/src/docs/2.0/devel/config.cfg perl/modperl/docs/trunk/src/docs/2.0/user/config.cfg perl/modperl/docs/trunk/src/search/swish.conf Log: - inherit the parent 'copy_skip' attribute if not set in the child - revert the change adding copy_skip to sub-trees
Modified: perl/modperl/docs/trunk/lib/DocSet/Config.pm ============================================================================== --- perl/modperl/docs/trunk/lib/DocSet/Config.pm (original) +++ perl/modperl/docs/trunk/lib/DocSet/Config.pm Fri Nov 19 21:23:25 2004 @@ -221,6 +221,8 @@ : '.'; } + # inherit the 'copy_skip' attribute if not set in the child + $self->{copy_skip} ||= $parent_o->{copy_skip} || []; } Modified: perl/modperl/docs/trunk/src/config.cfg ============================================================================== --- perl/modperl/docs/trunk/src/config.cfg (original) +++ perl/modperl/docs/trunk/src/config.cfg Fri Nov 19 21:23:25 2004 @@ -76,7 +76,7 @@ copy_skip => [ '(?:^|\/)\.svn(?:\/|$)', # skip svn control files - '#|~', # skip emacs backup files + '#|~', # skip emacs backup files ], dir => { @@ -98,7 +98,7 @@ # search path for pods, etc. must put more specific paths first! search_paths => [qw( docs/2.0/api - docs/2.0 + docs/2.0 docs/1.0/api docs/1.0 docs Modified: perl/modperl/docs/trunk/src/docs/1.0/guide/config.cfg ============================================================================== --- perl/modperl/docs/trunk/src/docs/1.0/guide/config.cfg (original) +++ perl/modperl/docs/trunk/src/docs/1.0/guide/config.cfg Fri Nov 19 21:23:25 2004 @@ -48,8 +48,4 @@ code )], - copy_skip => [ - '\.svn', - ], - ); Modified: perl/modperl/docs/trunk/src/docs/2.0/devel/config.cfg ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/devel/config.cfg (original) +++ perl/modperl/docs/trunk/src/docs/2.0/devel/config.cfg Fri Nov 19 21:23:25 2004 @@ -46,8 +46,4 @@ debug/code )], - copy_skip => [ - '\.svn', - ], - ); Modified: perl/modperl/docs/trunk/src/docs/2.0/user/config.cfg ============================================================================== --- perl/modperl/docs/trunk/src/docs/2.0/user/config.cfg (original) +++ perl/modperl/docs/trunk/src/docs/2.0/user/config.cfg Fri Nov 19 21:23:25 2004 @@ -62,10 +62,6 @@ handlers/*.jpg )], - copy_skip => [ - '\.svn', - ], - changes => 'Changes.pod', ); Modified: perl/modperl/docs/trunk/src/search/swish.conf ============================================================================== --- perl/modperl/docs/trunk/src/search/swish.conf (original) +++ perl/modperl/docs/trunk/src/search/swish.conf Fri Nov 19 21:23:25 2004 @@ -18,3 +18,6 @@ IgnoreFirstChar _:- IgnoreLastChar _:- +BuzzWords $/ $\ $| $? $! $@ $$ $< $> $( $) $0 $[ $] $^C $^I $^M $^S $^T $^V $^W $^X @_ $c $r $s +IgnoreFirstChar \"' +IgnoreLastChar .,;"'\ \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]