diff options
| author | Joey Hess <joey@kitenet.net> | 2011-11-06 16:01:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-06 16:01:50 -0400 |
| commit | 67b2beb1b00ea5c82446533edab07cc6e9e18876 (patch) | |
| tree | b522bb30b9cfb22bed4397c309d87855594d3648 | |
| parent | bf8b3bc12abe9d763329a191bdb152b30978d2ef (diff) | |
| download | ikiwiki-67b2beb1b00ea5c82446533edab07cc6e9e18876.tar ikiwiki-67b2beb1b00ea5c82446533edab07cc6e9e18876.tar.gz | |
Make the setup automator create YAML formatted files.
| -rw-r--r-- | IkiWiki/Setup/Automator.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/todo/Auto-setup_should_default_to_YAML.mdwn | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 2dcb424e5..671438710 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -38,7 +38,7 @@ sub sanitize_wikiname ($) { sub import (@) { my $this=shift; - $config{setuptype}='Standard'; + $config{setuptype}='Yaml'; IkiWiki::Setup::merge({@_}); if (! $config{force_overwrite}) { diff --git a/debian/changelog b/debian/changelog index 7f1888198..647a03f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.20110906) UNRELEASED; urgency=low subdirectory. * rst: import docutils lazily, to avoid errors during ikiwiki --setup. 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 diff --git a/doc/todo/Auto-setup_should_default_to_YAML.mdwn b/doc/todo/Auto-setup_should_default_to_YAML.mdwn index 272d85d84..05fba7eac 100644 --- a/doc/todo/Auto-setup_should_default_to_YAML.mdwn +++ b/doc/todo/Auto-setup_should_default_to_YAML.mdwn @@ -1 +1,3 @@ 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]] |