Commit 490baf81 authored by cbrownstein's avatar cbrownstein
Browse files

Merge remote-tracking branch 'origin/master' into doc/8666-how-to-screenshots

parents ed6c9210 ad92b177
[submodule "submodules/jenkins-tools"]
path = submodules/jenkins-tools
url = https://git-tails.immerda.ch/jenkins-tools
url = https://gitlab.tails.boum.org/tails/jenkins-tools.git
[submodule "submodules/chutney"]
path = submodules/chutney
url = https://git-tails.immerda.ch/chutney
url = https://gitlab.tails.boum.org/tails/chutney.git
branch = feature/tails_test_suite
[submodule "submodules/mirror-pool-dispatcher"]
path = submodules/mirror-pool-dispatcher
url = https://git-tails.immerda.ch/mirror-pool-dispatcher
url = https://gitlab.tails.boum.org/tails/mirror-pool-dispatcher.git
[submodule "submodules/tails-workarounds"]
path = submodules/tails-workarounds
url = https://git-tails.immerda.ch/tails-workarounds
url = https://gitlab.tails.boum.org/tails/workarounds.git
doc/README
\ No newline at end of file
## About Tails
[**Tails**](https://tails.boum.org/) is a portable operating system that protects your privacy and helps you avoid censorship.
[![Drawing of a Tails stick that is marked to be pluged into a labtop](https://tails.boum.org/index/laptop.svg)](https://tails.boum.org/)
- Tails uses the Tor network to protect your privacy online and help you avoid censorship. Enjoy the Internet like it should be.
- Shut down the computer and start on your Tails USB stick instead of starting on Windows, macOS, or Linux. Tails leaves no trace on the computer when shut down.
- Tails includes a selection of applications to work on sensitive documents and communicate securely. Everything in Tails is ready-to-use and has safe defaults.
-You can download Tails for free and independent security researchers can verify our work. Tails is based on Debian GNU/Linux.
[Learn learn how Tails works](https://tails.boum.org/about)
### How to contribute to Tails
There are many ways [you can contribute to Tails](https://tails.boum.org/contribute/). No effort is too small and whatever you bring to this community will be appreciated.
Find out how you can make a difference in Tails: https://tails.boum.org/contribute/.
### How to get started with Gitlab
https://tails.boum.org/contribute/working_together/GitLab/
### How to transition to GitLab
https://tails.boum.org/contribute/working_together/GitLab/transition/
### License and source code distribution
**Tails** is [Free Software](https://www.gnu.org/philosophy/free-sw.html): you can download, use, and share it with no restrictions.
<a href="https://tails.boum.org/doc/about/license/"><img alt="Tails is Free Software" src="https://tails.boum.org/index/gift.svg" width="560"/>
The Tails source code is released under the GNU/GPL (version 3 or above) and is Copyright (C) Tails developers tails@boum.org.
Any exception to this rule is documented either [here](https://tails.boum.org/doc/about/license/) or in the affected source file.
However, Tails includes non-free firmware in order to work on as much hardware as possible.
### Contact
email and mailing lists: https://tails.boum.org/about/contact
XMPP: tails@conference.riseup.net and tails-dev@conference.riseup.net
[![Tails](https://tails.boum.org/contribute/how/promote/material/logo/tails-logo-flat.svg)](https://tails.boum.org)
\ No newline at end of file
......@@ -9,8 +9,6 @@
# This script introduces 'su' function for non-root users. The 'su'
# function executes '/usr/local/bin/replace-su-with-sudo', which asks
# them to use 'sudo' instead of 'su'.
#
# https://redmine.tails.boum.org/code/issues/15583
# Get LIVE_USERNAME
. /etc/live/config.d/username.conf
......
......@@ -9,8 +9,6 @@
# 'is_password_set()' function from 'adminpassword.py' library. If the
# password is set, the user is asked to use 'sudo' instead of 'su'.
# Otherwise, the user is asked to first set the administration password.
#
# https://redmine.tails.boum.org/code/issues/15583
import gettext
import sys
......
......@@ -24,7 +24,7 @@ copyright_year = 2013
[MetaResources]
homepage = https://tails.boum.org/
repository.url = git://git.tails.boum.org/tails
repository.url = https://gitlab.tails.boum.org/tails/tails.git
repository.type = git
[@Filter]
......
......@@ -15,7 +15,7 @@ copyright_year = 2014
[MetaResources]
homepage = https://tails.boum.org/
repository.url = git://git.tails.boum.org/tails
repository.url = https://gitlab.tails.boum.org/tails/tails.git
repository.type = git
[@Filter]
......
......@@ -1271,7 +1271,7 @@ tails (3.14.1) unstable; urgency=medium
- Revert "Build system: try to be smart again by fetching only the
refs we need." This optimization overrides the trick we have on
Jenkins (set_origin_base_branch_head in
https://git.tails.boum.org/jenkins-jobs/tree/macros/builders.yaml),
jenkins-jobs:macros/builders.yaml),
that ensures that a reproducibly_build_Tails_ISO_* job builds
from the commit used by the first build. (Closes: #16730)
......
......@@ -6,8 +6,8 @@ Build-Depends-Indep: dpkg-dev (>= 1.14.25)
Maintainer: Tails developers <tails@boum.org>
Standards-Version: 3.8.1
Homepage: https://tails.boum.org/
Vcs-Browser: https://git-tails.immerda.ch/tails
Vcs-Git: git://git.tails.boum.org/tails
Vcs-Browser: https://gitlab.tails.boum.org/tails/tails
Vcs-Git: https://gitlab.tails.boum.org/tails/tails.git
Package: tails
Architecture: all
......
......@@ -135,9 +135,9 @@ allow_symlinks_before_srcdir: 1
# unix users whose commits should be checked by the pre-receive hook
#untrusted_committers: []
# gitweb url to show file history ([[file]] substituted)
historyurl: 'https://salsa.debian.org/tails-team/tails/commits/master/wiki/src/[[file]]'
historyurl: 'https://gitlab.tails.boum.org/tails/tails/-/commits/master/wiki/src/[[file]]'
# gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
diffurl: 'https://salsa.debian.org/tails-team/tails/commit/[[sha1_commit]]'
diffurl: 'https://gitlab.tails.boum.org/tails/tails/-/commit/[[sha1_commit]]'
# where to pull and push changes (set to empty string to disable)
gitorigin_branch: ''
# branch that the wiki is stored in
......
......@@ -2,7 +2,7 @@
# The rewrite rules used by our website now live there:
#
# https://git-tails.immerda.ch/puppet-tails/tree/templates/website/nginx/rewrite_rules.conf.erb
# https://gitlab.tails.boum.org/tails/puppet-tails/-/blob/master/templates/website/nginx/rewrite_rules.conf.erb
#
# That file documents how to use our rewrite rules locally and how to
# contribute changes.
This diff is collapsed.
This diff is collapsed.
@import url("common.css");
#pagebody {
font-family: "Source Sans Pro Regular", "DejaVu Sans", "Verdana", sans-serif;
}
h1 {
font-size: 40px;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
[[!meta title="How Tails works"]]
[[!meta stylesheet="staging/about" rel="stylesheet" title=""]]
[[!meta stylesheet="about" rel="stylesheet" title=""]]
[[!meta stylesheet="hide-breadcrumbs" rel="stylesheet" title=""]]
[[!meta robots="noindex"]]
<h1>Leave no trace on the computer</h1>
......@@ -12,15 +13,6 @@
<p><i class="metaphor">Like a tent, you can carry Tails with you and use it anywhere.</i></p>
<!--
P7: [DONE] Does not understand the USB tent
P7: [DONE] coworking-tent le parece rebuscada
P7: [DONE] Would put the computer inside the tent
P8: [DONE] Doesn't understand the USB tent
P8: [DONE] Thinks that coworking-tent is clearer
P9: [DONE] Likes better the laptop inside the tent, the others feel like you have to hide (vs. security should be normal)
-->
</div>
<div class="text order-2">
......@@ -34,17 +26,6 @@ P9: [DONE] Likes better the laptop inside the tent, the others feel like you hav
computer into a secure machine</strong>. You can also <strong>stay
safe while using the computer of somebody else</strong>.</p>
<!--
P5: [DONE] "Run it on someone else's device" are they logged out? will they lose data when I plug it in?
P6: [DONE] Stumble on "somone else's computer"
P8: [DONE] Has a hard time understand how to use Tails on a computer
P8: [WORK] Finds it interesting to make your own computer secure
P8: [DONE] Thinks that Tails works from a different partition
P9: [DONE] Is not sure about where you install it
P11: [WONT: Read almost nothing] It's talking about a Tails USB stick but how do I get one?
P11: [WONT: Read almost nothing] Unclear about whether it's a chat application, a search tool or taking your computer completely
-->
<p class="medium">Tails is a
[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]
download and takes ½ hour to install. Tails can be installed on any USB stick of 8 GB minimum.
......@@ -58,14 +39,6 @@ P11: [WONT: Read almost nothing] Unclear about whether it's a chat application,
install it from a computer with viruses or if you use it on a computer
with malicious hardware, like keyloggers.</p>
<!--
P3: [DONE] The installation of an OS takes several hours / minutes
P3: [WONT] What would be the "insecure" of macOS? I feel like Mac protects privacy Why should I bother? Is this really better?
P3: [WONT] Maybe I don't have install rights on Windows
P4: [WONT] Also... some USB sticks have viruses on them. Will Tails tell me if the USB stick is okay before I install?
P5: [DONE] "Instead of Win/mac" [had to be read twice, sentence structure] reads to them like Tails **only** works with Linux
-->
<div class="links">
<p>See also:</p>
<ul>
......@@ -85,20 +58,6 @@ P5: [DONE] "Instead of Win/mac" [had to be read twice, sentence structure] reads
[[!img amnesia.svg link="no" alt=""]]
<!--
P6: [DONE] Think that the person is taking out the trash
P7: [DONE] Doesn't understand the setting up steps
P8: [DONE] Thinks that it's a kid spinning
P8: [DONE] Doesn't understand the link between setting-up.png
P9: [DONE] El único que se acuerda es el buho
P10: [WONT] Rolling the tent could be anything. The other is more clear.
P11: [WONT] Roll is unclear about what it is: sleeping bag?
P11: [WORK] Roll is about leaving, tent is about preparing
P11: [DONE] Maybe the owl is a spy
P12: [DONE] Thinks that the guy is putting up the tent
P12: [WORK] Likes both: 1st is clearer about being empty but 2nd is easier to understand
-->
<i class="metaphor">Like a tent, Tails is amnesic: it always starts empty and leaves no trace when you leave.</i>
</div>
......@@ -124,16 +83,6 @@ P12: [WORK] Likes both: 1st is clearer about being empty but 2nd is easier to un
disk and only runs from the memory of the computer. The memory is entirely
deleted when you shutdown Tails, erasing all possible traces.</p>
<!--
P1: [DONE] Amnesia vs Persistence: not so clear...
P2: [WORK] Amnesia: didn't know the word, "like a sandbox"
P4: [DONE] What does amnesia mean?
P8: [WORK] The important part is that Tails never write anything to the hard disk
P8: [DONE] Reads the list as things that Tails deletes
P3: [WONT: Explained later] Amnesia: pros & cons. I will forget what I did, eg. good website
P5: [WORK] This property is important, means there's no connection to the existing OS!
-->
</div>
</section>
......@@ -144,16 +93,6 @@ P5: [WORK] This property is important, means there's no connection to the existi
[[!img persistent-storage.svg link="no" alt=""]]
<!--
P9: [DONE] Doesn't like the big safe
P11: [WORK] Prefers the backpack with chains because the backpack is your stuff and it is safe
The lock with key is too much about the key and not about your stuff
Keep it away. Don't touch it!
P12: [WORK] The key means that it is well closed
P12: [WORK] Prefers 2nd because it's more clear that it's my backpack
P12: [DONE] Doesn't like the big safe
-->
<i class="metaphor">Like a backpack, you can store your personal things in your Persistent Storage
and use them in your tent.</i>
......@@ -179,37 +118,6 @@ P12: [DONE] Doesn't like the big safe
</ul>
</div>
<!--
P6: I don't understand this concept of "persistent encryption" (in Spanish)
(after reading the description) You can save some of your stuff is a "storage" (in English) or something like that
Me: So what does "Persistencia" mean to you? I don't know. (even after saying that it's a kind of storage)
P7: (after reading the description) I'm not sure what this means: is it a program? an online server? or saving stuff to the USB?
P8: (after reading the description) This is not clear to me. Persistence: I understand that it's a tool
When prompted, understand the relationship between Amnesia and Persistence
P9: (only shown the title) Everything you do will be saved encrypted
Persistence sounds to me like trying to encrypt over and over again
P10: (only shown the title) You need some kind of key to be able to use Tor and everything else
Persistence is something that stays, a data that sticks with time
(shown the description) It's an algorithm for encryption with which you can save some of your stuff
P12: (only shown the title) At first, thinks that everything is encrypted
Persistence means "during a lot of time" or "very strong"
Thinks that you can decide to encrypt the whole USB stick or not
Sounds like a system of very strong passwords to make it even stronger to open your Tails
Would call it "top security encryption"
(shown "Encrypted Persistent Storage" instead) "storage" are things that you save
It's like a suitcase that stays forever
P2: [WORK] Persistence: assume it's on the USB stick
P3: [WORK] **Persistence with capital P, must be the noun of a tool**
P4: [WONT: Works for them] ( "Persistence" is not the right word; too complex for international English speakers...
P4: [DONE] Persistence and amnesia should be at the same place!
P4: [WORK] Persistence is awesome on its own: a way for me to set up an encrypted hard drive with sensitive data
P5: [DONE] Can you run your own software on this USB stick?
P5: [DONE] *Persistence* is this a user choice? Highlight the choice/option. [Relation to amnesia unclear]
P7: [DONE] Wonders whether the Persistence is online or on the USB stick
P8: [WORK] Understands the relationship between Amnesia and Persistence
-->
</div>
</section>
......@@ -260,21 +168,6 @@ P8: [WORK] Understands the relationship between Amnesia and Persistence
</ul>
</div>
<!--
P3: [DONE] "Sensitive documents": personal, office, id card
P3: [DONE] "Sometimes you see a swiss knife and you don't know how it works"
P3: [DONE] "Out-of-the-box": jargon
P3: [WORK] "Prevent mistakes" is interesting
P3: [DONE] Tools: Antivirus scan, Adblock, Another browser, Word processor ("encoding issues?")
P3: [DONE] What kind of mistakes?
P4: [DONE] *Tools* which tools? Google Docs? Video calls?
P4: [DONE] "Secure by default" what does that mean?? What are "mistakes"?
P7: [DONE] Gets lost in "It's impossible not to encrypt"
P7: [DONE] Doesn't know GnuPG
P8: [DONE] Thinks that "password manager" is to encrypt
P10: [DONE] Stumbles on 'ready-to-use'
-->
</div>
</section>
......@@ -287,15 +180,6 @@ P10: [DONE] Stumbles on 'ready-to-use'
[[!img relays.svg link="no" alt=""]]
<!--
P9: [DONE] Le gusta más sin números
P10: [WONT] Finds the bear funny
P10: [DONE] Likes the bear that represents threats
P11: [WONT] Likes the eyes better than the bear: all the eyes trying to spy on you but they can't
P12: [WONT: Contradictory feedback] Likes better the one with numbers
P12: [DONE] Gets that the image represents the Tor relays with the one with the tent, not so much with the bear
-->
</div>
<div class="text order-2">
......@@ -335,19 +219,6 @@ P12: [DONE] Gets that the image represents the Tor relays with the one with the
</ul>
</div>
<!--
P1: [DONE] Didn't know "layers"
P1: [DONE] Tails (y "los voluntarios") pueden saber que hacen sus usuarios! FBI!!!
P3: [DONE] Why so many layers of encryption, why 3?
P3: [DONE] Why volunteers? Is it sustainable? Pros & cons? Volunteers could be both innocent and useless
P4: [DONE] "3 layers of encryption" ??? what's that?
P4: [WORK] Great, feel like I can trust Tails to access Tor.
P4: [WORK] "Anything that helps me get on Tor without me having to do something special is GREAT."
P5: [DONE] "3 layers of encryption" unclear. same encryption, 3 times?
P6: [DONE] Doesn't know "relay"
P8: [DONE] Doesn't know "relay"
-->
</div>
</section>
......@@ -358,14 +229,6 @@ P8: [DONE] Doesn't know "relay"
[[!img walkie-talkie.svg link="no" alt=""]]
<!--
P9: [WONT] Doesn't like people hiding in tents
P9: [DONE] Los ojos dan un poco de miedo
P10: [DONE] Wonders whether the owl is Batman
P11: [WORK] The owl is fine here because it's watching, also with the other eyes in the bush
P12: [WORK] The card could be intercepted. The phone line could be cut.
-->
</div>
<div class="text order-1">
......@@ -392,10 +255,6 @@ P12: [WORK] The card could be intercepted. The phone line could be cut.
</ul>
</div>
<!--
P2: [DONE] Censorship: Tor but also something else? because Tor works very bad in China...
-->
</div>
</section>
......@@ -427,13 +286,6 @@ P2: [DONE] Censorship: Tor but also something else? because Tor works very bad i
keep your passwords in <i>KeePassXC</i>, have a dedicated
email account in <i>Thunderbird</i>, etc.</p>
<!--
P2: [DONE] Change identity = Change Tor IP, or something else? Change IP? Browser? Lie to service & providers? Cookies
P4: [DONE] Change my identity? How does that work? [interpreted as a special feature]
P5: [DONE] What the difference between *avoid tracking* and *anti-censorship/surveillance*?
P8: [DONE] Has a hard time thinking about what he could change his identity for
-->
</div>
</section>
......@@ -446,18 +298,6 @@ P8: [DONE] Has a hard time thinking about what he could change his identity for
[[!img blueprint.svg link="no" alt=""]]
<!--
P6: [DONE] verify-tree.png Thinks that the watchers are looking the tree grow
P9: [DONE] No habia visto la tienda en el microscopio
P9: [DONE] Like the microscope better: bigger, more scientific, etc.
P10: [WONT: We prefer "Free Software" and "public"] Wonders whether it's open source
P11: [DONE] Thinks it's a drawing for how to put up a tent
P11: [DONE] Doesn't relate the study with trust
P11: [WONT] Like better the one in the bottom because it's a person studying the tent
P12: [DONE] Doesn't like the microscope because it's outside of the universe
P12: [WONT] Like to see the person watching the plans
-->
</div>
<div class="text order-1">
......@@ -477,14 +317,6 @@ P12: [WONT] Like to see the person watching the plans
</ul>
</div>
<!--
P1: [DONE] Should put trust first in "Software for Freedom"
P2: [DONE] Transparency answers previous concerns about trust
P3: [WONT] Transparency: who have checked?
P3: [WONT: P3 is a programmer] "the code of our software" → "our code"?
P7: [DONE] verify-tree.png Says that he doesn't have the skills to verify himself
-->
</div>
</section>
......@@ -495,19 +327,6 @@ P7: [DONE] verify-tree.png Says that he doesn't have the skills to verify himsel
[[!img fire.svg link="no" alt=""]]
<!--
P8: [DONE] Finds more meaning in tent-gift over bee
P9: [WORK] Estas seguro y de gratis cuando estas en la montaña
P9: [WORK] Prefers the fire over the gift because it's not a material good
P10: [WONT] Doesn't really understand. There might be threat to the campfire: rain, etc.
P11: [WORK] After doing your stuff you are save and relax with your friends
P11: [WORK] Doesn't cost anything and you are safe and free in your life
P11: [WORK] Prefer fire because it's more human, not a material thing
P12: [DONE] Gift tent is not suited for "top security"
P12: [WORK] Fire is more about sharing but also about sharing free things, lacks something about security
P12: [WONT] There could be more contact and strength among the group
-->
</div>
<div class="text order-2">
......@@ -534,15 +353,6 @@ P12: [WONT] There could be more contact and strength among the group
</ul>
</div>
<!--
XX: [DONE] Split the first sentence: that's why
P6: [DONE] Starts reading the sentence as if these tools were included in Tails
P3: [DONE] It's ideal but no big name mentioned, organizations I know
P3: [DONE] Free software → what business model?
P4: [DONE] "shoulder of giants" not sure what that means just use logos/names to see who is in this ecosystem?
P5: [DONE] Who's supporting you? Wants to see names/logos. [Add link]
-->
</div>
</section>
......@@ -553,18 +363,6 @@ P5: [DONE] Who's supporting you? Wants to see names/logos. [Add link]
[[!img roots.svg link="no" alt=""]]
<!--
P8: [WORK] tree means strength and roots
P8: [WORK] Prefers tree because it's strong
P9: [WORK] Likes the trees and their strength. Feels the "sharing" but cannot explain why.
P9: [WORK] Prefers the trees over the fire for sharing
P10: [WONT] Would add bridges between the trees
P10: [WONT] Wonders whether sharing with projects with different goals would weaken the project
P10: [WONT: Contradictory feedback] Understands the network in trees but prefers campfire for sharing
P10: [DONE] "El que esta debajo de un arbol se moja 2 veces"
P11: [WORK] Prefers the trees because it's about networking (underground)
-->
</div>
<div class="text order-1">
......@@ -578,17 +376,14 @@ P11: [WORK] Prefers the trees because it's about networking (underground)
<p class="big">We share back our improvements with these projects
so that many more people can benefit from our work.</p>
<!--
P1: [DONE] TAILS IS BUILT ON SOLID FOUNDATIONS
P3: [WORK] Tor, Debian: big names GNOME: some user interface?
P3: [WORK] Tails is like a new generation of RedHat
-->
<div class="links">
<p>See also:</p>
<ul>
<li>[[Relationship with upstream|contribute/relationship_with_upstream]]</li>
<li>[[Contribute|contribute]]</li>
<li><a href="https://www.torproject.org/">The Tor Project</a></li>
<li><a href="https://debian.org/">Debian GNU/Linux</a></li>
<li><a href="https://www.gnome.org/">GNOME</a></li>
</ul>
</div>
......@@ -596,7 +391,7 @@ P3: [WORK] Tails is like a new generation of RedHat
</section>
<div class="button">
<div class="cfa">
[[Get Tails|install]]
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment