From 52d4a465a8cafe5b2a09647ff117ad4d425840ce Mon Sep 17 00:00:00 2001 From: drbrain Date: Tue, 11 Dec 2012 07:57:56 +0000 Subject: [PATCH] * common.mk: Added --pages-dir to rdoc creation. Now doc/ items show up at top-level. * .document: Moved doc/* entries to doc/.document * doc/.document: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- .document | 5 +---- ChangeLog | 7 +++++++ common.mk | 2 +- doc/.document | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 doc/.document diff --git a/.document b/.document index 3df33a8eed..f955928c89 100644 --- a/.document +++ b/.document @@ -28,7 +28,4 @@ README.EXT README.EXT.ja README.ja -doc/*.rdoc -doc/ChangeLog* -doc/NEWS-* - +doc diff --git a/ChangeLog b/ChangeLog index 23e4a0430c..26e6fb51a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 11 16:57:33 2012 Eric Hodel + + * common.mk: Added --pages-dir to rdoc creation. Now doc/ items show + up at top-level. + * .document: Moved doc/* entries to doc/.document + * doc/.document: ditto + Tue Dec 11 16:44:37 2012 Eric Hodel * lib/rdoc/options.rb: Added --page-dir option for moving pages in diff --git a/common.mk b/common.mk index b552ae7f3c..db7672f49f 100644 --- a/common.mk +++ b/common.mk @@ -408,7 +408,7 @@ post-install-doc:: rdoc: PHONY main @echo Generating RDoc documentation - $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)" + $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)" rdoc-coverage: PHONY main @echo Generating RDoc coverage report diff --git a/doc/.document b/doc/.document new file mode 100644 index 0000000000..bf03a6d956 --- /dev/null +++ b/doc/.document @@ -0,0 +1,3 @@ +*.rdoc +ChangeLog* +NEWS-*