Merge branch 'master' into testing

wiki/src/MaxGSoC.mdwn

+Max, GSoC 2011 student
+Working project: tails-greeter a. k. a. custom greeter boot-menu.

wiki/src/bugs/iceweasel_no_longer_warns_when_closing_multiple_tabs.mdwn

+In Tails 0.7, even though "Edit > Preferences > Tabs > Warn me when
+closing multiple tabs" is checked, and in about:config
+browser.tabs.warnOnClose is true, Iceweasel does not display any
+warning. It just closes down immediately when pressing the Close
+Window "X" button provided by GNOME, or Ctrl-Q. This is a problem
+since Ctrl-Q is so close to Ctrl-W. All work in the browser is lost,
+way too easily. This is a bug since the browser is not performing the
+behavior specificed by browser.tabs.warnOnClose.
+
+> Confirmed. Seems like a Debian or upstream bug. Could you please
+> report it to Debian and mention the bug number here?

wiki/src/bugs/should_not_be_that_easy_to_switch_foxyproxy_mode.mdwn

@@ -6,3 +6,5 @@ proxy shall be used depending on the URL) should be easily available.
 
 Maybe we could just ask foxyproxy to avoid displaying anything at all
 in the status bar?
+
+> Fixed in devel Git branch => [[!taglink pending]].

wiki/src/download.de.po

 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Schreppe <EMAIL@ADDRESS>, 2011.
 #
 #, fuzzy
 msgid ""
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2011-04-12 04:25-0600\n"
 "PO-Revision-Date: 2010-08-23 09:13+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Schreppe <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,34 +18,38 @@ msgstr ""
 
 #. type: Content of: outside any tag (error?)
 msgid "[[!meta title=\"Download Tails\"]]"
-msgstr ""
+msgstr "[[!meta title=\"Tails herunterladen\"]]"
 
 #. type: Content of: <div><div><p>
 msgid "Every ISO image we ship is a hybrid one:"
-msgstr ""
+msgstr "Jedes ISO-Image ist ein Hybrid-Image:"
 
 #. type: Content of: <div><div><p><ul><li>
 msgid "it can be burnt to a CD;"
-msgstr ""
+msgstr "Es kann auf CD gebrannt werden"
 
 #. type: Content of: <div><div><p><ul><li>
 msgid ""
 "it also contains a full disk image (including partition table) and can thus "
 "be [[installed onto a USB stick|support/Installing onto a USB stick]]; the "
 "USB stick's content is lost in the operation."
-msgstr ""
+msgstr "Es beinhaltet gleichzeitig ein komplettes Abbild (inklusive Partitionstabelle) und kann somit "
+"auf einen [[USB-Stick installiert|support/Installing onto a USB stick]] werden; Der "
+"Inhalt des USB-Sticks bleibt während der Ausführung unverändert."
 
 #. type: Content of: <div><div><p>
 msgid ""
 "Any help to spread Tails is more than welcome, [[using BitTorrent or by "
 "setting up a web mirror|contribute/how/mirror]]."
-msgstr ""
+msgstr "Jede Hilfe Tails weiter zu verbreiten ist mehr als willkommen - [[benutze BitTorrent oder "
+"richte ein neues Web-Mirror ein |contribute/how/mirror]]."
 
 #. type: Content of: <div><div><p>
 msgid ""
 "If you are interested in the source code, have a look to our [[dev zone|"
 "contribute]]."
-msgstr ""
+msgstr "Falls Du an dem Quellcode interessiert bist, kannst Du ihn Dir in der [[Dev Zone|"
+"contribute]] anschauen."
 
 #. type: Content of: <div><div>
 msgid "[[!toc levels=2]]"
@@ -53,57 +57,60 @@ msgstr ""
 
 #. type: Content of: <div><div><h1>
 msgid "1. Download the image"
-msgstr ""
+msgstr "1. Image herunterladen"
 
 #. type: Content of: <div><div><p>
 msgid "ISO images can be downloaded using BitTorrent or over HTTP."
-msgstr ""
+msgstr "ISO Images können über BitTorrent oder HTTP heruntergeldaen werden."
 
 #. type: Content of: <div><div><div><h2>
 msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
 
 #. type: Content of: <div><div><div><h3>
 msgid "Torrent files"
-msgstr ""
+msgstr "Torrent Dateien"
 
 #. type: Content of: <div><div><div>
 msgid ""
 "Here are the latest available BitTorrent files (<code>.torrent</code>): [[!"
 "map pages=\"torrents/files/*.torrent\"]]"
