From 68d4fea882db22fbb79cb99b595074f012eb9b32 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 21 Mar 2012 17:03:27 +0000
Subject: [PATCH] Fix for OPENDJ-458: Man pages for common tools shouldn't be the same for tools in server and toolkit
---
opends/resource/man/man1/ldif-diff.1 | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/opends/resource/man/man1/ldifdiff.1 b/opends/resource/man/man1/ldif-diff.1
similarity index 80%
rename from opends/resource/man/man1/ldifdiff.1
rename to opends/resource/man/man1/ldif-diff.1
index a828a13..a86ae93 100644
--- a/opends/resource/man/man1/ldifdiff.1
+++ b/opends/resource/man/man1/ldif-diff.1
@@ -1,13 +1,13 @@
'\" t
-.\" Title: ldifdiff
+.\" Title: ldif-diff
.\" Author:
.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: January\ \&06,\ \&2012
+.\" Date: 03/21/2012
.\" Manual: Tools Reference
.\" Source: OpenDJ 2.5.0
.\" Language: English
.\"
-.TH "LDIFDIFF" "1" "January\ \&06,\ \&2012" "OpenDJ 2\&.5\&.0" "Tools Reference"
+.TH "LDIF\-DIFF" "1" "03/21/2012" "OpenDJ 2\&.5\&.0" "Tools Reference"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,10 +28,10 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-ldifdiff \- compare small LDIF files
+ldif-diff \- compare small LDIF files
.SH "SYNOPSIS"
-.HP \w'\fBldifdiff\fR\ 'u
-\fBldifdiff\fR [\fIsource\fR\&.ldif] [\fItarget\fR\&.ldif] [options]
+.HP \w'\fBldif\-diff\fR\ 'u
+\fBldif\-diff\fR {options}
.SH "DESCRIPTION"
.PP
This utility can be used to compare two LDIF files and report the differences in LDIF format\&.
@@ -54,11 +54,31 @@
File containing a list of entries (DN) to ignore when computing the difference\&.
.RE
.PP
+\fB\-o, \-\-outputLDIF {file}\fR
+.RS 4
+File to which the output should be written\&.
+.RE
+.PP
+\fB\-O, \-\-overwriteExisting\fR
+.RS 4
+Any existing output file should be overwritten rather than appending to it\&.
+.RE
+.PP
+\fB\-s, \-\-sourceLDIF {file}\fR
+.RS 4
+LDIF file to use as the source data\&.
+.RE
+.PP
\fB\-S, \-\-singleValueChanges\fR
.RS 4
Each attribute\-level change should be written as a separate modification per attribute value rather than one modification per entry\&.
.RE
.PP
+\fB\-t, \-\-targetLDIF {file}\fR
+.RS 4
+LDIF file to use as the target data\&.
+.RE
+.PP
\fB\-V, \-\-version\fR
.RS 4
Display version information\&.
@@ -87,7 +107,7 @@
.RS 4
.\}
.nf
-$ cat /path/to/newuser\&.ldif
+$ cat /path/to/newuser\&.ldif
dn: uid=newuser,ou=People,dc=example,dc=com
uid: newuser
objectClass: person
@@ -100,7 +120,7 @@
mail: newuser@example\&.com
userPassword: changeme
-$ cat /path/to/neweruser\&.ldif
+$ cat /path/to/neweruser\&.ldif
dn: uid=newuser,ou=People,dc=example,dc=com
uid: newuser
objectClass: person
@@ -114,7 +134,7 @@
userPassword: secret12
description: A new description\&.
-$ ldifdiff /path/to/newuser\&.ldif /path/to/neweruser\&.ldif
+$ ldif\-diff \-s /path/to/newuser\&.ldif \-t /path/to/neweruser\&.ldif
dn: uid=newuser,ou=People,dc=example,dc=com
changetype: modify
add: userPassword
--
Gitblit v1.10.0