[Merge] lp:~dsmythies/installation-guide/lp1169800 into lp:ubuntu/installation-guide

[Doug Smythies]

Those conflicts and the diff size does not make sense to me. It was only a few lines of difference in 3 or 4 files.

I was just trying to help, but must have done somthing wrong.
I have the results from "bzr diff" from earlier, I'll attach to the bug report.
-- 
https://code.launchpad.net/~dsmythies/installation-guide/lp1169800/+merge/159288
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~dsmythies/installation-guide/lp1169800 into lp:ubuntu/installation-guide.