-msgstr ""
+msgstr "Hier findest du die aktuellen Torrent Dateien (<code>.torrent</code>): [[!"
+"map pages=\"torrents/files/*.torrent\"]]"
 
 #. type: Content of: <div><div><div><h3>
 msgid "Cryptographic signatures and checksums"
-msgstr ""
+msgstr "Signaturen und Checksummen"
 
 #. type: Content of: <div><div><div>
 msgid ""
 "Here are the OpenPGP signatures (<code>.asc</code>)  for the BitTorrent "
 "files listed above: [[!map pages=\"torrents/files/*.torrent.asc\"]]"
-msgstr ""
+msgstr "Hier sind die OpenPGP Signaturen (<code>.asc</code>) für BitTorrent "
+"Dateien oben aufgelistet: [[!map pages=\"torrents/files/*.torrent.asc\"]]"
 
 #. type: Content of: <div><div><div><h2>
 msgid "Direct download (HTTP)"
-msgstr ""
+msgstr "Direkter Download (HTTP)"
 
 #. type: Content of: <div><div><div><h3>
 msgid "Latest release"
-msgstr ""
+msgstr "Aktuelle Version"
 
 #. type: Content of: <div><div><div><p>
 msgid "It can be found there:"
-msgstr ""
+msgstr "Kannst Du hier herunterladen:"
 
 #. type: Content of: <div><div><div><p>
 msgid ""
 "<a id='http-pool' href='http://dl.amnesia.boum.org/tails/stable/'> http://dl."
 "amnesia.boum.org/tails/stable/ </a>"
-msgstr ""
+msgstr "<a id='http-pool' href='http://dl.amnesia.boum.org/tails/stable/'> http://dl."
+"amnesia.boum.org/tails/stable/ </a>"
 
 #. type: Content of: <div><div><div><h3>
 msgid "Release candidates"
-msgstr ""
+msgstr "Realease Candidates"
 
 #. type: Content of: <div><div><div><p>
 msgid ""
@@ -111,11 +118,14 @@ msgid ""
 "but do <strong>not</strong> rely on these for anything. No guarantee, "
 "blablabla. Anyway, here they are: <a href='http://dl.amnesia.boum.org/tails/"
 "testing/'> http://dl.amnesia.boum.org/tails/testing/ </a>"
-msgstr ""
+msgstr "<strong>Warnung!</strong> Bitte verwende die RCs nur für Testzwecke, "
+"da diese mit <strong>keiner</strong> Garantie für Irgendetwas veröffentlicht werden. Keine Garantie, "
+"etc... Trotzdem kannst du diese hier herunterladen: <a href='http://dl.amnesia.boum.org/tails/"
+"testing/'> http://dl.amnesia.boum.org/tails/testing/ </a>"
 
 #. type: Content of: <div><div><h1>
 msgid "2. Verify the downloaded image integrity"
-msgstr ""
+msgstr "2. Verifizieren des heruntergeladenen Images"
 
 #. type: Content of: <div><div><p>
 #, fuzzy
@@ -183,7 +193,7 @@ msgstr ""
 
 #. type: Content of: <div><div><h1>
 msgid "4. Stay tuned!"
-msgstr ""
+msgstr "4. Stay tuned!"
 
 #. type: Content of: <div><div>
 msgid ""

wiki/src/support/installing_onto_a_usb_stick.ca.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-12 06:57-0600\n"
+"POT-Creation-Date: 2011-04-23 16:29-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,16 +33,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Running Tails from a CD has its virtues but it certainly also have its "
-"limitations. While CDs are portable they usually do not fit in your pocket "
-"in a comfortable manner. But a USB stick certainly fits any pocket or your "
-"key ring.  In addition, CDs are read-only and thus no data can be saved to "
-"them, but that is, again, not the case with USB sticks. However, storing "
-"sensitive data on writeable media could be dangerous if it got into the "
-"wrong hands. Similarly, if we get a virus or manages to damage the system in "
-"other ways, the system is tainted or unusable from that point and all "
-"consecutive boots, either with or without your knowledge. Clearly that is "
-"not good."
+"Running Tails from a CD has its virtues but it can certainly also have its "
+"limitations. While CDs are portable they generally do not fit in your "
+"pocket. A USB stick certainly fits any pocket or your key ring.  In "
+"addition, CDs are read-only and thus no data can be saved to them, but that "
+"is, again, not the case with USB sticks. However, storing sensitive data on "
+"writeable media could be dangerous if it got into the wrong hands. "
+"Similarly, if we get a virus, or manage to damage the system in other ways, "
+"the system is tainted or unusable from that point and all consecutive boots, "
+"either with or without your knowledge. Clearly that is not good."
 msgstr ""
 
 #. type: Plain text
