From 4b90f92d9db87e37284cfaf0d84b14ec1509d13f Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 06 Jan 2012 17:41:07 +0000
Subject: [PATCH] ldif-diff -> ldifdiff and changes to the synopsis
---
opendj-sdk/opendj3/src/main/docbkx/shared/man-ldifdiff.xml | 43 ++++++++++---------------------------------
1 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/man-ldif-diff.xml b/opendj-sdk/opendj3/src/main/docbkx/shared/man-ldifdiff.xml
similarity index 80%
rename from opendj-sdk/opendj3/src/main/docbkx/shared/man-ldif-diff.xml
rename to opendj-sdk/opendj3/src/main/docbkx/shared/man-ldifdiff.xml
index 77f50db..473c445 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/shared/man-ldif-diff.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/shared/man-ldifdiff.xml
@@ -23,7 +23,7 @@
! Copyright 2011-2012 ForgeRock AS
!
-->
-<refentry xml:id='ldif-diff-1'
+<refentry xml:id='ldifdiff-1'
xmlns='http://docbook.org/ns/docbook'
version='5.0' xml:lang='en'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
@@ -32,18 +32,20 @@
xmlns:xinclude='http://www.w3.org/2001/XInclude'>
<info><copyright><year>2011-2012</year><holder>ForgeRock AS</holder></copyright></info>
<refmeta>
- <refentrytitle>ldif-diff</refentrytitle><manvolnum>1</manvolnum>
+ <refentrytitle>ldifdiff</refentrytitle><manvolnum>1</manvolnum>
<refmiscinfo class="software">OpenDJ</refmiscinfo>
<refmiscinfo class="version"><?eval ${docTargetVersion}?></refmiscinfo>
</refmeta>
<refnamediv>
- <refname>ldif-diff</refname>
+ <refname>ldifdiff</refname>
<refpurpose>compare small LDIF files</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>ldif-diff</command>
- <arg choice="req">options</arg>
+ <command>ldifdiff</command>
+ <arg choice="opt">options</arg>
+ <arg choice="plain"><replaceable>source</replaceable>.ldif</arg>
+ <arg choice="plain"><replaceable>target</replaceable>.ldif</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
@@ -78,25 +80,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-o, --outputLDIF {file}</option></term>
- <listitem>
- <para>File to which the output should be written.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-O, --overwriteExisting</option></term>
- <listitem>
- <para>Any existing output file should be overwritten rather than appending
- to it.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-s, --sourceLDIF {file}</option></term>
- <listitem>
- <para>LDIF file to use as the source data.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><option>-S, --singleValueChanges</option></term>
<listitem>
<para>Each attribute-level change should be written as a separate
@@ -105,12 +88,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-t, --targetLDIF {file}</option></term>
- <listitem>
- <para>LDIF file to use as the target data.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><option>-V, --version</option></term>
<listitem>
<para>Display version information.</para>
@@ -145,7 +122,7 @@
<title>Examples</title>
<para>The following example demonstrates use of the command with two
small LDIF files.</para>
- <screen>$ cat /path/to/newuser.ldif
+ <screen>$ cat /path/to/newuser.ldif
dn: uid=newuser,ou=People,dc=example,dc=com
uid: newuser
objectClass: person
@@ -158,7 +135,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
@@ -172,7 +149,7 @@
userPassword: secret12
description: A new description.
-$ ldif-diff -s /path/to/newuser.ldif -t /path/to/neweruser.ldif
+$ ldifdiff /path/to/newuser.ldif /path/to/neweruser.ldif
dn: uid=newuser,ou=People,dc=example,dc=com
changetype: modify
add: userPassword
--
Gitblit v1.10.0