Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into testing
Use Linux-specific variable names.
Include syslinux.exe for win32 in utils/win32/ on the ISO filesystem.

The APT config mangling is made in the chroot, as that's where all keys
corresponding to the configured APT repos can be found, and the APT pinning has
been setup. Note that, when this hook runs, the SquashFS has been generated
already, so modifying the content of the chroot at this point should not affect
the resulting ISO much.
Merge branch 'feature/7425-ship-win32-syslinux' into experimental
Rename documentation section

Since this section points directly and only to the download page, let's
call it in a similar way.
Remove ampersand

Wikipedia recommends to only use ampersand where space is limited:

https://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style#Ampersand
Merge remote-tracking branch 'origin/doc/wheezy' into testing
Merge branch 'testing' into devel
Merge branch 'devel' into experimental
Fix files ownership while copying persistence (Closes: #7216)

The previous instructions to copy the persistent data were creating personal
files that belong to root. I don't think there is a way of preserving the
original ownership using Nautilus (unless doing a "move" instead of a "copy" but
that's not what we are trying to do here).
Closing Nautilus is not enough to get back to the prompt
Merge remote-tracking branch 'origin/doc/7216-persistence-backup-permissions' into testing
Merge branch 'testing' into devel
Merge branch 'devel' into experimental