@@ -219,9 +218,9 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"If you don't see any error message, Tails is being copied onto the key. The "
-"whole process might take a while, from a few minutes to more than a hour. Be "
-"patient…"
+"If you don't see any error messages, Tails is being copied onto the key. The "
+"whole process might take a while, from a few minutes to more than a hour. "
+"Just be patient and let the process finish."
 msgstr ""
 
 #. type: Title ###
@@ -316,6 +315,13 @@ msgid ""
 "    sync\n"
 msgstr ""
 
+#. type: Plain text
+msgid ""
+"If you don't see any error message, Tails is being copied onto the key. The "
+"whole process might take a while, from a few minutes to more than a hour. Be "
+"patient…"
+msgstr ""
+
 #. type: Plain text
 msgid "See also the troubleshooting from the 1st method."
 msgstr ""

wiki/src/support/installing_onto_a_usb_stick.de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-12 06:57-0600\n"
+"POT-Creation-Date: 2011-04-23 16:29-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,16 +33,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Running Tails from a CD has its virtues but it certainly also have its "
-"limitations. While CDs are portable they usually do not fit in your pocket "
-"in a comfortable manner. But a USB stick certainly fits any pocket or your "
-"key ring.  In addition, CDs are read-only and thus no data can be saved to "
-"them, but that is, again, not the case with USB sticks. However, storing "
-"sensitive data on writeable media could be dangerous if it got into the "
-"wrong hands. Similarly, if we get a virus or manages to damage the system in "
-"other ways, the system is tainted or unusable from that point and all "
-"consecutive boots, either with or without your knowledge. Clearly that is "
-"not good."
+"Running Tails from a CD has its virtues but it can certainly also have its "
+"limitations. While CDs are portable they generally do not fit in your "
+"pocket. A USB stick certainly fits any pocket or your key ring.  In "
+"addition, CDs are read-only and thus no data can be saved to them, but that "
+"is, again, not the case with USB sticks. However, storing sensitive data on "
+"writeable media could be dangerous if it got into the wrong hands. "
+"Similarly, if we get a virus, or manage to damage the system in other ways, "
+"the system is tainted or unusable from that point and all consecutive boots, "
+"either with or without your knowledge. Clearly that is not good."
 msgstr ""
 
 #. type: Plain text
@@ -219,9 +218,9 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"If you don't see any error message, Tails is being copied onto the key. The "
-"whole process might take a while, from a few minutes to more than a hour. Be "
-"patient…"
+"If you don't see any error messages, Tails is being copied onto the key. The "
+"whole process might take a while, from a few minutes to more than a hour. "
+"Just be patient and let the process finish."
 msgstr ""
 
 #. type: Title ###
@@ -316,6 +315,13 @@ msgid ""
 "    sync\n"
 msgstr ""
 
+#. type: Plain text
+msgid ""
+"If you don't see any error message, Tails is being copied onto the key. The "
+"whole process might take a while, from a few minutes to more than a hour. Be "
+"patient…"
+msgstr ""
+
 #. type: Plain text
 msgid "See also the troubleshooting from the 1st method."
 msgstr ""

wiki/src/support/installing_onto_a_usb_stick.es.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-12 06:57-0600\n"
+"POT-Creation-Date: 2011-04-23 16:29-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,16 +33,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Running Tails from a CD has its virtues but it certainly also have its "
-"limitations. While CDs are portable they usually do not fit in your pocket "
-"in a comfortable manner. But a USB stick certainly fits any pocket or your "
-"key ring.  In addition, CDs are read-only and thus no data can be saved to "
-"them, but that is, again, not the case with USB sticks. However, storing "
-"sensitive data on writeable media could be dangerous if it got into the "
-"wrong hands. Similarly, if we get a virus or manages to damage the system in "
-"other ways, the system is tainted or unusable from that point and all "
-"consecutive boots, either with or without your knowledge. Clearly that is "
-"not good."
+"Running Tails from a CD has its virtues but it can certainly also have its "
+"limitations. While CDs are portable they generally do not fit in your "
+"pocket. A USB stick certainly fits any pocket or your key ring.  In "
+"addition, CDs are read-only and thus no data can be saved to them, but that "
+"is, again, not the case with USB sticks. However, storing sensitive data on "
+"writeable media could be dangerous if it got into the wrong hands. "
+"Similarly, if we get a virus, or manage to damage the system in other ways, "
+"the system is tainted or unusable from that point and all consecutive boots, "
+"either with or without your knowledge. Clearly that is not good."
 msgstr ""
 
 #. type: Plain text
