Commit 4d91c472 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' into devel

Conflicts:
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
	wiki/src/news/test_0.16-rc1.html
parents b8d2ba23 9b98f039
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-11-29 21:10+0100\n"
"POT-Creation-Date: 2012-12-17 15:28+0100\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"
......@@ -340,11 +340,11 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Press and Media\n"
msgid "Press and media\n"
msgstr ""
#. type: Plain text
msgid "See the [[Press and Media information|press]]."
msgid "See the [[Press and media information|press]]."
msgstr ""
#. type: Title =
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"POT-Creation-Date: 2012-11-29 21:10+0100\n"
"POT-Creation-Date: 2012-12-17 15:28+0100\n"
"PO-Revision-Date: 2012-02-29 00:49-0600\n"
"Last-Translator: Alfredo Rubio <alfrb76@hotmail.com>\n"
"Language-Team: Spanish <LL@li.org>\n"
......@@ -326,11 +326,11 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Press and Media\n"
msgid "Press and media\n"
msgstr ""
#. type: Plain text
msgid "See the [[Press and Media information|press]]."
msgid "See the [[Press and media information|press]]."
msgstr ""
#. type: Title =
......
......@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
"POT-Creation-Date: 2012-11-29 21:10+0100\n"
"PO-Revision-Date: 2012-10-05 16:53+0200\n"
"POT-Creation-Date: 2012-12-19 21:12+0100\n"
"PO-Revision-Date: 2012-12-19 21:13+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Plain text
#, no-wrap
......@@ -326,12 +327,12 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Press and Media\n"
msgstr ""
msgid "Press and media\n"
msgstr "Presse et média\n"
#. type: Plain text
msgid "See the [[Press and Media information|press]]."
msgstr ""
msgid "See the [[Press and media information|press]]."
msgstr "Voir la [[rubrique Presse et média|press]]."
#. type: Title =
#, no-wrap
......
......@@ -111,10 +111,10 @@ To continue discovering Tails, you can now read:
- some hints on why [[should you trust Tails|doc/about/trust]],
- our [[design document|contribute/design]] about Tails specification, threat model and implementation.
Press and Media
Press and media
===============
See the [[Press and Media information|press]].
See the [[Press and media information|press]].
Acknowledgements
================
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 1\n"
"POT-Creation-Date: 2012-11-29 21:10+0100\n"
"POT-Creation-Date: 2012-12-17 15:28+0100\n"
"PO-Revision-Date: 2012-10-26 13:43-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
......@@ -329,11 +329,11 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Press and Media\n"
msgid "Press and media\n"
msgstr ""
#. type: Plain text
msgid "See the [[Press and Media information|press]]."
msgid "See the [[Press and media information|press]]."
msgstr ""
#. type: Title =
......
......@@ -9,3 +9,5 @@ during the boot sequence, open a terminal an issue:
sudo apt-get install unrar
But this will not support all RAR archives, unfortunately.
[[done]] in Tails 0.13.
......@@ -6,3 +6,7 @@ Tested with Thunderbird and it worked for both PrivacyBox and Tormail.
> Claws-mail default setting for POP accounts is to delete the messages on the server *7days after the reception*. Did you tried modifying this setting?
>> No reply, closing.
[[done]]
......@@ -7,4 +7,7 @@ In practice, that means a Tails pendrive setup by the Tails USB
installer cannot boot on a ThinkPad X220, unless we add UEFI support
to Tails.
The same applies to ThinkPad T520.
The same applies to ThinkPad T520. Other models are listed on
[[support/known_issues]].
The solution is to implement [[todo/UEFI]] support.
......@@ -22,3 +22,7 @@ This probably is
[Claws Mail bug #2199](http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2199).
We should provide more information there, and help us understand this
is no enhancement request but rather a defect.
> Just for the record: it's not very likely that we find time and
> motivation to fix this, given we've decided to
> [[migrate back to icedove|todo/Return of Icedove?]]...
......@@ -23,3 +23,5 @@ disabling this use in Claws?
> and the practical consequence is having to type your
> passphrase for every single encrypted email no matter if
> all of them are encrypted for the same key.
>> Fixing process happens on [[todo/fix_claws-mail_with_gpg]].
......@@ -2,6 +2,6 @@ In current (pre-0.10) `devel` branch Pidgin nicks are sometimes not randomized.
> Did anyone experience this more recently?
It has been reported in 0.10.2. The user's `/var/lib/live/config`
suggests that all live hooks after and including `201-pidgin` didn't
run. It seems like `201-pidgin` kills `config.sh` some how.
>> It has been reported in 0.10.2. The user's `/var/lib/live/config`
>> suggests that all live hooks after and including `201-pidgin` didn't
>> run. It seems like `201-pidgin` kills `config.sh` some how.
......@@ -44,12 +44,16 @@ initramfs + sdmem
Possible fixes (180f058 + 0f1f476d) now waiting to be tested in devel branch.
This change is likely to work "most of the time", but it is not reliable as is:
sdmem kills itself as soon as it's refused to allocate memory, so there's no
guarantee several instances of it will be allocating enough memory at the same
time to ensure all memory is erased. In the worst case, this change can make
the memory erasure process 32 times longer, with no efficiency improvement.
Needs to be tested.
This change is shipped in Tails 0.14 and later, and works already
quite well in practice (almost always perfect wiping on PAE systems
according to our tests, a bit worse on non-PAE).
In theory, it's supposed to work "most of the time", but it is not
reliable as is: sdmem kills itself as soon as it's refused to
allocate memory, so there's no guarantee several instances of it will
be allocating enough memory at the same time to ensure all memory is
erased. In the worst case, this change can make the memory erasure
process 32 times longer, with no efficiency improvement.
initramfs + custom program
--------------------------
......
......@@ -43,3 +43,5 @@ linux 3.0.0-1 from unstable did not solve the issue either, however.
>>>> This appears to not work on all CD ROM drives. We still need a
>>>> proper fix.
Fixing process is tracked on [[todo/fix DVD eject at shutdown]].
......@@ -2,8 +2,6 @@ Seems like all the UI's l10n is correctly updated on language change,
but the keyboard layout widget is constantly displayed using the
locale the window was loaded with.
> **Important, but no release blocker**.
* in ubiquity, the `d-i/make-keyboard-names` script uses
`/usr/share/locale/*/LC_MESSAGES/xkeyboard-config.mo` to translate
the keyboard layout names, from list of keyboard layouts gathered
......
......@@ -155,21 +155,28 @@ Freezing devel into testing
---------------------------
1. Merge `devel` branch into `testing` in Git
2. Either merge the `devel` APT suite into the `testing` one, **or**
hard reset `testing` suite to the current state of the `devel`
suite? (If the latter: how? delete with `removematched codename
glob` and then copy? -- beware: do the `*matched` commands act on
source + binary?)
2. (Manually) hard reset `testing` suite to the current state of the
`devel` one:
a. First, merge `devel` into `testing`
$ ssh reprepro@incoming.deb.tails.boum.org \
tails-merge-suite devel testing
b. Then, compare the resulting list of (package, version) in
`testing` with the ones in `devel`, remove from `testing`
packages that were removed from `devel` as needed, and generally
make it so the lists are the same in the end.
<a id="workflow-post-tag"></a>
Tagging a new Tails release
---------------------------
Once the new release's Git tag is pushed, a cronjob should create
a new APT suite on the APT repository's side. This new APT suite is
called the same as the new release version. One may check it has
appeared in `~reprepro/conf/distributions`.
a new APT suite on the APT repository's side within a few minutes.
This new APT suite is called the same as the new release version.
One may check it has appeared in `~reprepro/conf/distributions`.
Then, the APT suite corresponding to the branch that was used to
prepare the release (namely: `stable` if this is a point-release,
......
......@@ -17,17 +17,14 @@ do let us know — ideally, by submitting a patch with your fix.
# Writing
The easiest documentation tasks may be found by looking at documentation section on the [[TODO|todo#documentation]] list (items tagged `todo/documentation`). Small fixes and
enhancements are greatly welcome, and can be done either directly in
this wiki's web interface, by [[sending us|contribute/talk]] Git patches, or
by publishing a [[Git]] branch.
But there is more: Tails [[end-user documentation|doc]] needs lots
of work. A plan was thought through and sent to the [Tails development
mailing-list](https://boum.org/mailman/listinfo/tails-dev/) on Thu, 17
Feb 2011. Documentation writers coordinate themselves using our usual
[[development communication channels|contribute/talk]]. On the technical
side, a dedicated `doc-rework` [[Git]] branch has been setup to host
this work.
enhancements are greatly welcome, and can be done by [[sending
us|contribute/talk]] Git patches, or by publishing a [[Git]] branch.
Documentation writers coordinate themselves using our usual
[[development communication channels|contribute/talk]].
Documentation writers should also read our [[documentation
guidelines|guidelines]].
# Translating
......
[[!meta title="Documentation guidelines"]]
This page contains guidelines and resources for writing documentation
for Tails. Most of these rules can also be applied when writing
graphical user interfaces. Doing so helps creating a consistent language
across GUI and documentation.
[[!toc levels=2]]
Follow the GNOME Documentation Style Guide
==========================================
The GNOME Documentation Style Guide (GDSG) provides guidelines for
authors who want to contribute to the GNOME Documentation Project (GDP).
Try to follow those guidelines when writing documentation and GUI for
Tails.
- [GNOME Documentation Style Guide](http://developer.gnome.org/gdp-style-guide/stable/),
- [GNOME Documentation Style Guide, single HTML
file](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html)
**Read at least [Section 1 ― Fundamental Concepts of Technical
Documentation](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#fundamentals).**
The following sections are also of particular interest or have been
debated within Tails before:
- [2.4.2.&nbsp;Guidelines for Using Screenshots in Online
Help](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#infodesign-10)
explains how to decide to use screenshots.
- [4.&nbsp;Writing documentation for an International
Audience](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#locale)
includes specific rules about how to write documentation that is
easier to translate, with practical examples.
- [5.2.&nbsp;Checks You Can Do
Yourself](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#improving-6)
lists the top ten topics that you need to watch out for when you
review your work.
- [A.&nbsp;Recommended
Terminology](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#wordlist)
contains a glossary of terms for use when writing documentation.
Use title capitalization rules from Wikipedia
=============================================
Do not use the capitalization rules for headings from the GDSG. Use
instead the sentence-style [capitalization rules from
Wikipedia](https://en.wikipedia.org/wiki/Wikipedia:Naming_conventions_%28capitalization%29).
In short, **do not capitalize the second or subsequent words in an
article title, unless the title is a proper noun**. Sentence-style
capitalization looks less formal and is also easier for the worldwide
audience to read.
But use title capitalization, as described in GDSG section
[3.&nbsp;Grammar and Usage
Guidelines](http://developer.gnome.org/gdp-style-guide/stable/gdp-style-guide.html#grammar)
for the names of GUI items: buttons, dialogs, applications, menus, etc.
CSS formating for GUI documentation
===================================
Use the equivalent of [DocBook
tags](http://developer.gnome.org/gdp-handbook/stable/docbook.html.en#docbook-inline)
to style your documentation using CSS.
- <span class="code">span.application</span> for application names, for example:
- Code: `<span class="application">Tails Greeter</span>`
- Result: <span class="application">Tails Greeter</span>
- <span class="code">span.button</span> for button names, for example:
- Code: `the <span class="button">Login</span> button`
- Result: the <span class="button">Login</span> button
- <span class="code">span.code</span> for code excerpts, for example:
- Code: `<span class="code">id="tails-greeter"</span>`
- Result: <span class="code">id="tails-greeter"</span>
- <span class="code">span.command</span> for command names
- Code: `the <span class="command">apt-get</span> command`
- Result: the <span class="command">apt-get</span> command
- <span class="code">span.filename</span> for file names, for example:
- Code: `the <span class="filename">~/.gnupg/gpg.conf</span> file`
- Result: the <span class="filename">~/.gnupg/gpg.conf</span> file
- <span class="code">span.guilabel</span> for GUI label, for example:
- Code: `<span class="guilabel">Enter passphrase</span>`
- Result: <span class="guilabel">Enter passphrase</span>
- <span class="code">span.menuchoice</span>, <span class="code">span.guimenu</span>, <span class="code">span.guisubmenu</span>, <span class="code">span.guimenuitem</span> for menu
and menu items, for example:
- Code:<br/>
`<span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
<span class="guisubmenu">Tails</span>&nbsp;▸
<span class="guimenuitem">Configure persistent storage</span>
</span>`
- Result: <span class="menuchoice">
<span class="guimenu">Applications</span>&nbsp;▸
<span class="guisubmenu">Tails</span>&nbsp;▸
<span class="guimenuitem">Configure persistent
storage</span></span>
- <span class="code">span.keycap</span> for
- Code: `the <span class="keycap">Tab</span> key`
- Result: the <span class="keycap">Tab</span> key
- <span class="code">span.replaceable</span>
- Code: `<span class="command">select disk=<span class="replaceable">number</span></span>`
- Result: <span class="command">select disk=<span class="replaceable">number</span></span>
Related online resources
========================
- [Jakob Nielsen: Writing for the
Web](http://www.useit.com/papers/webwriting/)<br/>
However do not use bold for scanning in instruction steps. Steps
should be short enough and bold mixes up with other GUI formatting.
- [Wikipedia.org](https://en.wikipedia.org/),
[Webopedia.com](http://www.webopedia.com),
[Whatis.com](http://whatis.com) can be used as terminology websites
for technical terms.
You can help by advertising Tails usage to people that needs privacy while
using computers.
See the *Promote* section of the [[TODO]] list.
See:
* the *Promote* section of the [[TODO]] list.
* [[Press and media information|press]]
- [[todo/document_common_Tails_misconceptions]]
......@@ -2,6 +2,31 @@
See the [[release_schedule]].
Pre-freeze
==========
upgrade i2p
-----------
See [[contribute/design/I2P]].
Going through the usual [[review and merge
process|contribute/merge_policy]] is welcome.
Upgrade Torbutton
-----------------
Since Torbutton is not maintained in Debian anymore,
upgrade our Debian package to the latest release if needed.
Going through the usual [[review and merge
process|contribute/merge_policy]] is welcome.
Coordinate with Debian security updates
---------------------------------------
See [[release_process/Debian_security_updates]].
Select the right branch
=======================
......@@ -10,11 +35,6 @@ branch and changes should be made from there.
From minor releases, work should happen in `stable`.
Coordinate with Debian security updates
=======================================
See [[release_process/Debian_security_updates]].
Update included files
=====================
......@@ -34,11 +54,6 @@ Patterns are stored in
Tails checkout inside
`config/chroot_local-includes/etc/iceweasel/profile/adblockplus`
upgrade i2p
-----------
See [[contribute/design/I2P]].
upgrade bundled binary Debian packages
--------------------------------------
......@@ -60,9 +75,21 @@ Then see the relevant release processes:
* build a debian package
* upload it to [[APT repository]]
Freeze
------
If we are at freeze time (e.g. preparing RC1):
* Merge the `devel` Git branch into `testing`.
* Merge `devel` APT suite into the `testing` one, as documented on
[[contribute/APT_repository#workflow-freeze]].
Changelog
---------
Remove the placeholder entry for next release in `debian/changelog`,
and then:
./release NEW_VERSION PREVIOUS_RELEASED_TAG
example:
......@@ -99,10 +126,12 @@ Merge the `master` branch into the one used to build the release.
### version number
If preparing a RC, skip this part.
In the branch used to build the release, update the `inc/*` files to
match the *version number* and *date* of the new release. *Set the date
match the *version number* and *date* of the new release. Set the date
at least 24 hours in the future! Between tests and mirror synchronisation,
the build will not be released on the same day.* Try to make sure it
the build will not be released on the same day. Try to make sure it
matches the date of the future signature.
### features and design documentation
......@@ -118,7 +147,10 @@ Also:
### PO files
Refresh the PO files with `./build-wiki`, and add / commit the ones
Refresh the code PO files with `./refresh-translations`, commit
the result.
Refresh the website PO files with `./build-wiki`, and add / commit the ones
corresponding to pages that were added or changed accordingly to
changes coming with the new release. This e.g. ensures that the RC
call for translation points translators to up-to-date PO files.
......
......@@ -43,6 +43,12 @@ Add a signed tag to the Git repository:
git-buildpackage --git-tag-only
Push the changes:
git push && git push --tags
(Make sure both `master` and `debian` are pushed.)
Add the Debian package to Tails
===============================
......
......@@ -24,10 +24,14 @@ Install the dependencies:
Make an upstream release
========================
Enable new translations in `po/PACKAGE`.
Update version number in `bin/tails-persistence-setup`.
Update `Changes`.
Commit all files that need to be.
Build an upstream tarball:
dzil build
......@@ -69,7 +73,9 @@ If everything is fine, add a signed tag to the repository and push the
changes:
git-buildpackage --git-tag-only
git push --tags
git push && git push --tags
(Make sure `master`, `upstream`, `debian` and `pristine-tar` were all pushed.)
Add the Debian package to Tails
===============================
......
[[!meta title="How to release tails-greeter"]]
*Tails Greeter* is a native Debian package. Development happens in the `devel`
branch.
*Tails Greeter* is a native Debian package.
[[!toc levels=1]]
Update the Debian package
=========================
Checkout the correct branch:
git checkout master
Update `debian/changelog`:
git-dch --debian-branch=devel
git-dch
(Do not forget to set the appropriate release.)
......@@ -20,12 +23,12 @@ Commit the changelog:
Build a new Debian package:
git-buildpackage --git-debian-branch=devel
git-buildpackage
If everything is fine, tag the release and push the changes:
git-buildpackage --git-tag-only
git push --tags
git push && git push --tags
Add the Debian package to Tails
===============================
......
......@@ -170,6 +170,7 @@ features properly do their work; second, our `torrc` sets the right
LVM. The DVD/USB ramdisk must use the Tails system found on the
DVD/USB, and not the one found on the hard disk. (Also check that
without Tails, that other Live system boots.)
* is a persistence volume on a local hard-disk partition used?
# Claws
......@@ -411,7 +412,8 @@ that the theme resembles Windows XP, including:
# Real (non-VM) hardware
* Boot on bare-metal on USB and DVD.
* Boot on bare-metal on USB.
* Boot on bare-metal on DVD.
* Measure boot time on some reference bare metal hardware, and compare
with previous version. The new one should not be significantly
slower to start.
......
......@@ -20,7 +20,8 @@ Pick one of those:
# 1. Fill the RAM with a known pattern
* Boot Tails.