From 847872a69b04f69159273c3d3fcd2cc8803a37f7 Mon Sep 17 00:00:00 2001
From: Jaromil <jaromil@dyne.org>
Date: Wed, 30 Mar 2011 13:30:08 +0200
Subject: [PATCH] more documentation updates

---
 AUTHORS                          |   4 ++--
 ChangeLog                        |   6 +++++
 doc/web/views/images/favicon.ico | Bin 0 -> 766 bytes
 doc/web/views/index.muse         |  39 ++++++++++++++++++++++++++-----
 src/tomb-status.c                |   2 +-
 5 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 doc/web/views/images/favicon.ico

diff --git a/AUTHORS b/AUTHORS
index 75d5310..edc7aee 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@ Tomb is designed and written by Denis Roio aka Jaromil.
 
 Tomb's artwork is contributed by Jordi aka Mon Mort
 
-Testing and fixes are contributed by Dreamer and Hellekin O. Wolf
+Testing and fixes are contributed by Dreamer, Hellekin O. Wolf,
+Shining and Mancausoft.
 
 Cryptsetup is developed by Christophe Saout and Clemens Fruhwirth
-
diff --git a/ChangeLog b/ChangeLog
index 03f1c17..0106716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ March 2011 - 1.0
 	was added to the commandline. Commandline and desktop operations
 	are separate so that tomb can be used via remote terminal.
 
+February 2011 - 0.9.2
+
+	The tomb-open wizard now correctly guides you through the creation
+	of new tombs and helps when saving the keys on external USB
+	storage devices. The status tray now reliably closes its tomb.
+
 February 2011 - 0.9.1
 
 	Sourcecode cleanup, debugging and testing.
diff --git a/doc/web/views/images/favicon.ico b/doc/web/views/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a02e0026648ed956e5b8fc4d6789a1530b3b04e3
GIT binary patch
literal 766
zcmbVJyAHxI47{XBj3gPD!^UUuX?$AqH;jx7h;n(@jjC3lI&$sHogY;I!xN)Jwuc4I
zj8}T3-{=Mhere>ys=A_-60Ge=5$%u07t;n6dYNjyt49PIIQ-zHA2#Y|KCH~+UF&Za
z^=)160ZmKd+K=T*OHOfS$@SRrDu}*RH{M0Q33E0t`n*NKamJT5UiEgp9(A7fQ~hEd
rpSqvlcFUpPzu?9H%X?^?J~&Np9H$qCzx;_|<oLUG*q5;0jKJ^(19&u!

literal 0
HcmV?d00001

diff --git a/doc/web/views/index.muse b/doc/web/views/index.muse
index 13faa47..077fc59 100644
--- a/doc/web/views/index.muse
+++ b/doc/web/views/index.muse
@@ -197,9 +197,37 @@ Below a list of formats you can download this application: ready to be
 run with some of the interfaces developed, as a library you can use to
 build your own application and as source code you can study.
 
+*** Debian
+
+To install the tomb and tomb-gtk package using apt, add this line to
+your software sources (/etc/apt/source/list)
+
+<example>
+ deb http://apt.dyne.org/debian stable main
+</example>
+
+
+*** Ubuntu
+
+If you use Lucid (10.04) add to your software sources this PPA
+
+<example>
+ ppa:jaromil/rastasoft
+</example>
+
+else if you are using Maverick or other older versions, you can still
+try to install the packages, as they should work well, by adding these
+two sources to /etc/apt/source.list
+
+<example>
+deb http://ppa.launchpad.net/jaromil/rastasoft/ubuntu lucid main
+deb-src http://ppa.launchpad.net/jaromil/rastasoft/ubuntu lucid main
+</example>
+
+
 *** Code repository
 
-Latest stable release is 0.9.2 (10 February 2011) more about it in the
+Latest stable release is 1.0 (11 March 2011) more about it in the
 [[ftp://ftp.dyne.org/tomb/NEWS][NEWS]] and [[ftp://ftp.dyne.org/tomb/ChangeLog][ChangeLog]]
 
 Source releases are checked and signed by [[http://jaromil.dyne.org][Jaromil]] using [[http://www.gnupg.org][GnuPG]].
@@ -241,12 +269,11 @@ Tomb is designed and written by [[http://jaromil.dyne.org][Jaromil]].
 
 Tomb's artwork is contributed by [[http://monmort.blogspot.com][Món Mort]].
 
-Testing and fixes are contributed by Dreamer and Hellekin O. Wolf.
-
-Most research we refer to is documented by Clemens Fruhwirth.
-
-Tomb relies on Cryptsetup(8) and LUKS, big up to the developers involved  \o/
+Testing and fixes are contributed by Dreamer, Hellekin O. Wolf,
+Shining and Mancausoft.
 
+Most research we refer to is documented by Clemens Fruhwirth who also
+developed Cryptsetup together with Christophe Saout.
 
 *** How can you help
 
diff --git a/src/tomb-status.c b/src/tomb-status.c
index 5094a96..24ebbf9 100644
--- a/src/tomb-status.c
+++ b/src/tomb-status.c
@@ -231,7 +231,7 @@ gboolean right_click(GtkWidget *w, GdkEvent *e) {
 gboolean cb_about(GtkWidget *w, GdkEvent *e) {
   const gchar *authors[] = {"Jaromil - http://jaromil.dyne.org",
 			    "Code reviews and contributions by:",
-			    "Hellekin O. Wolf", NULL};
+			    "Dreamer, Hellekin O. Wolf, Shining and Mancausoft", NULL};
   const gchar *artists[] = {"Jordi aka Món Mort - http://monmort.blogspot.com",
 			    "Asbesto Molesto - http://freaknet.org/asbesto",
 			    NULL};