From 1a5c1a41fcf6aade62271eedd3fa1365673c8e08 Mon Sep 17 00:00:00 2001 From: Mark Craig <mark.craig@forgerock.com> Date: Tue, 14 Oct 2014 06:13:44 +0000 Subject: [PATCH] Backport CR-4833 OPENDJ-1588: Note where make-ldif templates require blank likes --- opends/resource/man/man5/make-ldif.template.5 | 17 ++++++++++------- opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml | 4 ++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/opends/resource/man/man5/make-ldif.template.5 b/opends/resource/man/man5/make-ldif.template.5 index e307432..14ac4d8 100644 --- a/opends/resource/man/man5/make-ldif.template.5 +++ b/opends/resource/man/man5/make-ldif.template.5 @@ -1,13 +1,13 @@ '\" t .\" Title: make-ldif.template .\" Author: -.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 05/16/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/13/2014 .\" Manual: Tools Reference -.\" Source: OpenDJ 2.6.0 +.\" Source: OpenDJ 3.0.0-SNAPSHOT .\" Language: English .\" -.TH "MAKE\-LDIF\&.TEMPLAT" "5" "05/16/2013" "OpenDJ 2\&.6\&.0" "Tools Reference" +.TH "MAKE\-LDIF\&.TEMPLATE" "5" "10/13/2014" "OpenDJ 3\&.0\&.0" "Tools Reference" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -33,6 +33,10 @@ .sp .nf # Comment lines start with #\&. +# +# Notice that this synopsis includes blank lines after entries\&. +# In the same way you would use blank lines after entries in normal LDIF, +# leave empty lines after "entries" in template files\&. # Optionally include classes that define custom tags\&. # Custom tag classes extend org\&.opends\&.server\&.tools\&.makeldif\&.Tag and @@ -171,8 +175,7 @@ <DN> .RS 4 The DN tag gets replaced by the distinguished name of the current entry\&. An optional integer argument specifies the subcomponents of the DN to generate\&. For example, if the DN of the entry is -uid=bjensen,ou=People,dc=example,dc=com -<DN:1> +uid=bjensen,ou=People,dc=example,dc=com<DN:1> gets replaced by uid=bjensen, and <DN:\-2> @@ -534,5 +537,5 @@ /path/to/opendj/config/MakeLDIF/example\&.template .SH "COPYRIGHT" .br -Copyright \(co 2012-2013 ForgeRock AS +Copyright \(co 2012-2014 ForgeRock AS .br diff --git a/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml b/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml index 66837ec..4cc9b68 100644 --- a/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml +++ b/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml @@ -42,6 +42,10 @@ </refnamediv> <refsynopsisdiv> <synopsis># Comment lines start with #. +# +# Notice that this synopsis includes blank lines after entries. +# In the same way you would use blank lines after entries in normal LDIF, +# leave empty lines after "entries" in template files. # Optionally include classes that define custom tags. # Custom tag classes extend org.opends.server.tools.makeldif.Tag and -- Gitblit v1.10.0