rename

diff --git a/Makefile.PL b/Makefile.PL
index 04ed70502876024c205d8e2f2141b792ced2b0e7..a805f41a244ec1d473b0e626ad04940ab608eab5 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ extra_clean:
 extra_install:
        install -d $(DESTDIR)/etc/ikiwiki
        install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
-       install -m 0644 simple.setup $(DESTDIR)/etc/ikiwiki
+       install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
 
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
        for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \

diff --git a/simple.setup b/auto.setup
similarity index 98%
rename from simple.setup
rename to auto.setup
index 60934b5f66677af3bed4a9ff9aee15691ae514be..38514d5549f24e8cca6e37422637937c9e4302dc 100644 (file)
--- a/simple.setup
+++ b/auto.setup
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Simple ikiwiki setup.
+# Ikiwiki setup automator.
 # 
 # This setup file causes ikiwiki to create a wiki, check it into revision
 # control, generate a setup file for the new wiki, and set everything up.
@@ -40,4 +40,4 @@ IkiWiki::Setup::Automator->import(
        syslog => 1,
        prefix_directives => 1,
        hardlink => 1,
-);
+)

diff --git a/debian/changelog b/debian/changelog
index 865544786ae7f91e44b3db8f1eac0d6392ce2b9e..7b4bc42156d94d11ea1590fda10f383676fc01b7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ikiwiki (2.60) UNRELEASED; urgency=low
  
-  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/simple.setup"
+  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
     can be used set up a new wiki in seconds.
   * Add getsetup hook, all plugins that add fields to %config should use it.
   * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 09ca550384f90f59466e1acbd0d2bdc49707f2a2..2989485f9af926d6c91688a91e6612dec214dc97 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -12,7 +12,7 @@ If you're not, see the [[download]] and [[install]] pages.
 If you'd like to set up a wiki now, and learn more later, just run this command
 and answer a couple of questions.
 
-       % ikiwiki -setup /etc/ikiwiki/simple.setup
+       % ikiwiki -setup /etc/ikiwiki/auto.setup
        What will the wiki be named? mywiki
        What revision control system to use? git
        What wiki user (or openid) will be wiki admin? joey