Commit dc9ddf22 authored by tchou's avatar tchou
Browse files

Merge remote-tracking branch 'origin/web/assistant' into web/9385-download-and-verify-css

Conflicts:
	wiki/src/install/inc/stylesheets/assistant.css
parents 159f5ccf 4ba3d397
......@@ -14,7 +14,7 @@ Download and install
You need:
- 1 flash memory (USB stick or SD card of at least 4 GB)
- 1 USB stick (at least 4 GB)
- 30–60 minutes to download Tails ([[!inline pages="inc/stable_i386_iso_size" raw="yes"]]).
- 25 minutes to install
......
[[!meta stylesheet="bootstrap" rel="stylesheet"]]
[[!meta title="Install from another Tails"]]
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/debian-clone" rel="stylesheet" title=""]]
[[Back|install/debian]]
[[!inline pages="install/inc/overview/clone" raw="yes"]]
[[!inline pages="install/inc/steps/switch.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_temporary.inline" raw="yes"]]
[[!inline pages="install/inc/steps/verify_up-to-date.inline" raw="yes"]]
[[!inline pages="install/inc/steps/install_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/restart_final.inline" raw="yes"]]
[[!inline pages="install/inc/steps/create_persistence.inline" raw="yes"]]
......@@ -6,6 +6,6 @@ Tails is up-to-date.
You need:
- 1 friend with Tails
- 1 flash memory (USB stick or SD card of at least 4 GB)
- 1 other Tails (USB stick or DVD)
- 1 USB stick (at least 4 GB)
- 15 minutes to install
Markdown is supported
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