From 1eb9f298bc30a5ff6d8ec23adf1fcf1af95db708 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 28 May 2013 05:47:12 +0000
Subject: [PATCH] Fix for OPENDJ-945: Document upgrade --acceptLicense option
---
opendj3/src/main/docbkx/shared/man-upgrade.xml | 7 +++++++
opends/resource/man/man1/upgrade.1 | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/opendj3/src/main/docbkx/shared/man-upgrade.xml b/opendj3/src/main/docbkx/shared/man-upgrade.xml
index 93847c1..3edb446 100644
--- a/opendj3/src/main/docbkx/shared/man-upgrade.xml
+++ b/opendj3/src/main/docbkx/shared/man-upgrade.xml
@@ -105,6 +105,13 @@
<para>The following options are supported.</para>
<variablelist>
<varlistentry>
+ <term><option>--acceptLicense</option></term>
+ <listitem>
+ <para>Automatically accepts the product license if there is one in the
+ delivery.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>--force</option></term>
<listitem>
<para>Forces a non-interactive upgrade to continue even if it requires
diff --git a/opends/resource/man/man1/upgrade.1 b/opends/resource/man/man1/upgrade.1
index 8183213..ca8dcab 100644
--- a/opends/resource/man/man1/upgrade.1
+++ b/opends/resource/man/man1/upgrade.1
@@ -2,12 +2,12 @@
.\" Title: upgrade
.\" Author:
.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 05/17/2013
+.\" Date: 05/28/2013
.\" Manual: Tools Reference
.\" Source: OpenDJ 2.6.0
.\" Language: English
.\"
-.TH "UPGRADE" "1" "05/17/2013" "OpenDJ 2\&.6\&.0" "Tools Reference"
+.TH "UPGRADE" "1" "05/28/2013" "OpenDJ 2\&.6\&.0" "Tools Reference"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -126,6 +126,11 @@
.PP
The following options are supported\&.
.PP
+\fB\-\-acceptLicense\fR
+.RS 4
+Automatically accepts the product license if there is one in the delivery\&.
+.RE
+.PP
\fB\-\-force\fR
.RS 4
Forces a non\-interactive upgrade to continue even if it requires user interaction\&. In particular, long running or critical upgrade tasks, such as re\-indexing, which require user confirmation will be skipped\&. This option may only be used with the
--
Gitblit v1.10.0