From 6d5a03ac45c2818b11c401daaea9b05a39c408cb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 7 Aug 2010 20:07:57 -0400
Subject: [PATCH] Documentation

- Changed 'remote' to 'second' in the merge discussion, which matches
  the term used in the paragraph.  This avoids using the loaded term
  'remote'.
---
 doc/man/task.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man/task.1 b/doc/man/task.1
index 57b1d252a..c63633870 100644
--- a/doc/man/task.1
+++ b/doc/man/task.1
@@ -143,7 +143,7 @@ Exports all tasks in YAML 1.1 format.
 Redirect the output to a file, if you wish to save it, or pipe it to another command.
 
 .TP
-.B merge path/to/remote/undo.data
+.B merge path/to/second/undo.data
 Merges two task databases by comparing the modifications that are stored in the
 undo.data files. The location of the second undo.data file must be passed on as argument.