From dec1aef026797c6063661f6c03b9c139bf4eb32c Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 25 Jun 2013 14:16:29 +0000
Subject: [PATCH] OPENDJ-1011: Update install.txt and install.html
---
/dev/null | 53 -----------------
opends/build.xml | 9 ---
opendj3/src/main/docbkx/admin-guide/appendix-file-layout.xml | 12 ----
opends/resource/README | 51 +++++++++++++----
4 files changed, 39 insertions(+), 86 deletions(-)
diff --git a/opendj3/src/main/docbkx/admin-guide/appendix-file-layout.xml b/opendj3/src/main/docbkx/admin-guide/appendix-file-layout.xml
index c62e940..6f9715d 100644
--- a/opendj3/src/main/docbkx/admin-guide/appendix-file-layout.xml
+++ b/opendj3/src/main/docbkx/admin-guide/appendix-file-layout.xml
@@ -162,18 +162,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>install.html</filename></term>
- <listitem>
- <para>Quick installation instructions in case you are offline</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><filename>install.txt</filename></term>
- <listitem>
- <para>Text version of <filename>install.html</filename></para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><filename>instance.loc</filename></term>
<listitem>
<para>Pointer to OpenDJ on the file system, useful in installations where
diff --git a/opends/build.xml b/opends/build.xml
index 8b35ae1..dd11b45 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1188,15 +1188,6 @@
<copy todir="${pdir}">
<fileset file="${resource.dir}/README" />
</copy>
-
- <copy todir="${pdir}">
- <fileset file="${resource.dir}/install.html" />
- </copy>
-
- <copy todir="${pdir}">
- <fileset file="${resource.dir}/install.txt" />
- </copy>
-
<copy todir="${pdir}">
<fileset file="${resource.dir}/images/opendj_logo.png" />
</copy>
diff --git a/opends/resource/README b/opends/resource/README
index 3f4fbd1..10f216e 100644
--- a/opends/resource/README
+++ b/opends/resource/README
@@ -1,16 +1,43 @@
-OpenDJ
+OpenDJ - Open Source Directory Services in Java
-This archive contains OpenDJ an open source directory server in Java.
-OpenDJ is a downstream build of the OpenDS project, with a different name
-to avoid trademark issues.
-Complete documentation for this product may be found online
-at http://opendj.forgerock.org/docs.html.
+This archive contains OpenDJ, an open source, high performance, highly
+available, secure, directory server in Java.
-To configure the server, run the setup script on UNIX-based platforms, or the
-setup.bat batch file on Windows. To start the server, run bin/start-ds on
-UNIX-based platforms, or bat\start-ds.bat on Windows systems.
+This product includes software available under the Common Development and
+Distribution License (CDDL). The complete text for this license, and for
+alternate licenses of included components, may be found in the legal-notices
+directory.
-This product is made available under the Common Development and Distribution
-License (CDDL). The complete text for this license, and for alternate licenses
-of included components, may be found in the legal-notices directory.
+How To Install OpenDJ
+=====================
+Once you have downloaded and unzipped the OpenDJ directory server binaries,
+you can install OpenDJ in either of two modes:
+ * Graphical User Interface (GUI) mode. The GUI mode uses QuickSetup, a
+ Java-based graphical tool that enables you to install and configure
+ OpenDJ directory server, load it with data and get it running quickly.
+ * Interactive Command-line mode. The interactive command-line utility prompts
+ you for required information before the installation and configuration begin.
+
+Before You Install
+------------------
+ * A Java SE 6 or later runtime environment must be installed.
+ * The system must have at least 100MB of disk space and 256MB of free memory
+ to run OpenDJ directory server for evaluation purposes.
+
+To Install OpenDJ in GUI mode
+-----------------------------
+ 1. From the top level of your installation directory, run the setup command.
+ 2. Answer the questions in the installation wizard.
+
+To Install OpenDJ in Command-Line Mode
+--------------------------------------
+ 1. From the top level of your installation directory, run the setup command
+ with the --cli option:
+ (Unix, Linux) setup --cli
+ (Windows) setup.bat --cli
+ 2. Follow the prompts to provide the required installation information.
+
+
+To learn more about OpenDJ directory services, visit the project site:
+ http://opendj.forgerock.org/
diff --git a/opends/resource/install.html b/opends/resource/install.html
deleted file mode 100644
index 75fad57..0000000
--- a/opends/resource/install.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>How To Install OpenDJ</title>
-<style type="text/css">
-<!--
-body { font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #333; background-color: #fff; }
-h1 { font-size: 2.0em; font-weight: normal;
- margin-top: 0em; margin-bottom: 0em; }
-h2 { font-size: 1.7em; font-weight: normal;
- margin: 1.2em 0em .8em 0em;
- border-bottom: 1px #D9D9D9 solid; }
-h3 { font-size: 1.4em; font-weight: bold;
- margin: 1.2em 0em .8em 0em; }
-
-a:link {color:#069;text-decoration:none;}
-a:visited {color:#069;text-decoration:none;}
-a:active, a:hover {color:#069;text-decoration:underline;}
-
--->
-</style>
-</head>
-
-<body>
-
-<img src="opendj_logo.png" alt="OpenDJ pictogram" border="0" align=right>
-
-<br>
-
-<h2>How To Install OpenDJ</h2>
-<p>If you are reading this page, you have already downloaded and unzipped
-an OpenDJ build.
-<p>You can install OpenDJ in two modes:
-<ul>
- <li><b>Graphical User Interface (GUI) mode</b>. The GUI mode uses
-QuickSetup, a Java-based graphical tool that enables you to install and configure an
-OpenDJ directory server, load it with data and get it running in very little time.
- </li>
- <li><b>Interactive Command-line mode</b>. The interactive command-line utility
- prompts you for required information before the installation and configuration begin.
- </li>
-</ul>
-
-<h3>Before You Install</h3>
-A Java SE 6.0 (version 1.6.0_10) or higher runtime environment must be installed.
-It is recommended that your system have at least 100MB of disk space and
-256MB of free memory to run OpenDJ for evaluation purposes. Note that
-you can configure OpenDJ in such a way that it requires substantially
-less, or more, disk space. For more information, see the
-<a href="http://opendj.forgerock.org/doc/release-notes/index/chap-before-you-install.html">OpenDJ System Requirements</a>.
-
-<h3>To Install OpenDJ in GUI mode</h3>
-You can run QuickSetup remotely via Java Web Start, or locally from within the
-build that you have downloaded and unzipped.
-<p>If you run QuickSetup remotely, it automatically downloads and
-unzips the latest nightly build, and handles server configuration.
-
-You can find the link to Launch QuickSetup via Java Web Start on <a class="external" href="http://www.forgerock.org/opendj.html">OpenDJ builds page</a>, click [Nightly Build].
-</p>
-<p>To run QuickSetup locally:
-</p>
-<ol>
- <li>From the top level of your installation directory, type the following command:
- <span style="font-family: monospace; white-space: pre;">
-(Unix, Linux) setup
-(Windows) setup.bat
- </span>
- </li>
- <li>On Mac systems, double-click on the QuickSetup.app application to launch
- QuickSetup directly from the Finder.<br><br>
- </li>
- <li>Answer the questions in the installation wizard.
- </li>
-</ol>
-
-<h3>To Install OpenDJ in Command-Line Mode</h3>
-<ol>
- <li>From the top level of your installation directory, type the following command:
- <br>
- <span style="font-family: monospace; white-space: pre;">
-(Unix, Linux) setup --cli
-(Windows) setup.bat --cli
- </span>
- </li>
- <li>Follow the prompts to provide the required installation information.
- </li>
-</ol>
-
-<h3>See Also</h3>
-<ul>
- <li><a href="http://opendj.forgerock.org/doc/install-guide/index.html">Installing the OpenDJ directory server</a>
- <br>
- <li> <a href="http://opendj.forgerock.org/doc/install-guide/index/chap-install-gui.html">Installing OpenDJ with the QuickSetup Wizard</a>
- <br>
- </li>
- <li> <a href="http://opendj.forgerock.org/doc/install-guide/index/chap-install-cli.html">Installing OpenDJ from the Command Line</a>
- </li>
-</ul>
-</body>
-</html>
diff --git a/opends/resource/install.txt b/opends/resource/install.txt
deleted file mode 100644
index f0c443d..0000000
--- a/opends/resource/install.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-How To Install OpenDJ
-=====================
-
-If you are reading this page, you have already downloaded and unzipped an OpenDJ build.
-
-You can install OpenDJ in two modes:
-
- * Graphical User Interface (GUI) mode. The GUI mode uses QuickSetup, a Java-based graphical tool
- that enables you to install and configure an OpenDJ directory server, load it with data and get
- it running in very little time.
- * Interactive Command-line mode. The interactive command-line utility prompts you for required
- information before the installation and configuration begin.
-
-Before You Install
-------------------
-A Java SE 6.0 (version 1.6.0_10) or higher runtime environment must be installed. It is
-recommended that your system have at least 100MB of disk space and 256MB of free memory to run
-OpenDJ for evaluation purposes. Note that you can configure OpenDJ in such a way that it requires
-substantially less, or more, disk space. For more information, see the OpenDJ System Requirements
-at http://opendj.forgerock.org/doc/release-notes/index/chap-before-you-install.html.
-
-To Install OpenDJ in GUI mode
------------------------------
-You can run QuickSetup remotely via Java Web Start, or locally from within the build that you
-have downloaded and unzipped.
-
-If you run QuickSetup remotely, it automatically downloads and unzips the latest weekly build,
-and handles server configuration. To launch QuickSetup via Java Web Start, point your
-browser to http://www.forgerock.org/opendj.html and click on the [Nightly build] link.
-
-To run QuickSetup locally:
-
- 1. From the top level of your installation directory, type the following command:
- (Unix, Linux) setup (Windows) setup.bat
- 2. On Mac systems, double-click on the QuickSetup.app application to launch QuickSetup
- directly from the Finder.
- 3. Answer the questions in the installation wizard.
-
-To Install OpenDJ in Command-Line Mode
---------------------------------------
- 1. From the top level of your installation directory, type the following command:
- (Unix, Linux) setup --cli (Windows) setup.bat --cli
- 2. Follow the prompts to provide the required installation information.
-
-See Also
---------
- * Installing the OpenDJ directory server
- (http://opendj.forgerock.org/doc/install-guide/index.html)
- * Installing OpenDJ with the QuickSetup Wizard
- (http://opendj.forgerock.org/doc/install-guide/index/chap-install-gui.html)
- * Installing OpenDJ from the Command Line
- (http://opendj.forgerock.org/doc/install-guide/index/chap-install-cli.html)
-
--
Gitblit v1.10.0