@@ -219,9 +218,9 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"If you don't see any error message, Tails is being copied onto the key. The "
-"whole process might take a while, from a few minutes to more than a hour. Be "
-"patient…"
+"If you don't see any error messages, Tails is being copied onto the key. The "
+"whole process might take a while, from a few minutes to more than a hour. "
+"Just be patient and let the process finish."
 msgstr ""
 
 #. type: Title ###
@@ -316,6 +315,13 @@ msgid ""
 "    sync\n"
 msgstr ""
 
+#. type: Plain text
+msgid ""
+"If you don't see any error message, Tails is being copied onto the key. The "
+"whole process might take a while, from a few minutes to more than a hour. Be "
+"patient…"
+msgstr ""
+
 #. type: Plain text
 msgid "See also the troubleshooting from the 1st method."
 msgstr ""

wiki/src/support/installing_onto_a_usb_stick.mdwn

@@ -4,13 +4,12 @@
 
 ## Why running from a USB stick?
 
-Running Tails from a CD has its virtues but it certainly also have its
-limitations. While CDs are portable they usually do not fit in your pocket in a
-comfortable manner. But a USB stick certainly fits any pocket or your key ring.
+Running Tails from a CD has its virtues but it can certainly also have its
+limitations. While CDs are portable they generally do not fit in your pocket. A USB stick certainly fits any pocket or your key ring.
 In addition, CDs are read-only and thus no data can be saved to them, but that
 is, again, not the case with USB sticks. However, storing sensitive data on
 writeable media could be dangerous if it got into the wrong hands. Similarly, if
-we get a virus or manages to damage the system in other ways, the system is
+we get a virus, or manage to damage the system in other ways, the system is
 tainted or unusable from that point and all consecutive boots, either with or
 without your knowledge. Clearly that is not good.
 
@@ -98,9 +97,9 @@ In the example on the screenshots the commands would be:
 
 ### Press enter and wait.
 
-If you don't see any error message, Tails is being copied onto the key. The
-whole process might take a while, from a few minutes to more than a hour. Be
-patient…
+If you don't see any error messages, Tails is being copied onto the key. The
+whole process might take a while, from a few minutes to more than a hour. Just be
+patient and let the process finish.
 
 ### Troubleshooting.
 

wiki/src/todo/Add_Gnome_PPP_for_Dial-Up_Users.mdwn

@@ -4,6 +4,8 @@ Tails should be usable by those stuck with dial-up Internet access. Recent
 events have shown that in some cases, dial-up might be the last option to
 reach the Internet when broadband operators have been shut down.
 
+This was [[discussed on the forum|forum/GNOME_PPP_for_Dial-Up ?]].
+
 # Research
 
 NetworkManager (and ModemManager) have full support for **mobile** modems. But
@@ -123,3 +125,13 @@ Possible solutions:
    it might be an option to create a custom package handling resolvconf the way
    we want.
  * [[!taglink todo/research]] alternative ways to use WvDial or PPP.
