---
 man/lvconvert.8.in |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

Index: LVM2.2.02.44/man/lvconvert.8.in
===================================================================
--- LVM2.2.02.44.orig/man/lvconvert.8.in	2008-11-12 16:01:36.000000000 +0100
+++ LVM2.2.02.44/man/lvconvert.8.in	2009-02-20 14:30:57.000000000 +0100
@@ -22,6 +22,18 @@ LogicalVolume[Path] [PhysicalVolume[Path
 [\-\-version]
 .br
 OriginalLogicalVolume[Path] SnapshotLogicalVolume[Path]
+.br
+
+.br
+.B lvconvert
+\-M/\-\-merge [\-c/\-\-chunksize ChunkSize]
+[\-\-namesnapshot/\-\-nameorigin/\-\-onactivate]
+[\-b/\-\-background] [\-i/\-\-interval Seconds]
+[\-h/\-?/\-\-help]
+[\-v/\-\-verbose]
+[\-\-version]
+.br
+SnapshotLogicalVolume[Path]
 .SH DESCRIPTION
 lvconvert will change a linear logical volume to a mirror
 logical volume or to a snapshot of linear volume and vice versa.
@@ -29,7 +41,7 @@ It is also used to add and remove disk l
 .SH OPTIONS
 See \fBlvm\fP for common options.
 .br
-Exactly one of \-\-mirrors or \-\-snapshot arguments required.
+Exactly one of \-\-mirrors, \-\-snapshot or \-\-merge arguments required.
 .br
 .TP
 .I \-m, \-\-mirrors Mirrors
@@ -71,6 +83,29 @@ Power of 2 chunk size for the snapshot l
 .I \-Z, \-\-zero y|n
 Controls zeroing of the first KB of data in the snapshot.
 If the volume is read-only the snapshot will not be zeroed.
+.TP
+.I \-M, \-\-merge
+Merges a snapshot into its origin volume. One of the options \-\-namesnapshot,
+\-\-nameorigin and \-\-onactivate specifies type of merging. \-\-nameorigin
+is the default mode. While the merging is in progress, reads or writes to the
+origin appear as they were directed to the snapshot being merged. When the
+merging finishes, the merged snapshot is removed.
+.TP
+.I \-\-namesnapshot
+When merging starts, the resulting logical volume will have name, minor number
+and UUID from the snapshot. The snapshot volume may be mounted while merging
+starts, the origin volume must not be mounted. When this mode is selected, there
+must not be other snapshots, except the one that is being merged.
+.TP
+.I \-\-nameorigin
+When merging starts, the resulting logical volume will have name, minor number
+and UUID from the origin. Neither snapshot nor origin volume may be mounted
+when merging starts.
+.TP
+.I \-\-onactivate
+The snapshot will be marked for merging and the actual merging starts on
+the next activation of the logical volume. This option is useful if you want to
+merge over a volume that cannot be unmounted, for example root filesystem.
 .br
 .SH Examples
 "lvconvert -m1 vg00/lvol1"
@@ -99,6 +134,17 @@ volume.
 .br
 converts logical volume "vg00/lvol2" to snapshot of original volume "vg00/lvol1"
 
+.br
+"lvconvert -M vg00/lvol1_snap"
+.br
+merges "vg00/lvol1_snap" into its origin.
+
+.br
+"lvconvert -M --onactivate vg00/lvol0_snap; reboot"
+.br
+marks the snapshot "vg00/lvol0_snap" for merging and reboots the system.
+On next reboot, the merging operation will start.
+
 .SH SEE ALSO
 .BR lvm (8),
 .BR vgcreate (8),