Merge branch 'master' of git.buetow.org:/git/photoalbum

3 files changed, 14 insertions, 26 deletions

diff --git a/docs/photoalbum.1 b/docs/photoalbum.1
index c518477..70c217d 100644
--- a/docs/photoalbum.1
+++ b/docs/photoalbum.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PHOTOALBUM 1"
-.TH PHOTOALBUM 1 "2014-02-16" "photoalbum 0.3.0" "User Commands"
+.TH PHOTOALBUM 1 "2014-05-13" "photoalbum 0.4.1" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -133,30 +133,26 @@
 photoalbum \- photoalbum is a minimal bash script for linux to generate static web photo albums.
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-photoalbum clean|init|version|generate|all [rcfile]
+photoalbum clean|version|generate [rcfile]
+photoalbum makemake
 .IP "clean" 4
 .IX Item "clean"
 Cleans up the working space
-.IP "init" 4
-.IX Item "init"
-Initializes the working space
 .IP "version" 4
 .IX Item "version"
 Prints out the version
 .IP "generate" 4
 .IX Item "generate"
 Generates the static photoalbum
-.IP "all" 4
-.IX Item "all"
-This just runs 'clean init generate' right after another.
+.IP "makemake" 4
+.IX Item "makemake"
+Creates a Makefile and photoalbumrc in the current working directory.
 .SS "\s-1RCFILE\s0"
 .IX Subsection "RCFILE"
 .SS "\s-1TUTORIAL\s0"
 .IX Subsection "TUTORIAL"
 * See if /etc/default/photoalbum fits your needs. If not, copy /etc/default/photoalbum to ~/.photoalbumrc in order to customize it.
 .PP
-* Run 'photoalbum init'
-.PP
 * Copy all images wanted to the incoming folder (see config file)
 .PP
 * Run 'photoalbum generate'
diff --git a/docs/photoalbum.pod b/docs/photoalbum.pod
index 791de48..242860f 100644
--- a/docs/photoalbum.pod
+++ b/docs/photoalbum.pod
@@ -4,7 +4,8 @@ photoalbum - photoalbum is a minimal bash script for linux to generate static we
 
 =head1 SYNOPSIS
 
-photoalbum clean|init|version|generate|all [rcfile]
+photoalbum clean|version|generate [rcfile]
+photoalbum makemake
 
 =over
 
@@ -12,10 +13,6 @@ photoalbum clean|init|version|generate|all [rcfile]
 
 Cleans up the working space
 
-=item init
-
-Initializes the working space
-
 =item version
 
 Prints out the version
@@ -24,9 +21,9 @@ Prints out the version
 
 Generates the static photoalbum
 
-=item all
+=item makemake
 
-This just runs 'clean init generate' right after another.
+Creates a Makefile and photoalbumrc in the current working directory.
 
 =back
 
@@ -36,8 +33,6 @@ This just runs 'clean init generate' right after another.
 
 * See if /etc/default/photoalbum fits your needs. If not, copy /etc/default/photoalbum to ~/.photoalbumrc in order to customize it.
 
-* Run 'photoalbum init'
-
 * Copy all images wanted to the incoming folder (see config file)
 
 * Run 'photoalbum generate'
diff --git a/docs/photoalbum.txt b/docs/photoalbum.txt
index fbb2d32..093e3a4 100644
--- a/docs/photoalbum.txt
+++ b/docs/photoalbum.txt
@@ -3,29 +3,26 @@ NAME
     static web photo albums.
 
 SYNOPSIS
-    photoalbum clean|init|version|generate|all [rcfile]
+    photoalbum clean|version|generate [rcfile] photoalbum makemake
 
     clean
         Cleans up the working space
 
-    init
-        Initializes the working space
-
     version
         Prints out the version
 
     generate
         Generates the static photoalbum
 
-    all This just runs 'clean init generate' right after another.
+    makemake
+        Creates a Makefile and photoalbumrc in the current working
+        directory.
 
   RCFILE
   TUTORIAL
     * See if /etc/default/photoalbum fits your needs. If not, copy
     /etc/default/photoalbum to ~/.photoalbumrc in order to customize it.
 
-    * Run 'photoalbum init'
-
     * Copy all images wanted to the incoming folder (see config file)
 
     * Run 'photoalbum generate'