urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the setup automator create YAML formatted files.

master
Joey Hess 2011-11-06 16:01:50 -04:00
parent bf8b3bc12a
commit 67b2beb1b0
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Setup/Automator.pm
View File

@ -38,7 +38,7 @@ sub sanitize_wikiname ($) {
sub import (@) { sub import (@) {
my $this=shift; my $this=shift;
$config{setuptype}='Standard'; $config{setuptype}='Yaml';
IkiWiki::Setup::merge({@_}); IkiWiki::Setup::merge({@_});
if (! $config{force_overwrite}) { if (! $config{force_overwrite}) {

1
debian/changelog vendored
View File

@ -6,6 +6,7 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low
subdirectory. subdirectory.
* rst: import docutils lazily, to avoid errors during ikiwiki --setup. * rst: import docutils lazily, to avoid errors during ikiwiki --setup.
Closes: #637604 (Thanks, smcv) Closes: #637604 (Thanks, smcv)
* Make the setup automator create YAML formatted files.
-- Joey Hess <joeyh@debian.org> Tue, 27 Sep 2011 10:47:13 -0400 -- Joey Hess <joeyh@debian.org> Tue, 27 Sep 2011 10:47:13 -0400

2
doc/todo/Auto-setup_should_default_to_YAML.mdwn
View File

@ -1 +1,3 @@
I think that the auto-generated setup files generated by /etc/ikiwiki/*.setup should be created in the new YAML format. I think that the auto-generated setup files generated by /etc/ikiwiki/*.setup should be created in the new YAML format.
> Ah, I missed that. [[done]] --[[Joey]]