summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramnesia <amnesia@boum.org>2010-10-02 17:23:21 +0200
committeramnesia <amnesia@boum.org>2010-10-02 17:23:21 +0200
commit610256a34816c819d0edeb5bd8975435a8289778 (patch)
treed0073677f38fb77d25fb631fdb3e1cc7a11d402a
parent867b09fad17b480741f500f2b1cdde8ddd5b5705 (diff)
parentcf9fa52fa20905f23c6d88010ba78e8c29e012a8 (diff)
Merge branch 'master' into lb_2.0.1
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tails-virt-notify-user3
-rw-r--r--wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn4
-rw-r--r--wiki/src/support/virtualisation.mdwn21
-rw-r--r--wiki/src/support/walkthrough.mdwn35
-rw-r--r--wiki/src/todo/virtualization_support.mdwn4
5 files changed, 38 insertions, 29 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
index 5172679..1b97855 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
+++ b/config/chroot_local-includes/usr/local/bin/tails-virt-notify-user
@@ -53,8 +53,7 @@ my $notify = Desktop::Notify->new();
my $summary = gettext("Warning: virtual machine detected!");
my $body =
gettext("Both the host operating system and the virtualization software are able to monitor what you are doing in T(A)ILS.") . "\n"
- . gettext("If you are not aware to be using a virtual machine: there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> in the virtualization detection software T(A)ILS uses... or something really weird is happening.")
- ;
+ . gettext("Please read the <a href='file:///live/image/doc/amnesia/wiki/support/virtualisation.en.html'>documentation page</a> for more information.");
$notify->create(summary => $summary,
body => $body,
diff --git a/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn b/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn
new file mode 100644
index 0000000..cc51fe3
--- /dev/null
+++ b/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn
@@ -0,0 +1,4 @@
+When starting iceweasel for the 1st time under 0.6~rc2, the home page (or any
+page given at the command line) is not opened, but about:blank.
+
+If iceweasel was started once, then everything goes well.
diff --git a/wiki/src/support/virtualisation.mdwn b/wiki/src/support/virtualisation.mdwn
new file mode 100644
index 0000000..a34a2c8
--- /dev/null
+++ b/wiki/src/support/virtualisation.mdwn
@@ -0,0 +1,21 @@
+[[!meta title="Virtualisation"]]
+
+[[!toc levels=2]]
+
+FIXME: shouldn't the paragraph "T(A)ILS and Virtualization" from [[walkthrough]]
+come here?
+
+Security issues
+===============
+
+When running T(A)ILS inside a vritual machine, both the host operating system
+and the virtualization software are able to monitor what you are doing in
+T(A)ILS. Moreover traces are likely to be left in the host computer.
+
+That's why T(A)ILS tries to warn you when you are running it inside a virtual
+machine.
+
+If you get this warning while you are not aware to be using a virtual machine:
+there could be a <a href='https://amnesia.boum.org/found_a_problem/'>bug</a> in
+the virtualization detection software T(A)ILS uses... or something really weird
+is happening.
diff --git a/wiki/src/support/walkthrough.mdwn b/wiki/src/support/walkthrough.mdwn
index 4db3faa..dff59ba 100644
--- a/wiki/src/support/walkthrough.mdwn
+++ b/wiki/src/support/walkthrough.mdwn
@@ -8,7 +8,7 @@ lies on some points, and lacks screenshots.
TODO:
-- adapt instructions from Konqueror to Nautilus
+- finish adapting instructions from TorK to Vidalia
- adapt instructions from Thunderbird to Claws Mail
- instruct how to really "change identity"
- GnuPG + Seahorse
@@ -582,15 +582,6 @@ security. There have been several demonstration of uncovering the true
identities of Firefox users using Tor, but to the authors' knowledge
Torbutton protects you against all of them.
-There is also another web browser installed, namely KDE's Konqueror
-which we will deal with [later](#konq) on in this article, although
-for other uses than web browsing. We encourage you not to use
-Konqueror for web browsing, not because it is a bad web browser, but
-simply because there is no Torbutton or equivalent functionality for
-it. When possible (which should be always) you should use Firefox and
-Torbutton for your web browsing unless you really know what you are
-doing.
-
## <a name="tb"></a>Emailing with Thunderbird
Not everyone is happy using webmail (like the authors) but want to use
@@ -631,24 +622,22 @@ fixed by enabling end-to-end encryption with the email server through
SSL, which you should do any way for all of POP, IMAP and SMTP as your
password otherwise will be sent in plaintext.
-## <a name="konq"></a>Managing files with Konqueror
+## <a name="nautilus"></a>Managing files with Nautilus
+
+Nautilus is GNOME's file manager, (S)FTP client and more and it looks like this
+while in file managing mode:
-Konqueror is KDE's file manager, (S)FTP client, web browser and more
-and it looks like this while in file managing mode:
+FIXME: adapt screenshot
<center><a href="img/konq.png"><img border="0" height="257"
src="img/konq.png" width="354" /></a></center>
-As we already have mentioned, we recommend that you do your web
-browsing in Firefox instead since there is nothing like Torbutton for
-Konqueror. If you _really_ want to use Konqueror you should make sure
-to disable all plugins, JavaScript and cookies in order to expect some
-anonymity, but even then Firefox and Torbutton is probably both a more
-secure and usable alternative. There are no problems using Konqueror
-for file managing or as an FTP client however. In the latter case,
-just enter "ftp://" followed by the address to the FTP server in order
-to connect, and the same applies for SFTP although you prepend
-"sftp://" to the address instead.
+To manage local files, follow links on the desktop or from "Places" menu at top
+left corner of the screen. To move files or folders, you can drag them from one
+window and drop them to another.
+
+To connect to remote FTP or SFTP server, go to "Connect to Server..." from
+"Places" menu.
## <a name="pidgin"></a>Chatting with Pidgin
diff --git a/wiki/src/todo/virtualization_support.mdwn b/wiki/src/todo/virtualization_support.mdwn
index b561261..aa63af0 100644
--- a/wiki/src/todo/virtualization_support.mdwn
+++ b/wiki/src/todo/virtualization_support.mdwn
@@ -36,10 +36,6 @@ Most of the work [[has been done|contribute/design/virtualization_support]].
Left to do:
-* the desktop notification windows is too small for our message to fit
- in so we have to only use the notification system for showing the
- warning and point to proper documentation on the (local) wiki;
- [[!tag todo/code todo/documentation]]
* when running inside a non-free VM, suggest that the user switches to
VirtualBox or some other free software VM: [[!taglink todo/code]];
* when running inside a VM within a non-free host OS, emphasize the