tchou authored Dec 14, 2015 and sajolida committed Jan 25, 2016

Conflicts:
	wiki/src/install/inc/steps/install_final.inline.mdwn

tchou authored Dec 13, 2015 and sajolida committed Jan 25, 2016

Maybe fixed elsewhere, but it's quick fix

tchou authored Dec 13, 2015 and sajolida committed Jan 25, 2016

I added the assistant and bootsrap while, while we are still in the assistant (done in b1d20ba6 by mistake)

This reverts commit c34fdddc.

We still need to have it duplicated in "Manual upgrade using Tails
Installer" because Tails Upgrader points to this anchor.

This is nicer for people not comfortable with editing the BIOS.

Conflicts:
	wiki/src/install/inc/steps/not_at_all.inline.mdwn

This will be useful as we'll reuse the same inlines on
/doc/first_steps/bug_reporting/tails_does_not_start at some point.

This might format PO files in a nicer way for translators.

Conflicts:
	wiki/src/install/debian.html
	wiki/src/install/debian/usb.mdwn
	wiki/src/install/debian/usb/overview.html
	wiki/src/install/expert/usb.mdwn
	wiki/src/install/expert/usb/overview.html

Conflicts:
	wiki/src/install/debian.html
	wiki/src/install/debian/usb.mdwn
	wiki/src/install/debian/usb/overview.html
	wiki/src/install/expert/usb.mdwn
	wiki/src/install/expert/usb/overview.html

Conflicts:
	wiki/src/install/inc/steps/install_final.inline.mdwn