From: Michael Gebetsroither <michael.geb@gmx.at>
Date: Fri, 23 Feb 2007 09:58:32 +0000 (+0100)
Subject: merged
X-Git-Tag: 0.15~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=292e713d1ca463d16db03e454eab8bac2e400be6;hp=72e6325ac1da8c246b79633688d07d327e09b4bf;p=grml-crypt.git

merged
---

diff --git a/.hgtags b/.hgtags
index 30ef4fa..89ece15 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2,3 +2,4 @@
 a0c0cda9e77878a72238028de331853b4dc12ef5 0.12
 5d96a9c6d947893d4d5920832bb5947ea141048e 0.13
 ac073acb1f10720f7fae334c424c8dacfcc577dd 0.14
+aced402badfa4a0ad077c45610a1031eb6de263a grml0.9
diff --git a/debian/changelog b/debian/changelog
index 34a0b75..197e877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 grml-crypt (0.15) unstable; urgency=low
 
-  * Added compiled doku to the .tar.gz package 
+  * Added compiled doku to the .tar.gz package
+  * Manpage fix (thx rob.s) 
 
- -- Michael Gebetsroither <michael.geb@gmx.at>  Mon,  9 Oct 2006 15:33:46 +0200
+ -- Michael Gebetsroither <gebi@grml.org>  Fri, 23 Feb 2007 10:56:28 +0100
 
 grml-crypt (0.14) unstable; urgency=low
 
diff --git a/grml-crypt.8.txt b/grml-crypt.8.txt
index 3fb86aa..6b246b2 100644
--- a/grml-crypt.8.txt
+++ b/grml-crypt.8.txt
@@ -166,7 +166,7 @@ ENCRYPTED LOOPFILESYSTEM ON USBSTICK
 *mount /mnt/external1*::
     To mount your usb-stick on /mnt/external1 (please verify!!).
 
-*grml-crypt -o -t vfat -s 50 /mnt/external1/secure.img /mnt/tmp*::
+*grml-crypt -o -t vfat -s 50 format /mnt/external1/secure.img /mnt/tmp*::
     This command creates a 50MB big file, encrypted with the default options
     and with vfat (also known as fat32). The optimized initialisation mode will
     be used for this file (without -o this could take REALLY LONG).  This