From d0f085d1848516dd38e65d9d05344d3cdd7b6ff0 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 02 Jul 2013 05:30:35 +0000
Subject: [PATCH] CR-1925 Fix for OPENDJ-978: Update screenshots for fixed icons
---
opendj3/src/main/docbkx/admin-guide/images/replB-data-repl.png | 0
opendj3/src/main/docbkx/admin-guide/images/replB-setup.png | 0
opendj3/src/main/docbkx/install-guide/chap-install-gui.xml | 92 +++++++++++++++++++++---------
opendj3/src/main/docbkx/install-guide/images/QuickSetup-license.png | 0
opendj3/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png | 0
opendj3/src/main/docbkx/install-guide/images/uninstall-start.png | 0
opendj3/src/main/docbkx/admin-guide/images/replB-global-admin.png | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-gendata.png | 0
opendj3/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-welcome.png | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-finished.png | 0
/dev/null | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-replopts.png | 0
opendj3/src/main/docbkx/install-guide/images/QuickSetup-review.png | 0
opendj3/src/main/docbkx/install-guide/chap-uninstall.xml | 19 +++---
opendj3/src/main/docbkx/admin-guide/chap-replication.xml | 18 ++++++
opendj3/src/main/docbkx/admin-guide/images/replA-setup.png | 0
opendj3/src/main/docbkx/install-guide/images/uninstall-finished.png | 0
opendj3/src/main/docbkx/admin-guide/images/Manage-Entries.png | 0
opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png | 0
22 files changed, 91 insertions(+), 38 deletions(-)
diff --git a/opendj3/src/main/docbkx/admin-guide/chap-replication.xml b/opendj3/src/main/docbkx/admin-guide/chap-replication.xml
index 448b28d..c4e23e3 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-replication.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-replication.xml
@@ -60,6 +60,9 @@
<imageobject>
<imagedata fileref="images/replA-setup.png" format="PNG" />
</imageobject>
+ <textobject>
+ <para>QuickSetup makes it easy to configure replication.</para>
+ </textobject>
</mediaobject>
<para>In the Topology Options screen for subsequent servers, also select
@@ -71,6 +74,9 @@
<imageobject>
<imagedata fileref="images/replB-setup.png" format="PNG" />
</imageobject>
+ <textobject>
+ <para>Subsequent servers can point to the first server at setup time.</para>
+ </textobject>
</mediaobject>
<para>You also set up a global administrator account, stored under
@@ -81,6 +87,10 @@
<imageobject>
<imagedata fileref="images/replB-global-admin.png" format="PNG" />
</imageobject>
+ <textobject>
+ <para>The global administrator account exists on all servers in the
+ replication topology.</para>
+ </textobject>
</mediaobject>
<para>You further set up what to replicate.</para>
@@ -89,6 +99,10 @@
<imageobject>
<imagedata fileref="images/replB-data-repl.png" format="PNG" />
</imageobject>
+ <textobject>
+ <para>You choose the user data to replicate. OpenDJ automatically replicates
+ administrative data and directory schema.</para>
+ </textobject>
</mediaobject>
<para>Once replication is set up, it works for all the replicas. You can
@@ -99,6 +113,10 @@
<imageobject>
<imagedata fileref="images/replA-monitor-repl.png" format="PNG" />
</imageobject>
+ <textobject>
+ <para>OpenDJ Control Panel indicates the status of data being
+ replicated.</para>
+ </textobject>
</mediaobject>
</section>
diff --git a/opendj3/src/main/docbkx/admin-guide/images/Manage-Entries.png b/opendj3/src/main/docbkx/admin-guide/images/Manage-Entries.png
index c55c71c..3b5fbd8 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/Manage-Entries.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/Manage-Entries.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png b/opendj3/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
index 7311615..a227df7 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png b/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
index f85943b..99292d8 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png b/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png
index 2538374..3577c2b 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/replA-setup.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/admin-guide/images/replB-data-repl.png b/opendj3/src/main/docbkx/admin-guide/images/replB-data-repl.png
index add4756..dee2e81 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/replB-data-repl.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/replB-data-repl.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/admin-guide/images/replB-global-admin.png b/opendj3/src/main/docbkx/admin-guide/images/replB-global-admin.png
index 5ed76c8..94a7ce1 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/replB-global-admin.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/replB-global-admin.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/admin-guide/images/replB-setup.png b/opendj3/src/main/docbkx/admin-guide/images/replB-setup.png
index 8657135..c29ffdc 100644
--- a/opendj3/src/main/docbkx/admin-guide/images/replB-setup.png
+++ b/opendj3/src/main/docbkx/admin-guide/images/replB-setup.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml b/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml
index 1d8e87d..d5e57db 100644
--- a/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml
+++ b/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml
@@ -39,10 +39,10 @@
<xinclude:include href="../shared/itemizedlist-download.xml" />
- <para>The Quick Setup and Nightly Build links use Java WebStart to let you
- perform an installation of OpenDJ directory server starting with a click in
- your web browser, which can be a great way to try OpenDJ directory server for
- the first time, or to do a quick test installation.</para>
+ <para>QuickSetup uses Java WebStart to let you perform an installation of
+ OpenDJ directory server starting with a click in your web browser, which can
+ be a great way to try OpenDJ directory server for the first time, or to do a
+ quick test installation.</para>
<note>
<para>OpenDJ directory server relies on Java 6 or later, so if your browser
@@ -62,18 +62,17 @@
<para>If the WebStart installation does not work in your browser, copy
the WebStart URL, ending in <literal>QuickSetup.jnlp</literal>, from the
- OpenDJ download page. This is the first link in the list of links for
- a version of OpenDJ. Next, pass the link as an argument to the
+ OpenDJ download page. Next, pass the link as an argument to the
<command>javaws</command> command in a terminal window to start the
installer.</para>
- <screen>$ export PATH=/path/to/java6/bin:$PATH
+ <screen>$ export PATH=/path/to/java/bin:$PATH
$ javaws <replaceable>URL-to-QuickSetup-Installer</replaceable></screen>
<para>The WebStart installer corresponds to what you start if you download
OpenDJ-<?eval ${docTargetVersion}?>.zip, unzip the file, and then run
- OpenDJ-<?eval ${docTargetVersion}?>/setup (UNIX), OpenDJ-<?eval
- ${docTargetVersion}?>\setup.bat (Windows), or QuickSetup.app (Mac OS X).</para>
+ <command>./opendj/setup</command> (UNIX), <command>opendj\setup.bat</command>
+ (Windows), or <command>opendj/QuickSetup.app</command> (Mac OS X).</para>
<para>Java WebStart launches the the QuickSetup wizard, and soon the
Welcome screen appears.</para>
@@ -82,64 +81,101 @@
<imageobject>
<imagedata fileref="images/QuickSetup-welcome.png" format="PNG" />
</imageobject>
- <caption><para>The Welcome screen appears.</para></caption>
+ <textobject>
+ <para>The Welcome screen summarizes the setup process.</para>
+ </textobject>
+ </mediaobject>
+
+ <mediaobject xml:id="figure-quicksetup-license">
+ <imageobject>
+ <imagedata fileref="images/QuickSetup-license.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>Accept the license to install OpenDJ directory server if QuickSetup
+ presents a license text.</para>
+ </textobject>
</mediaobject>
<mediaobject xml:id="figure-quicksetup-svrconf">
<imageobject>
<imagedata fileref="images/QuickSetup-svrconf.png" format="PNG" />
</imageobject>
- <caption><para>Notice in the Server Settings screen that the default ports
- are 389 or 1389 for LDAP, 4444 for administrative access.</para></caption>
+ <textobject>
+ <para>In the Server Settings screen that the default ports
+ are 389 or 1389 for LDAP, 4444 for administrative access.</para>
+ </textobject>
</mediaobject>
<mediaobject xml:id="figure-quicksetup-replopts">
<imageobject>
<imagedata fileref="images/QuickSetup-replopts.png" format="PNG" />
</imageobject>
- <caption><para>You can replicate data for high availability through the
- Topology Options screen.</para></caption>
+ <textobject>
+ <para>You can replicate data for high availability through the
+ Topology Options screen.</para>
+ </textobject>
</mediaobject>
<mediaobject xml:id="figure-quicksetup-gendata">
<imageobject>
<imagedata fileref="images/QuickSetup-gendata.png" format="PNG" />
</imageobject>
- <caption><para>Generate test data as part of server setup in the Directory
- Data screen.</para></caption>
+ <textobject>
+ <para>You can generate test data as part of server setup in the Directory
+ Data screen.</para>
+ </textobject>
</mediaobject>
<mediaobject xml:id="figure-quicksetup-jvmopts">
<imageobject>
<imagedata fileref="images/QuickSetup-jvmopts.png" format="PNG" />
</imageobject>
- <caption><para>For a real installation, you can adjust JVM parameters for
- your server, for example to allow OpenDJ to use more memory.</para></caption>
+ <textobject>
+ <para>For a real installation, you can adjust JVM parameters for
+ your server, for example to allow OpenDJ to use more memory.</para>
+ </textobject>
</mediaobject>
<mediaobject xml:id="figure-quicksetup-review">
<imageobject>
<imagedata fileref="images/QuickSetup-review.png" format="PNG" />
</imageobject>
- <caption><para>Opt to start your server when setup completes.</para></caption>
+ <textobject>
+ <para>You can opt to start your server when setup completes.</para>
+ </textobject>
</mediaobject>
<mediaobject xml:id="figure-quicksetup-finished">
<imageobject>
<imagedata fileref="images/QuickSetup-finished.png" format="PNG" />
</imageobject>
- <caption><para>Finally, click Launch Control Panel to check your newly
- installed server.</para></caption>
+ <textobject>
+ <para>Click the Launch Control Panel button to check your newly
+ installed server.</para>
+ </textobject>
</mediaobject>
- <mediaobject xml:id="figure-quicksetup-cpstart">
+ <mediaobject xml:id="figure-quicksetup-control-panel">
<imageobject>
- <imagedata fileref="images/QuickSetup-cpstart.png" format="PNG" />
+ <imagedata fileref="images/OpenDJ-Control-Panel.png" format="PNG" />
</imageobject>
- <caption><para>Run <command>OpenDJ-<?eval
- ${docTargetVersion}?>/bin/control-panel</command> (UNIX), double-click
- <command>OpenDJ-<?eval ${docTargetVersion}?>\bat\control-panel.bat</command>
- (Windows), or <command>bin/Control Panel.app</command> (Mac OS X) to launch
- the Control Panel again later.</para></caption>
+ <textobject>
+ <para>OpenDJ Control Panel offers basic administration capabilities.</para>
+ </textobject>
</mediaobject>
+
+ <itemizedlist>
+ <para>To launch OpenDJ Control Panel again later, you can run one of the
+ following, depending on your host system.</para>
+
+ <listitem>
+ <para>(Mac OS X) <command>opendj/bin/ControlPanel.app</command></para>
+ </listitem>
+ <listitem>
+ <para>(UNIX) <command>opendj/bin/control-panel</command></para>
+ </listitem>
+ <listitem>
+ <para>(Windows) <command>opendj\bat\control-panel.bat</command></para>
+ </listitem>
+ </itemizedlist>
</chapter>
diff --git a/opendj3/src/main/docbkx/install-guide/chap-uninstall.xml b/opendj3/src/main/docbkx/install-guide/chap-uninstall.xml
index d83f8de..7a44a73 100644
--- a/opendj3/src/main/docbkx/install-guide/chap-uninstall.xml
+++ b/opendj3/src/main/docbkx/install-guide/chap-uninstall.xml
@@ -38,20 +38,17 @@
<procedure xml:id="uninstall-gui">
<title>To Uninstall OpenDJ From the Graphical Uninstaller</title>
<step>
- <para>(UNIX) Run
- <command>OpenDJ-<?eval ${docTargetVersion}?>/uninstall</command>.</para>
- <para>(Windows) Double-click
- <filename>OpenDJ-<?eval ${docTargetVersion}?>\uninstall.bat</filename>.</para>
- <para>(Mac OS X) Double-click
- <filename>OpenDJ-<?eval ${docTargetVersion}?>/Uninstall.app</filename>.</para>
+ <para>(UNIX) Run <command>opendj/uninstall</command>.</para>
+ <para>(Windows) Double-click <filename>opendj\uninstall.bat</filename>.</para>
+ <para>(Mac OS X) Double-click <filename>opendj/Uninstall.app</filename>.</para>
<mediaobject xml:id="figure-uninstall-start">
<imageobject>
<imagedata fileref="images/uninstall-start.png" format="PNG" />
</imageobject>
- <caption>
+ <textobject>
<para>Select what to remove in the initial screen.</para>
- </caption>
+ </textobject>
</mediaobject>
</step>
@@ -63,6 +60,9 @@
<imageobject>
<imagedata fileref="images/uninstall-finished.png" format="PNG" />
</imageobject>
+ <textobject>
+ <para>The final screen indicates what must be removed manually.</para>
+ </textobject>
</mediaobject>
</step>
</procedure>
@@ -75,8 +75,7 @@
</step>
<step>
- <para>Run the <command>OpenDJ-<?eval ${docTargetVersion}?>/uninstall
- --cli</command> command.</para>
+ <para>Run the <command>opendj/uninstall --cli</command> command.</para>
<para>This command starts the removal program in interactive mode on the
command line, prompting you for each option. Alternatively, use additional
diff --git a/opendj3/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png b/opendj3/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png
new file mode 100644
index 0000000..a227df7
--- /dev/null
+++ b/opendj3/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-cpstart.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-cpstart.png
deleted file mode 100644
index 74e9291..0000000
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-cpstart.png
+++ /dev/null
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-finished.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-finished.png
index 9e892c9..fbedbe6 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-finished.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-finished.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-gendata.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-gendata.png
index 24e366e..2d8ae38 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-gendata.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-gendata.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png
index 4b18e19..ed5aeb2 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-license.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-license.png
new file mode 100644
index 0000000..9304569
--- /dev/null
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-license.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-replopts.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-replopts.png
index f5d85d7..51dab98 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-replopts.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-replopts.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-review.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-review.png
index 91bb182..0925ad9 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-review.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-review.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png
index b8651cc..cec86af 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-welcome.png b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-welcome.png
index b106edd..ceef256 100644
--- a/opendj3/src/main/docbkx/install-guide/images/QuickSetup-welcome.png
+++ b/opendj3/src/main/docbkx/install-guide/images/QuickSetup-welcome.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/uninstall-finished.png b/opendj3/src/main/docbkx/install-guide/images/uninstall-finished.png
index 693519b..a176a4a 100644
--- a/opendj3/src/main/docbkx/install-guide/images/uninstall-finished.png
+++ b/opendj3/src/main/docbkx/install-guide/images/uninstall-finished.png
Binary files differ
diff --git a/opendj3/src/main/docbkx/install-guide/images/uninstall-start.png b/opendj3/src/main/docbkx/install-guide/images/uninstall-start.png
index f84dbfa..cb21761 100644
--- a/opendj3/src/main/docbkx/install-guide/images/uninstall-start.png
+++ b/opendj3/src/main/docbkx/install-guide/images/uninstall-start.png
Binary files differ
--
Gitblit v1.10.0