Be careful not to mix whitespace with content changes. These need to be two separate commits: one for the indentations and the rest for the content changes you listed.

I think this example should also contain vi.recover. Otherwise, readers might wonder where it is coming from all of a sudden after the rollback or whether it was caused by the rollback (which is not, but that might cause confusion).

While we're here, we could replace this line with sysrc:
sysrc -f /etc/sysctl.conf vfs.usermount=1

Whitespace inside <screen> and <programlisting> elements really is content. That is, it affects how the final rendered version appears, where normal whitespace like that in paragraphs does not. And the point of this whole whitespace runaround is to make sure translators only see changes to content that affects how the final rendered version looks.
So, again, whitespace inside certain elements like <screen> and <programlisting> is really content.