+
+## Groups
+
+[[!tag todo/research]]
+
+What groups must the user be part of to run wvdial / gnome-ppp? We've
+been told [[on the
+forum|forum/GNOME_PPP_for_Dial-Up ?#comment-9b26e5014164c5ff0ebd3cc3223f6301]]
+the answer was `dialout` (which is already the case) and `dip` (which
+is not).

wiki/src/todo/TailsGreeter.mdwn

+Implementation of custom boot menu for GDM3 as part of GSoC2011 project.
+
+This page will contain current plans, overall design description, project status updates, documentation and random pieces of information.
+
+Developers are encouraged to provide input for various options to be asked via boot-menu using following template:
+
+---
+Template for description of settings which are needed to be requested via tails-greeter before logon:
+
+1. name - just something we will use to point to during discussions
+2. default value(s) - if any
+3. effects - what exactly this option will trigger (e. g. write to some file(s), exec some processes, fire d-bus signals etc)
+4. ui-hint - short description to be displayed for user in order to help him to figure out how to properly set this option
+5. responsible dev - contact details 
+6. dev's notes - overall description from dev's point of view (why do we need this option? what are the dependencies? how do we handle it now? how do we test implementation? any other comments?)
+
+---

wiki/src/todo/Unrar.mdwn

+Tails' inability to extract rar files needs to be addressed.
+
+> Done in Git devel branch => [[!taglink pending]].

wiki/src/todo/VoIP_support.mdwn

 [[!tag todo/easy]]
 
-[[!taglink todo/research]] if VoIP can be usable in the context of Tails.
+We need to [[!taglink todo/research]] how VoIP can be usable in the
+context of Tails.
 
 Preliminary testing showed
 [OnionCat](http://www.cypherpunk.at/onioncat/) +
@@ -15,6 +16,8 @@ has (limited) certainty to be talking to the call receiver, but the
 reverse is not true. So this shall be used in combination with zRTP or
 similar.
 
+[[!toc levels=2]]
+
 Technologies
 ============
 
@@ -69,8 +72,7 @@ information about the audio level of the individual participants
 VoIP software
 =============
 
-**Note**: these are relatively old notes that should be updated and
-further researched.
+**Last updated**: 20110429
 
 Ekiga
 -----
@@ -81,45 +83,55 @@ Ekiga
  * [last
    update](http://mail.gnome.org/archives/ekiga-devel-list/2009-April/msg00036.html)
    as of 200904
+- supports IPv6 for H.323 but not for SIP it seems
 
 Linphone
 --------
 
+- [homepage](http://www.linphone.org/), [[!wikipedia Linphone desc="wikipedia page"]]
 - in Debian Squeeze
 - supports IPv6
 - zRTP support [was asked
   for](http://www.archivum.info/linphone-developers@nongnu.org/2009-01/00013/(Linphone-developers)-Integrating-zRTP-protocol-into-LINphone.html)
+  but, as of 02 Dec 2010, they have [no plans to implement
+  it](http://www.mail-archive.com/linphone-users@nongnu.org/msg02640.html)
+  without "customer funding"
 
 Mumble
 ------
 
-- [homepage](http://mumble.sourceforge.net/), wikipedia: [[!wikipedia
-  Mumble_(software)]]
+- [homepage](http://mumble.sourceforge.net/), [[!wikipedia
+  Mumble_(software) desc="wikipedia page"]]
 - in Debian Squeeze
 - primary engineering effort targeted at low-latency
 - successfully tested in combination with OnionCat
 - TLS and OCB-AES128; seems to depend on a PKI for peer authentication
+- supports IPv6
 
 SFLphone
 --------
 
-- [homepage](http://www.sflphone.org/) wikipedia: [[!wikipedia
-  SFLphone]]
+- [homepage](http://www.sflphone.org/), [[!wikipedia
+  SFLphone desc="wikipedia page"]]
 - in Debian Squeeze
 - SIP
 - Multiple audio conferencing
 - TLS and zRTP
+- supports IPv6? [[!tag todo/research]]
 
-SIP Communicator
-----------------
+Jitsi (SIP Communicator)
+------------------------
 
-- [homepage](http://www.sip-communicator.org/),  wikipedia:
-  [[!wikipedia SIP_Communicator]]
+- [homepage](http://jitsi.org/),  [[!wikipedia Jitsi desc="wikipedia page"]]
 - LGPL, written in Java
-- not in Debian Squeeze
+- not in Debian; they ship binary Debian packages, but I could not
+  find the Debian packaging source
 - supports IPv6, SIP, XMPP
 - supports zRTP for key negotiation, SRTP for voice encryption, and
   TLS for signaling encryption
+- supports audio SIP and XMPP conference calls; what conferencing protocol?
+- supports OTR for text IM
+- reported to work over Tor
 
 Twinkle
 -------
@@ -128,5 +140,6 @@ Twinkle
 - in Debian Squeeze
 - was included in Incognito
 - supports SIP, zRTP et SRTP
-- [[!taglink todo/research]]: IPv6 support?
+- supports IPv6
 - Qt application, but does not depend on KDE libs
+- no release between 20090225 and 20110429

wiki/src/todo/boot_menu.mdwn

@@ -10,6 +10,9 @@ must be asked very early. This could happen either in the boot menu or by
 hooking a menu that would probably run from inside the initramfs as one of the
 first live-boot scripts.
 
+This task will be implemented by Max during GSoC2011. Progress can be
+tracked via [[TailsGreeter]] page.
+
 # Using boot menus
 
 In 0.6, the localisation at runtime is done in the syslinux menu for PCs, see
@@ -81,8 +84,7 @@ architecture of GDM 3:
 - The selected configuration will be applied within one or more scripts
   in `/etc/gdm3/PostLogin`.
 
-Nice thing is that `tails-greeter` can probably be implemented in
-Python/GTK+.
+This variant is slated for implementation using Vala during GSoC2011 project. Progress can be tracked via [[TailsGreeter]] page.
 
 With this approach, the initial boot menu (*syslinux*) can be kept
 pretty minimal and mostly offer *failsafe* boot options (e.g. overcoming

wiki/src/todo/bumping_the_eject_button_shouldn__39__t_shutdown_Tails.mdwn

+As of Tails 0.7, it is too easy to shutdown Tails. It shuts down, without waiting for confirmation, if I bump the Eject button on my laptop's CD drive, which is not an uncommon event when moving the laptop across the room. It wouldn't be a big deal if pressing Eject brought up a confirmation dialog box, but immediate unconfirmed shutdown is too much.

wiki/src/todo/iceweasel_addon_-_CS_Lite.mdwn

-[[!tag todo/discuss]]
+[[!tag todo/wait]]
 
 Do we want to keep the CS Lite addon?
 
@@ -6,6 +6,10 @@ No other cookie manager is packaged in Debian yet.
 If we want to keep it, we should package this one
 or similar.
 
+[Cookie Monster](https://addons.mozilla.org/fr/firefox/addon/4703/)
+seems much better than CS Lite => we asked for it to be packaged in
+Debian in [[!debbug 623970]]
+
 CS Lite features
 ================
 
@@ -18,8 +22,3 @@ CS Lite issues
 
 Seems like it is unmaintained. We've had to edit its `install.rdf` to
 make it work inside Squeeze's iceweasel.
-
-Alternatives
-============
-
-- [Cookie Monster](https://addons.mozilla.org/fr/firefox/addon/4703/)

wiki/src/todo/nx_bit.mdwn

@@ -37,9 +37,59 @@ can stop supporting them.
 > are shipping it. Not sure what to decide here. First solution seems the best
 > but requires some more work... --bertagaz
 
-=> [[!taglink todo/discuss]] what we want to do.
+>> Update: Debian will stop shipping the -686 flavour as of 2.6.39
+>> (reference: [Ben's
+>> blog](http://womble.decadent.org.uk/blog/upcoming-changes-in-debian-linux-packages-for-i386.html)).
+>> When we start shipping such kernels, either we'll ship -486 until
+>> non-PAE systems die, or we'll ship both -686-pae and -486 *and*
+>> we'll have the bootloader autodetect the most appropriate one
+>> depending on what the kernel supports. See bellow for the current
+>> state of our research.
 
 # Resources
 
 - http://lists.debian.org/debian-devel/2010/11/msg00216.html
 - [[!debbug 589579]]
+
+## Selecting the kernel depending on hardware capabilities
+
+The HDT (hardware detection tool) syslinux module
+([homepage](http://www.hdt-project.org/), [page on syslinux
+wiki](http://syslinux.zytor.com/wiki/index.php/Hdt_(Hardware_Detection_Tool)))
+has code that might help supporting this; it's been shipped in
+mainline syslinux for a while. On the other hand does *not* offer any
+kind of feature that can be used to parameterized the boot menu.
+
+Debian multi-arch installer's syslinux menu autodetects
+amd64-compatible hardware and pre-selects the right default kernel.
+Seems like it uses the `default64` menu keyword (see debian-installer
+Git repository). This does not allow to select a kernel depending on
+PAE support.
+
+Other COM32 modules shipped with syslinux might be better suited for
+our specific needs. See especially `ifcpu.c32`; according to its
+source code, it can "run one command if system match some CPU
+features, another if it doesn't" and is supposed to be used
+e.g. like this:
+
+	label ifcpu
+	    com32 ifcpu.c32
+	    append pae -- boot_entry_1 -- boot_entry_2
+
+	label boot_entry_1
+	    kernel vmlinuz_entry1
+	    append ...
+
+	label boot_entry_2
+	    kernel vmlinuz_entry2
+	    append ...
+
+... which apparently would suit our needs.
+
+The `ifcpu64.c32`
+[module](http://syslinux.zytor.com/wiki/index.php/Ifcpu64.c32) seems
+to provide the best of both worlds, allowing to do different things