Merge lp:~peter-petrakis/serverguide/lp-1057071 into lp:~ubuntu-core-doc/serverguide/quantal

[Peter Petrakis]

[Peter Matulis (petermatulis)]

Looks good to me.

review: Approve

[Doug Smythies (dsmythies)]

If this was approved, why wasn't it merged? Now it doesn't appear in the Raring branch. Will it appear by itself once approved, or will it have to be re-done for raring?

[Peter Petrakis (peter-petrakis)]

There's been a real disconnect in getting simple doc changes done. Don't get me started on updating
the actual rendered part of the documentation. At this point I'm letting this go, first it was get this
into quantal and I did, now raring is up and I have the same problem all over again, it's not in the current
release. None of the changes that have been merged into precise have actually been pushed into
the rendered copy.

I can write an entire chapter for the server guide but I can't get a one line change in.

[Doug Smythies (dsmythies)]

O.K. I merged this. If it does not automatically go into the Raring version, I'll do the same edit there myself.

[Doug Smythies (dsmythies)]

Oh my goodness, what have I done!!!
This Merge proposal is backwards from the actual LaunchPad bug report.
It takes something that was right and makes it wrong.
So, it should have been rejected instead of approved.
When I originally checked raring, I did so against the bug report.
When I checked raring this morning, I did so against this MP, so now have two messes to clean up.
The one that Serge did for precise was the right way around.

[Doug Smythies (dsmythies)]

This has been fixed in both quantal (rev 102) and raring (rev 103).

=== modified file 'serverguide/C/dm-multipath.xml'
--- serverguide/C/dm-multipath.xml	2012-09-26 18:15:35 +0000
+++ serverguide/C/dm-multipath.xml	2012-12-12 15:04:23 +0000
@@ -1267,7 +1267,7 @@
         -r`/kernel/drivers/scsi/device_handler/ </filename></emphasis>. The
         requisite module should be integrated into the initrd to ensure the
         necessary discovery and failover-failback capacity is available during
-        boot time. Example,<screen># echo scsi_dh_alua &gt;&gt; /etc/initramfs-tools/modules  ## append module to file
+        boot time. Example,<screen># cat scsi_dh_alua &gt;&gt; /etc/initramfs-tools/modules  ## append module to file
 # update-initramfs -u -k all</screen></para>
       </note>