# HG changeset patch
# User Padraig O'Briain <padraig.obriain@sun.com>
# Date 1239302006 -3600
# Node ID 37317ca76af31725a14078b65c48abaf0dae3c26
# Parent  4a3a17ce4334dfe4a9252111cc93d81a1aa050b5
7745 PM Help requires changes first revision
7924 Release notes link should be in PM Online Help

diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/Makefile
--- a/src/gui/Makefile	Thu Apr 09 08:23:57 2009 +0100
+++ b/src/gui/Makefile	Thu Apr 09 19:33:26 2009 +0100
@@ -133,8 +133,12 @@
 
 STATICHELPFILES = \
 	$(HELP_LOCALES:%=help/%/legal.xml) \
+	$(HELP_LOCALES:%=help/%/other-trademarks.xml) \
+	$(HELP_LOCALES:%=help/%/sun-trademarks.xml) \
 	$(C_ONLY_HELP_LOCALES:%=help/%/figures/update_all.png) \
-	$(C_ONLY_HELP_LOCALES:%=help/%/figures/package_manager.png)
+	$(C_ONLY_HELP_LOCALES:%=help/%/figures/pm_pkglist.png) \
+	$(C_ONLY_HELP_LOCALES:%=help/%/figures/pm_store.png) \
+	$(C_ONLY_HELP_LOCALES:%=help/%/figures/wi_start.png)
 
 STATICSPFILES = \
 	$(SP_LOCALES:%=data/startpagebase/%/startpage_star.png) \
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/figures/package_manager.png
Binary file src/gui/help/C/figures/package_manager.png has changed
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/figures/pm_pkglist.png
Binary file src/gui/help/C/figures/pm_pkglist.png has changed
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/figures/pm_store.png
Binary file src/gui/help/C/figures/pm_store.png has changed
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/figures/update_all.png
Binary file src/gui/help/C/figures/update_all.png has changed
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/figures/wi_start.png
Binary file src/gui/help/C/figures/wi_start.png has changed
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/legal.xml
--- a/src/gui/help/C/legal.xml	Thu Apr 09 08:23:57 2009 +0100
+++ b/src/gui/help/C/legal.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -1,37 +1,37 @@
-<!-- Fragment document type declaration subset:
-ArborText, Inc., 1988-2002, v.4002
-<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN" [
-<!ENTITY sun-trademarks SYSTEM "sun-trademarks.sgm">
-<!ENTITY other-trademarks SYSTEM "other-trademarks.sgm">
-]>
--->
-<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(>
-<!-- @(#)legal.sgm 1.16 05/09/22 SMI; read only legal wrapper -->
-<para>Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual
-property rights may include one or more U.S. patents or pending patent applications in the U.S. and in other countries.</para><para>U.S. Go<?Pub Caret>vernment Rights &ndash; Commercial software.  Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.</para><para>
-This distribution may include materials developed by third parties.</para>
-<para>Parts of the product may be derived from Berkeley BSD systems, licensed from the University of California. UNIX is a registered trademark in the U.S. and other countries, exclusively
-licensed through X/Open Company, Ltd.</para>
-<para>Sun, Sun Microsystems, the Sun logo,
-the Solaris logo, the Java Coffee Cup logo, docs.sun.com, &sun-trademarks;Java, and
-Solaris are trademarks or registered trademarks of Sun Microsystems, Inc. or its subsidiaries in the U.S.
-and other countries. All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc. in the U.S. and other countries.
-Products bearing SPARC trademarks are based upon an architecture developed by Sun
-Microsystems, Inc. &other-trademarks;</para>
-<para>The OPEN LOOK and <trademark>Sun</trademark> Graphical User Interface was developed by Sun Microsystems, Inc. for
-its users and licensees. Sun acknowledges the pioneering efforts of Xerox in researching
-and developing the concept of visual or graphical user interfaces for the computer
-industry. Sun holds a non-exclusive license from Xerox to the Xerox Graphical User
-Interface, which license also covers Sun's licensees who implement OPEN LOOK GUIs
-and otherwise comply with Sun's written license agreements.</para>
-<para>Products covered by and information contained in this publication are controlled by U.S. Export Control
-laws and may be subject to the export or import laws in other countries. Nuclear,
-missile, chemical or biological weapons or nuclear maritime end uses or end users,
-whether direct or indirect, are strictly prohibited. Export or reexport to countries
-subject to U.S. embargo or to entities identified on U.S. export exclusion lists,
-including, but not limited to, the denied persons and specially designated nationals
-lists is strictly prohibited.</para>
-<para>DOCUMENTATION IS PROVIDED &ldquo;AS IS&rdquo; AND ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT,
-ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.</para>
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN" [
+<!ENTITY sun-trademarks SYSTEM "sun-trademarks.sgm">
+<!ENTITY other-trademarks SYSTEM "other-trademarks.sgm">
+]>
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(>
+<!-- @(#)legal.sgm 1.16 05/09/22 SMI; read only legal wrapper -->
+<para>Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual
+property rights may include one or more U.S. patents or pending patent applications in the U.S. and in other countries.</para><para>U.S. Go<?Pub Caret>vernment Rights &ndash; Commercial software.  Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.</para><para>
+This distribution may include materials developed by third parties.</para>
+<para>Parts of the product may be derived from Berkeley BSD systems, licensed from the University of California. UNIX is a registered trademark in the U.S. and other countries, exclusively
+licensed through X/Open Company, Ltd.</para>
+<para>Sun, Sun Microsystems, the Sun logo,
+the Solaris logo, the Java Coffee Cup logo, docs.sun.com, &sun-trademarks;Java, and
+Solaris are trademarks or registered trademarks of Sun Microsystems, Inc. or its subsidiaries in the U.S.
+and other countries. All SPARC trademarks are used under license and are trademarks
+or registered trademarks of SPARC International, Inc. in the U.S. and other countries.
+Products bearing SPARC trademarks are based upon an architecture developed by Sun
+Microsystems, Inc. &other-trademarks;</para>
+<para>The OPEN LOOK and <trademark>Sun</trademark> Graphical User Interface was developed by Sun Microsystems, Inc. for
+its users and licensees. Sun acknowledges the pioneering efforts of Xerox in researching
+and developing the concept of visual or graphical user interfaces for the computer
+industry. Sun holds a non-exclusive license from Xerox to the Xerox Graphical User
+Interface, which license also covers Sun's licensees who implement OPEN LOOK GUIs
+and otherwise comply with Sun's written license agreements.</para>
+<para>Products covered by and information contained in this publication are controlled by U.S. Export Control
+laws and may be subject to the export or import laws in other countries. Nuclear,
+missile, chemical or biological weapons or nuclear maritime end uses or end users,
+whether direct or indirect, are strictly prohibited. Export or reexport to countries
+subject to U.S. embargo or to entities identified on U.S. export exclusion lists,
+including, but not limited to, the denied persons and specially designated nationals
+lists is strictly prohibited.</para>
+<para>DOCUMENTATION IS PROVIDED &ldquo;AS IS&rdquo; AND ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
+IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT,
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.</para>
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/C/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/package-manager.xml.in
--- a/src/gui/help/C/package-manager.xml.in	Thu Apr 09 08:23:57 2009 +0100
+++ b/src/gui/help/C/package-manager.xml.in	Thu Apr 09 19:33:26 2009 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
-<book id="pkgmgr" label="beta" lang="en"><title>OpenSolaris 2009.06 Package Manager Online Help</title>
+<book id="pkgmgr" label="fcs" lang="en"><title>OpenSolaris 2009.06 Package Manager Online Help</title>
 <bookinfo><authorgroup><author><firstname>OpenSolaris</firstname>
 <surname>Publications</surname>
 </author>
@@ -24,46 +24,66 @@
 <para>Sun Microsystems, Inc. détient les droits de propriété intellectuelle relatifs à la technologie incorporée dans le produit qui est décrit dans ce document. En particulier, et ce sans limitation, ces droits de propriété intellectuelle peuvent inclure un ou plusieurs brevets américains ou des applications de brevet en attente aux Etats-Unis et dans d'autres pays.</para>
 <para>Cette distribution peut comprendre des composants développés par des tierces personnes.</para>
 <para>Certaines composants de ce produit peuvent être dérivées du logiciel Berkeley BSD, licenciés par l'Université de Californie. UNIX est une marque déposée aux Etats-Unis et dans d'autres pays; elle est licenciée exclusivement par X/Open Company, Ltd. </para>
-<para>Sun, Sun Microsystems, le logo Sun, le logo Solaris, le logo Java Coffee Cup, docs.sun.com, Java et Solaris sont des marques de fabrique ou des marques déposées de Sun Microsystems, Inc., ou ses filiales, aux Etats-Unis et dans d'autres pays. Toutes les marques SPARC sont utilisées sous licence et sont des marques de fabrique ou des marques déposées de SPARC International, Inc. aux Etats-Unis et dans d'autres pays. Les produits portant les marques SPARC sont basés sur une architecture développée par Sun Microsystems, Inc.</para>
+<para>Sun, Sun Microsystems, le logo Sun, le logo Solaris, le logo Java Coffee Cup, docs.sun.com, Java et Solaris sont des marques de fabrique ou des marques déposées de Sun Microsystems, Inc., ou ses filiales, aux Etats-Unis et dans d'autres pays. Toutes les marques SPARC sont utilisées sous licence et sont des marques de fabrique ou des marques déposées de SPARC International, Inc. aux Etats-Unis et dans d'autres pays. Les produits portant les marques SPARC sont basés sur une architecture développée par Sun Microsystems, Inc. </para>
 <para>L'interface d'utilisation graphique OPEN LOOK et Sun a été développée par Sun Microsystems, Inc. pour ses utilisateurs et licenciés. Sun reconnaît les efforts de pionniers de Xerox pour la recherche et le développement du concept des interfaces d'utilisation visuelle ou graphique pour l'industrie de l'informatique. Sun détient une licence non exclusive de Xerox sur l'interface d'utilisation graphique Xerox, cette licence couvrant également les licenciés de Sun qui mettent en place l'interface d'utilisation graphique OPEN LOOK et qui, en outre, se conforment aux licences écrites de Sun.</para>
 <para>Les produits qui font l'objet de cette publication et les informations qu'il contient sont régis par la legislation américaine en matière de contrôle des exportations et peuvent être soumis au droit d'autres pays dans le domaine des exportations et importations. Les utilisations finales, ou utilisateurs finaux, pour des armes nucléaires, des missiles, des armes chimiques ou biologiques ou pour le nucléaire maritime, directement ou indirectement, sont strictement interdites. Les exportations ou réexportations vers des pays sous embargo des Etats-Unis, ou vers des entités figurant sur les listes d'exclusion d'exportation américaines, y compris, mais de manière non exclusive, la liste de personnes qui font objet d'un ordre de ne pas participer, d'une façon directe ou indirecte, aux exportations des produits ou des services qui sont régis par la legislation américaine en matière de contrôle des exportations et la liste de ressortissants spécifiquement designés, sont rigoureusement interdites.</para>
 <para>LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS, DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON. </para>
 </legalnotice>
 </bookinfo>
-<chapter><title>OpenSolaris 2009.06 Package Manager </title>
-<sect1 id="abt_pkgmgr"><title>About the Package Manager</title>
+<chapter><title>About the Package Manager</title>
 <para>Welcome to the <trademark>OpenSolaris</trademark> 2009.06 Package Manager online help!</para>
 <para>Use this help contents to learn how to use the Package Manager. Navigate through this help by clicking the topics displayed in the sidebar.</para>
-<para>The OpenSolaris 2009.06 Package Manager application is a graphical user interface for the Image Packaging System (IPS) software. </para>
+<para>The OpenSolaris 2009.06 Package Manager application is a graphical user interface for the Image Packaging System (IPS) software.</para>
 <para>The Package Manager enables you to perform the following tasks:</para>
-<itemizedlist><listitem><para>Search, install, and remove packages.</para>
+<itemizedlist><listitem><para>Search, install, and remove packages</para>
 </listitem>
-<listitem><para>Add and modify repositories.</para>
+<listitem><para>Update your system</para>
 </listitem>
-<listitem><para>Create, remove, and manage boot environments.</para>
+<listitem><para>Add and modify repositories</para>
+</listitem>
+<listitem><para>Create, remove, and manage boot environments</para>
 </listitem>
 </itemizedlist>
-<note><para>See the <xref linkend="glossary"/> for definitions of the terms used in this document.</para>
+<note><para>See the <xref linkend="glossary"/> for a definition of the terms used in this document.</para>
 </note>
-</sect1>
-<sect1 id="abt_ips"><title>About Image Packaging System (IPS)</title>
-<sect2 id="gikcw"><title>An Introduction to IPS</title>
-<para>The Image Packaging System software is a network-centric packaging system written in Python. IPS is an attempt to design and implement a software delivery system that interacts with a network repository. The IPS software is a framework which provides for software lifecycle management including installation, upgrade, and removal.</para>
+<sect1 id="gikcw"><title>About Image Packaging System</title>
+<para>Image Packaging System (IPS) is a software delivery system that interacts with a network repository. The IPS software is a framework which provides for software lifecycle management including installation, upgrade, and removal.</para>
 <para>The OpenSolaris 2009.06 release uses IPS as its packaging system.</para>
-<para>After an initial installation of OpenSolaris 2009.06 operating system, you will find that many of the software applications that you use on a regular basis are not immediately available to you. These software applications are available as packages in a repository for downloading and installing over the internet. A repository is a source for packages.</para>
-<para>Users can use IPS to install packages from a repository, create and publish their own IPS packages, set up an OpenSolaris repository, mirror an existing repository, and publish existing packages to a repository.</para>
+<para>After an initial installation of OpenSolaris 2009.06 operating system, you will find that many of the software applications that you use on a regular basis are not immediately available to you. These software applications are available as packages in a repository for downloading and installing over the Internet. A repository is a source for packages.</para>
+<para>Users can use IPS to install packages from a repository, create and publish their own IPS packages, mirror an existing repository, and publish existing packages to a repository.</para>
 <para>Once you have installed packages, IPS enables you to search, update, and manage packages on your system.</para>
 <para>With IPS , you can upgrade your system to a newer build of OpenSolaris, install and update your software to the latest available versions in a repository, and retrieve packages from mirror repositories. </para>
+<note><para><emphasis role="strong">The Package Manager provides a subset of the tasks that can be performed from the command-line.</emphasis></para>
+</note>
 <para>If the system on which IPS is installed is on the network, IPS can automatically access the OpenSolaris repository. For the OpenSolaris 2009.06 release, your IPS client can access the packages from <ulink url="http://pkg.opensolaris.org"></ulink>. </para>
-<para>See the Image Packaging System Guide for more information about IPS.</para>
+<para>For more information about IPS, see the <ulink url="http://dlc.sun.com/osol/docs/content/2009.06/IMGPACKAGESYS/">Image Packaging System Guide</ulink> and the IPS <ulink url="http://opensolaris.org/sc/src/pkg/gate/src/man/">man pages</ulink>.</para>
 <para>Visit the <ulink url="http://opensolaris.org/os/project/pkg">project page</ulink> on opensolaris.org and subscribe to pkg-discuss@sun.com to get involved with the IPS project.</para>
-</sect2>
 </sect1>
 <sect1 id="pm_win"><title>The Package Manager Window</title>
 <sect2 id="gijpl"><title>About the Package Manager Window</title>
 <para>When you start the Package Manager, the following window is displayed. </para>
-<figure id="gijpx"><title>Package Manager Main Window</title>
-<mediaobject><imageobject><imagedata fileref="figures/package_manager.png" /></imageobject>
+<figure id="gijpx"><title>Package Manager Start Up Window</title>
+<mediaobject><imageobject><imagedata fileref="figures/pm_store.png" /></imageobject>
+</mediaobject>
+</figure>
+<para>The Start Page provides links to <ulink url="http://opensolaris.com">opensolaris.com</ulink> page where you can get more information about OpenSolaris, subscribe to newsletters and join the OpenSolaris community.</para>
+<para>To close the Start Page and see the list of packages , perform any of the following actions in the main window of the Package Manager:</para>
+<itemizedlist><listitem><para>Select a package category</para>
+</listitem>
+<listitem><para>Switch the top level category</para>
+</listitem>
+<listitem><para>Switch the <literal>Show</literal> filter</para>
+</listitem>
+<listitem><para>Perform a search</para>
+</listitem>
+<listitem><para>Change the repository</para>
+</listitem>
+</itemizedlist>
+<para>Select <menuchoice><guimenu>View</guimenu><guimenuitem>Start Page</guimenuitem></menuchoice> to return to the Start Page at anytime.</para>
+<note><para>See the <xref linkend="edit_prefs"/> section to turn off the <emphasis role="strong">initial display</emphasis> of the Start Page when the Package Manager starts.</para>
+</note>
+<figure id="gilgx"><title>List of Packages in the Package Manager Window</title>
+<mediaobject><imageobject><imagedata fileref="figures/pm_pkglist.png" /></imageobject>
 </mediaobject>
 </figure>
 <para>The main window of the Package Manager consists of the following elements :</para>
@@ -73,15 +93,15 @@
 </listitem>
 </varlistentry>
 <varlistentry><term><emphasis role="strong">Toolbar</emphasis></term>
-<listitem><para>The toolbar contains the icons for a subset of the commands that can be performed by using the menus on the menubar. Additionally, a <guilabel>Search</guilabel> box and a <guilabel>Repositories</guilabel> drop-down menu are also located on the toolbar.</para>
+<listitem><para>The toolbar contains the icons for a subset of the commands that can be performed by using the menus on the menubar. A<literal>Search</literal> box is also located on the toolbar.</para>
 </listitem>
 </varlistentry>
 <varlistentry><term><emphasis role="strong">List of Packages by Category</emphasis></term>
-<listitem><para>You can browse the available packages by category in the left hand side drop-down menu. The drop-down menu shows the list of categories available such as <emphasis role="strong">Applications-Desktop</emphasis>, <emphasis role="strong">Applications Web based</emphasis>, and <emphasis role="strong">Operating System</emphasis>.</para>
+<listitem><para>You can browse the available packages by category in the left hand side drop-down menu. The drop-down menu shows the list of categories available such as <emphasis role="strong">Applications-Desktop</emphasis>, <emphasis role="strong">Applications –Web—based</emphasis>, and <emphasis role="strong">Operating System</emphasis>.</para>
 </listitem>
 </varlistentry>
 <varlistentry><term><emphasis role="strong">List of Packages by Status</emphasis></term>
-<listitem><para>The <guilabel>Show</guilabel> drop-down menu enables you to filter the list of packages by the following options :</para>
+<listitem><para>The <literal>Show</literal> drop-down menu enables you to filter the list of packages by the following options :</para>
 <itemizedlist><listitem><para><emphasis role="strong">All Packages</emphasis> – Shows the list of all packages available in the current repository.</para>
 </listitem>
 <listitem><para><emphasis role="strong">Installed Packages</emphasis> – Shows the list of packages installed on your system.</para>
@@ -104,14 +124,12 @@
 </listitem>
 </varlistentry>
 <varlistentry><term><emphasis role="strong">Repository Drop-down Menu</emphasis></term>
-<listitem><para>The list of available repositories is shown in the repository drop-down menu. Click a repository name to select it.</para>
-<note><para>Clicking the <guilabel>Reload</guilabel> button reloads the Package Manager and displays the list of packages in the newly selected repository.</para>
-</note>
+<listitem><para>The list of available repositories is shown in the <literal>Repository</literal> drop-down menu. Click a repository name to select it.</para>
 </listitem>
 </varlistentry>
 <varlistentry><term><emphasis role="strong">Search Box</emphasis></term>
 <listitem><para>Search for a package is provided in the following contexts :</para>
-<itemizedlist><listitem><para>Search within the current, default repository</para>
+<itemizedlist><listitem><para>Search within the current repository</para>
 </listitem>
 <listitem><para>Search across all configured repositories</para>
 </listitem>
@@ -120,60 +138,50 @@
 </varlistentry>
 </variablelist>
 </sect2>
-<sect2 id="edit_prefs"><title>Edit Preferences</title>
+<sect2 id="edit_prefs"><title>Start Page Preferences</title>
 <para>A Start Page is displayed in the main window of the Package Manager when the application is started. The Start Page provides links to <ulink url="http://opensolaris.com">opensolaris.com</ulink> page where you can get more information about OpenSolaris, subscribe to newsletters and join the OpenSolaris community.</para>
 <para>You can choose to turn off this setting so this page is not displayed when Package Manager starts.</para>
-<para>Select <guimenu>Edit</guimenu> <guisubmenu>Preferences</guisubmenu> from the menu and uncheck the <emphasis role="strong">Show Start Page on startup</emphasis> box to disable the Start Page.</para>
+<para>Select <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice> from the menu and uncheck the <emphasis role="strong">Show Start Page on startup</emphasis> box to disable the Start Page.</para>
+<para>Select <menuchoice><guimenu>View</guimenu><guimenuitem>Start Page</guimenuitem></menuchoice> to go to the Start Page at anytime.</para>
 </sect2>
 </sect1>
 <sect1><title>Working With Packages</title>
 <sect2 id="install_pkg"><title>Install a Package</title>
-<para>Perform the following steps to install a package:</para>
-<orderedlist><listitem><para>In the main window of the <application>Package Manager</application>, click the <guibutton>Reload</guibutton> button to view the latest list of packages available to you.</para>
+<para>The list of packages is displayed in the main windows of the Package Manager. Perform the following steps to install a package:</para>
+<orderedlist><listitem><para>To install a single package, click on a package to select it. To install many packages, check the box next to the packages you want to install.</para>
 </listitem>
-<listitem><para>Select a package.</para>
-</listitem>
-<listitem><para>Click <guibutton>Install/Update</guibutton> in the toolbar to start the package installation process.</para>
+<listitem><para>Click the <guibutton>Install/Update</guibutton> icon in the toolbar to start the package installation process.</para>
 <para>You can also choose <menuchoice><guimenu>Package</guimenu><guimenuitem>Install/Update</guimenuitem></menuchoice> to start the package installation process.</para>
 </listitem>
-<listitem><para>View the details or cancel the package installation </para>
+<listitem><para>View the details or cancel the package installation .</para>
 <itemizedlist><listitem><para>Click <guilabel>Show Details</guilabel> to view the details.</para>
 </listitem>
 <listitem><para>Click <guibutton>Cancel</guibutton> to cancel the package installation. No changes are made and you are returned to the main window. </para>
 </listitem>
 </itemizedlist>
 </listitem>
-<listitem><para>Review the package installation information and the package dependencies details in the <guilabel>Install Confirmation</guilabel> dialog.</para>
-<itemizedlist><listitem><para>Click <guibutton>Next</guibutton> to proceed with the package installation.</para>
-</listitem>
-<listitem><para>Click <guibutton>Cancel</guibutton> to cancel the package installation. No changes are made and you are returned to the main window.</para>
-</listitem>
-</itemizedlist>
-</listitem>
-<listitem><para>Click <guibutton>Cancel</guibutton> to cancel the package installation in the <guilabel>Downloading Packages</guilabel> dialog box. </para>
-<para>No changes are made and you are returned to the main window.</para>
-</listitem>
-<listitem><para>Check the <guilabel>Accept</guilabel> box and click <guibutton>Accept</guibutton> to accept the terms of the license and complete the package installation successfully.</para>
-<warning role="caution"><para> If you reject the license, the installation process is canceled and the packages will not be installed.</para>
-</warning>
+<listitem><para>After the installation has completed, click <guibutton>Close</guibutton> on the <literal>Installation Completed</literal> dialog box to return to the main window.</para>
 </listitem>
 </orderedlist>
+<subtopic id="gilxb"><title>Installation Error</title>
+<para>If an error occurs during package installation, an error dialog box is displayed. An <guilabel>Installation Failed</guilabel> message and the reason for the failure is displayed. Click <guibutton>Close</guibutton> to close the error dialog box and return to the main window of the Package Manager.</para>
+</subtopic>
 </sect2>
 <sect2 id="remove_pkg"><title>Remove a Package</title>
 <para>Perform the following steps to remove a package:</para>
-<orderedlist><listitem><para>Select the package or packages that you want to remove.</para>
+<orderedlist><listitem><para>To remove a single package, click on a package to select it. To remove many packages, check the box next to the packages you want to remove.</para>
 </listitem>
-<listitem><para>Click the <guibutton>Remove</guibutton> button in the toolbar to start the process.</para>
+<listitem><para>Click the <guibutton>Remove</guibutton> button in the toolbar to start the package uninstallation process.</para>
 <para>You can also choose <menuchoice><guimenu>Package</guimenu><guimenuitem>Remove</guimenuitem></menuchoice> to remove a package.</para>
 </listitem>
-<listitem><para>Review the packages to be removed and the package dependencies details in the <guilabel>Remove Confirmation</guilabel> dialog box.</para>
+<listitem><para>Review the packages to be removed and the package dependencies details in the <literal>Remove Confirmation</literal> dialog box.</para>
 </listitem>
 <listitem><para>Uninstall the package or cancel the uninstallation process.</para>
 <itemizedlist><listitem><para>Click <guibutton>Proceed</guibutton> to start uninstalling the packages.</para>
 </listitem>
 <listitem><para>Click <guibutton>Cancel</guibutton> to cancel the process. No changes are made and you are returned to the main window.</para>
-<warning role="caution"><para>After you click the <guibutton>Proceed</guibutton> button, you cannot undo the package removal action.</para>
-</warning>
+<note><para>After you click the <guibutton>Proceed</guibutton> button, you cannot undo the package removal action. However, you can reinstall the package at any time.</para>
+</note>
 </listitem>
 </itemizedlist>
 </listitem>
@@ -181,15 +189,8 @@
 </sect2>
 <sect2 id="search_pkg"><title>Search for a Package</title>
 <para>You can search for a package in the following ways :</para>
-<itemizedlist><listitem><para><emphasis role="strong">Search the default repository</emphasis> – The search will be performed on the default repository, <emphasis role="strong">http://pkg.opensolaris.org</emphasis>.</para>
-</listitem>
-<listitem><para><emphasis role="strong">Search the current repository</emphasis> – </para>
-</listitem>
-<listitem><para><emphasis role="strong">Search all repositories</emphasis>– Search for the package across all configured or registered repositories. </para>
-</listitem>
-</itemizedlist>
-<para>Type the name of the package that you want to search for in the <guilabel>Search</guilabel> box. </para>
-<para>Enter the complete name, description, or a partial name to search for the package. For example, you might type one of the following search terms to search for <filename>SUNWgnome-games</filename> :</para>
+<itemizedlist><listitem><para><emphasis role="strong">Search the current repository</emphasis> – Search for a package in the repository currently selected in the <literal>Repository</literal> drop-down menu. The category selection or the <literal>Show</literal> filter does not affect the search and the search is performed on all packages in the currently selected repository.</para>
+<para>Enter a description, or a partial name in the <literal>Search</literal> box located on the toolbar. For example, you might type one of the following search terms to search for <filename>SUNWgnome-games</filename> :</para>
 <itemizedlist><listitem><para>SUNWgames</para>
 </listitem>
 <listitem><para>games</para>
@@ -197,9 +198,29 @@
 <listitem><para>GNOME-games</para>
 </listitem>
 </itemizedlist>
-<tip><itemizedlist><listitem><para>Use the submenus under the <menuchoice><guimenu>Edit</guimenu></menuchoice> menu to cut, copy, paste, or clear text in the <guilabel>Search</guilabel> tab.</para>
+<para>To search for SunStudio compilers, you might type one of the following terms:</para>
+<itemizedlist><listitem><para>compiler</para>
+</listitem>
+<listitem><para>tools</para>
+</listitem>
+</itemizedlist>
 </listitem>
-<listitem><para>Use the icon on the right side of the <guilabel>Search</guilabel> tab to clear the search results.</para>
+<listitem><para><emphasis role="strong">Search all repositories</emphasis> – Select the multi-repository icon in the <literal>Search</literal> box to search for the package across all configured or registered repositories.</para>
+<note><para>The multi-repository search currently supports search based on the package description only.</para>
+</note>
+<para>Type a description of the package in the box. For example, the <filename>SUNWdiveintopython</filename> package is a book on Python programming. The description of the package contains <emphasis>book</emphasis>. To search for this package, you might then type one of the following terms:</para>
+<itemizedlist><listitem><para>python</para>
+</listitem>
+<listitem><para>book</para>
+</listitem>
+</itemizedlist>
+<note><para>If you searched for the term <emphasis>dive</emphasis> in the multi-repository search, the <filename>SUNWdiveintopython</filename> package will not be displayed as the term is not present in the package description.</para>
+</note>
+</listitem>
+</itemizedlist>
+<tip><itemizedlist><listitem><para>Use the submenus under the <menuchoice><guimenu>Edit</guimenu></menuchoice> menu to cut, copy, paste, or clear text in the <literal>Search</literal> box.</para>
+</listitem>
+<listitem><para>Use the icon on the right side of the <literal>Search</literal> box to clear the search results.</para>
 </listitem>
 </itemizedlist>
 </tip>
@@ -209,21 +230,22 @@
 </sect2>
 </sect1>
 <sect1 id="intro_be"><title>Introduction to Boot Environments</title>
-<para>The OpenSolaris 2009.06 release is a boot environment.</para>
-<para> A boot environment is an image that is bootable. The boot environment consists of a root file system and, optionally, other file systems, such as <filename>/usr</filename>, <filename>/var</filename>, or <filename>/export</filename>. These other file systems are mounted below the root file system. The root file system and all other file systems of the boot environment that contain system software are required to be ZFS datasets.</para>
-<para> You can maintain multiple boot environments on your system. Use the command—line interface (CLI) to create, rename, mount or unmount, or destroy these boot environments. The primary reason to have more than one boot environment on your system is to create backups of your existing boot environments before you modify them. Then you have the option of booting a backup boot environment when needed.</para>
-<para> See the <ulink url="http://dlc.sun.com/osol/docs/content/2008.11/snapupgrade/snap3.html"><citetitle>Upgrading and Managing Boot Environments</citetitle></ulink> document to learn more.</para>
-<para>The Package Manager creates a clone of the active boot environment when an image is updated.</para>
+<para>A boot environment is an image that is bootable. Upon an initial OpenSolaris installation, a boot environment is created.</para>
+<para> You can maintain multiple boot environments on your OpenSolaris 2009.06 system. Use the <command>beadm(1)</command> command from the command—line interface (CLI) to create, rename, mount or unmount, or destroy these boot environments.</para>
+<para>The Package Manager enables you to manage the boot environments created during the process of updating your image. For more information, see <xref linkend="manage_be"/> section.</para>
+<para>System administrators can maintain multiple boot environments on their systems, and each boot environment can have different software versions installed.</para>
+<para>When you use either the Package Manager or the <command>pkg image-update</command> command to update all the packages in your active OpenSolaris boot environment, a clone of that boot environment is automatically created. The packages are updated in the clone rather than in the original boot environment. After successfully completing the updates, the new clone is activated. Then, the clone will become the new default boot environment on system reboot. The original boot environment is also available as an alternate selection.</para>
+<para> See the beadm(1) man pages and the <ulink url="http://dlc.sun.com/osol/docs/content/dev/snapupgrade/snap3.html"><citetitle>Upgrading and Managing Boot Environments</citetitle></ulink> document to learn more about boot environments and the <command>beadm(1)</command> command.</para>
 <sect2 id="update_all"><title>Update All Packages (Update Your Image)</title>
 <para>Perform the following steps to update all the packages in your image.</para>
-<orderedlist><listitem><para>Click the <guilabel>Update All</guilabel> button to start the process of updating <emphasis role="strong">all</emphasis> the packages in your image.</para>
-<para>You can also choose <menuchoice><guimenu>File</guimenu><guimenuitem>Update All</guimenuitem></menuchoice> to start the process.</para>
-<note><para>The <guilabel>Update All</guilabel> button is enabled when updates are available to the installed packages.</para>
+<orderedlist><listitem><para>Click the <guibutton>Update All</guibutton> icon located on the toolbar to start the process of updating <emphasis role="strong">all</emphasis> the packages installed in your image.</para>
+<para>You can also choose <menuchoice><guimenu>Package</guimenu><guisubmenu>Update All</guisubmenu></menuchoice> to start the process.</para>
+<note><para>The <guilabel>Update All</guilabel> icon is enabled when updates are available to the installed packages.</para>
 </note>
 </listitem>
-<listitem><para>A <guilabel>Create New Boot Environment</guilabel> window is displayed. A name for the new boot environment is automatically generated.</para>
+<listitem><para>A <literal>Create New Boot Environment</literal> window is displayed. A name for the new boot environment is automatically generated.</para>
 </listitem>
-<listitem><para>(optional) You can change the name of the new boot environment if you want. </para>
+<listitem><para>(optional) You can change the name of the new boot environment if you want.</para>
 </listitem>
 <listitem><para>Confirm or Cancel the new boot environment.</para>
 <itemizedlist><listitem><para>Click <guibutton>Proceed</guibutton> to create a new boot environment and proceed with the Update All process.</para>
@@ -234,11 +256,9 @@
 <note><para>During the Update All process, a clone of the active boot environment is created. This clone enables the user to boot into the boot environment state that existed before the Update All process was started. If the Package Manager is unable to create a new boot environment, an error message will be displayed. See the <xref linkend="gilfh"/> section on how to rectify the error and continue with updating your image.</para>
 </note>
 <para>If you chose to proceed with the Update All process, the packages are downloaded and installed.</para>
-<para>After a successful completion, the <guilabel>Update All Complete</guilabel> dialog box is shown.</para>
+<para>After a successful completion, the <literal>Update All Complete</literal> dialog box is shown. A link to the Release Notes is provided in the dialog box. Read the <xref linkend="release_notes"/> before rebooting your system.</para>
 </listitem>
 <listitem><para> Click <guibutton>Close</guibutton>. </para>
-</listitem>
-<listitem><para>Read the <ulink url="http://opensolaris.org/os/project/indiana/resources/relnotes/200811/x86/">Release Notes</ulink> before rebooting your system. </para>
 <note><para><emphasis role="strong">You must reboot your system for the changes to take effect.</emphasis></para>
 </note>
 </listitem>
@@ -246,10 +266,10 @@
 </sect2>
 <sect2 id="gilfh"><title>Update All Errors</title>
 <para>A new boot environment clone must be created by the Package Manager for the Update All process to be completed. An error message is displayed if a boot environment clone cannot be created. You might see an error message such as the following :</para>
-<para><literal>Not enough disk space: the Update All action cannot be performed. You may choose to return to BE Management to manage your boot environments and free up disk space</literal>.</para>
+<para><literal>Not enough disk space, the selected action cannot be performed. Click OK to manage your existing BEs and free up disk space or Cancel to cancel the action</literal>.</para>
 <para>Click <guibutton>Cancel</guibutton> to cancel the Update All process and return to the main window.</para>
 <para>Perform the following steps if you want to rectify the error and continue with the Update All process: </para>
-<orderedlist><listitem><para>Click <guibutton>OK</guibutton> to display the <guilabel>Boot Environment Management</guilabel> dialog box.</para>
+<orderedlist><listitem><para>Click <guibutton>OK</guibutton> to display the <literal>Boot Environment Management</literal> dialog box.</para>
 </listitem>
 <listitem><para>Select the boot environments that you want to delete.</para>
 <note><itemizedlist><listitem><para>You cannot delete the currently active boot environment.</para>
@@ -259,9 +279,9 @@
 </itemizedlist>
 </note>
 </listitem>
-<listitem><para>Click <guibutton>OK</guibutton>. The <guilabel>Manage BEs Changes Confirmation</guilabel> dialog is shown.</para>
+<listitem><para>Click <guibutton>OK</guibutton>.</para>
 </listitem>
-<listitem><para> Review your changes and click <guibutton>OK</guibutton> to delete your boot environments.</para>
+<listitem><para>The <literal>Boot Environment Confirmation</literal> dialog is shown. Review your changes and click OK to proceed.</para>
 </listitem>
 <listitem><para>Click the <guibutton>Update All</guibutton> icon to restart the process of updating all packages.</para>
 </listitem>
@@ -269,7 +289,7 @@
 </sect2>
 <sect2 id="manage_be"><title>Manage Boot Environments</title>
 <para>Perform the following steps to manage your boot environments:</para>
-<orderedlist><listitem><para>Click <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Boot Environments</guimenuitem></menuchoice> to open the <guilabel>Manage Boot Environments</guilabel> dialog.</para>
+<orderedlist><listitem><para>Click <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Boot Environments</guimenuitem></menuchoice> to open the <literal>Manage Boot Environments</literal> dialog.</para>
 </listitem>
 <listitem><para id="gijqg">In this dialog box , you can perform the following actions:</para>
 <itemizedlist><listitem><para><emphasis role="strong">Activate a boot environment</emphasis> – Select the boot environment that you want to be active on system reboot. This will be the default boot environment <emphasis role="strong">after</emphasis> you have rebooted your system.</para>
@@ -277,12 +297,18 @@
 <listitem><para><emphasis role="strong">Remove old or unused boot environments to free up disk space</emphasis> – Select the boot environments that you want to delete.</para>
 <note><itemizedlist><listitem><para>You cannot the delete the currently active boot environment.</para>
 </listitem>
-<listitem><para>You do not need to reboot your system if you are only deleting some of your boot environments.</para>
+<listitem><para>If you have selected a boot environment to be renamed, it cannot be deleted.</para>
 </listitem>
 </itemizedlist>
 </note>
 </listitem>
-<listitem><para><emphasis role="strong">Rename a boot environment</emphasis> – Double-click the BE name that you want to change. Enter the new name of the BE and click <guibutton>OK</guibutton>. </para>
+<listitem><para><emphasis role="strong">Rename a boot environment</emphasis> – Double-click the boot environment name that you want to change. Enter the new name of the boot environment and click <guibutton>OK</guibutton>. </para>
+<note><itemizedlist><listitem><para>If you have selected a boot environment to be deleted, it cannot be renamed.</para>
+</listitem>
+<listitem><para>The currently active boot environment cannot be renamed.</para>
+</listitem>
+</itemizedlist>
+</note>
 </listitem>
 </itemizedlist>
 </listitem>
@@ -293,16 +319,15 @@
 </listitem>
 </itemizedlist>
 </listitem>
-<listitem><para>The <guilabel>Manage BEs Confirmation</guilabel> dialog box is displayed.</para>
-<para>Review the boot environment changes and click <guibutton>OK</guibutton> to proceed.</para>
+<listitem><para>The <literal>Boot Environment Confirmation</literal> dialog is displayed. Review your changes and click OK to proceed.</para>
 <warning role="caution"><para>After you click <guibutton>OK</guibutton>, you cannot undo any changes that you made to the boot environments.</para>
 </warning>
 <note><para>The changes that you made to the <emphasis role="strong">default boot environment</emphasis> setting are effective only after system reboot.</para>
 </note>
 <para>Click <guibutton>Cancel</guibutton> to cancel the changes and return to the <literal>BE Management</literal> dialog box.</para>
 </listitem>
-<listitem><para>Reboot your system to see the latest changes.</para>
-<note><para>You do not need to reboot your system if you only renamed a BE and did not make any other changes.</para>
+<listitem><para>Reboot your system to boot into the newly activated boot environment.</para>
+<note><para>Reboot your system only if you changed the active boot environment.</para>
 </note>
 </listitem>
 </orderedlist>
@@ -311,15 +336,25 @@
 <sect1 id="manage_repo"><title>Managing Repositories</title>
 <sect2 id="add_repo"><title>Add a Repository</title>
 <para>Perform the following steps to add a repository:</para>
-<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <guilabel>Manage Repositories</guilabel> dialog.</para>
+<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice>.</para>
+<para>You can also choose <guilabel>Add...</guilabel> from the <literal>Repository</literal> drop-down menu in the main window of the Package Manager.</para>
+</listitem>
+<listitem><para> The <literal>Manage Repositories</literal> dialog box is displayed. Type the name and the address (URL) of the repository you want to add. Click <guibutton>Add</guibutton>.</para>
 </listitem>
-<listitem><para>Type the name and the address (URL) of the repository you want to add. Click <guibutton>Add</guibutton></para>
+</orderedlist>
+</sect2>
+<sect2 id="add_secure_repo"><title>Add a Secure Repository</title>
+<para>A secure repository requires a SSL key and certificate for access. Perform the following steps to add a secure repository:</para>
+<orderedlist><listitem><para>Follow the steps in <xref linkend="add_repo"/> section to add a repository.</para>
+</listitem>
+<listitem><para>Follow the steps in the <xref linkend="modify_repo"/> section to add a SSL key and certificate.</para>
+<para>.</para>
 </listitem>
 </orderedlist>
 </sect2>
 <sect2 id="remove_repo"><title>Remove a Repository</title>
 <para>Perform the following steps to remove a repository:</para>
-<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <guilabel>Manage Repositories</guilabel> dialog.</para>
+<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <literal>Manage Repositories</literal> dialog.</para>
 </listitem>
 <listitem><para>Select a repository from the list. Click <guibutton>Remove</guibutton>.</para>
 <note><para>A repository that has been set as preferred repository cannot be removed. To remove a preferred repository, set a nonpreferred repository as preferred, and then remove the repository.</para>
@@ -329,7 +364,7 @@
 </sect2>
 <sect2 id="set_pref_repo"><title>Set a Preferred Repository</title>
 <para>Perform the following steps to set a preferred repository:</para>
-<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <guilabel>Manage Repositories</guilabel> dialog.</para>
+<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <literal>Manage Repositories</literal> dialog.</para>
 </listitem>
 <listitem><para>Click the radio button next to the repository that you would like to set as the preferred repository.</para>
 </listitem>
@@ -339,23 +374,31 @@
 </sect2>
 <sect2 id="modify_repo"><title>Modify a Repository</title>
 <para>Perform the following steps to modify a repository:</para>
-<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <guilabel>Manage Repositories</guilabel> dialog.</para>
+<orderedlist><listitem><para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Manage Repositories</guimenuitem></menuchoice> to open the <literal>Manage Repositories</literal> dialog.</para>
 </listitem>
 <listitem><para>Select the repository that you want to modify.</para>
 </listitem>
 <listitem><para>Click the <guibutton>Modify</guibutton> button.</para>
-<para> The <guilabel>Modify Repository</guilabel> dialog box is displayed. You can perform the following actions in the <guilabel>Modify Repository</guilabel> dialog box:</para>
-<itemizedlist><listitem><para><emphasis role="strong">Change the name and URL of the repository</emphasis> – Type a valid name for the repository and the URL of the repository.</para>
-<para>A repository name is considered valid if it does not exist in the current list of repositories.</para>
+<para> The <literal>Modify Repository</literal> dialog box is displayed. You can perform the following actions in the <literal>Modify Repository</literal> dialog box:</para>
+<itemizedlist><listitem><para><emphasis role="strong">Change the URL of the repository</emphasis> – Type a valid URL for the repository.</para>
+<para>You cannot change a repository name after you have added a repository. To change the repository name, delete the existing repository with the old name and add a repository with the new name. See the <xref linkend="remove_repo"/> section for steps on how to remove a repository.</para>
 </listitem>
-<listitem><para><emphasis role="strong">Add a SSL Key and Certificate</emphasis> – If a repository requires a key or certificate, add the repository name and URL, and then click the <guibutton>Modify</guibutton> button to add additional information such as a key or certificate.</para>
+<listitem><para><emphasis role="strong">Add a SSL Key and Certificate</emphasis> – A secure repository requires a SSL key and certificate for access.</para>
+<para>The <emphasis role="strong">Instructions</emphasis> link in the <literal>Modify Repository</literal> dialog box links to a registration site which provides instructions for downloading the SSL key and certificate</para>
+<orderedlist><listitem><para>In the <literal>Modify Repository</literal> dialog box, click the <emphasis role="strong">Instructions</emphasis> link to download the key and certificate. Save them on your system.</para>
+</listitem>
+<listitem><para>Click the <guibutton>Browse</guibutton> button to locate the SSL key on your system.</para>
+</listitem>
+<listitem><para>Click the <guibutton>Browse</guibutton> button to locate the SSL certificate on your system.</para>
+</listitem>
+</orderedlist>
 </listitem>
 <listitem><para><emphasis role="strong">Add a Mirror</emphasis> – If a repository has a mirror, add the repository name and URL, and then click the <guibutton>Modify</guibutton> button to add the mirror information.</para>
 </listitem>
 </itemizedlist>
 </listitem>
 <listitem><para>Confirm or decline the changes.</para>
-<itemizedlist><listitem><para>Click <guibutton>OK</guibutton> to save the changes and return to the <guilabel>Manage Repositories</guilabel> dialog box.</para>
+<itemizedlist><listitem><para>Click <guibutton>OK</guibutton> to save the changes and return to the <literal>Manage Repositories</literal> dialog box.</para>
 </listitem>
 <listitem><para>Click <guibutton>Cancel</guibutton> to cancel your changes.</para>
 </listitem>
@@ -364,6 +407,49 @@
 </orderedlist>
 </sect2>
 </sect1>
+<sect1><title>Working With WebInstall</title>
+<para>The OpenSolaris 2009.06 Package Manager provides support for users to add new repositories and optionally, install packages from these repositories using a simple one-click WebInstall process. A <filename>.p5i</filename> file which contains the repositories to be added and optionally, the package or packages that can be installed from these repositories, is required for the WebInstall process. The information contained in the <filename>.p5i</filename> file is read and used by the WebInstall process.</para>
+<sect2 id="webinstall"><title>How to Use WebInstall to Add Repositories and Install Packages</title>
+<bridgehead>Before You Begin</bridgehead><para>Locate the <filename>.p5i</filename> file which may be present on your desktop, the Start page in the Package Manager, or on a website.</para>
+<procedure><step><para>Start the Package manager in WebInstall mode in one of the following ways:</para>
+<itemizedlist><listitem><para>Click on a <filename>.p5i</filename> file on your desktop, and the associated application, Package Manager in WebInstall mode, will be launched.</para>
+</listitem>
+<listitem><para>Start the Package Manager from the command-line along with a path to the <filename>.p5i</filename> file. For example, type the following command at the command-line:</para>
+<para><command>$ pfexec packagemanager/<replaceable>path_to_pi5_file/file.p5i</replaceable></command></para>
+</listitem>
+<listitem><para>Click on a URL location that contains a link to <filename>.p5i</filename> file. If you are using this method to start the WebInstall, the <filename>.p5i</filename> file <emphasis role="strong">must</emphasis> be located on a web server that has registered the new mime type. Only then, the web server can manage the <filename>.p5i</filename> automatically and start Package Manager in WebInstall mode.</para>
+<para>If the <filename>.p5i</filename> is located on a web server that does not have the new mime type registered, save the <filename>.p5i</filename> file to your desktop and then click on it to launch Web Install.</para>
+</listitem>
+</itemizedlist>
+</step>
+<step><para>The following example window that shows a list of repositories that will be added and the packages that will be installed. Review the information.</para>
+<figure id="gilwx"><title>Package Manager WebInstaller</title>
+<mediaobject><imageobject><imagedata fileref="figures/wi_start.png" /></imageobject>
+</mediaobject>
+</figure>
+</step>
+<step><para>Confirm or cancel the WebInstall process.</para>
+<para>Click <guibutton>Proceed</guibutton> to add the new repositories and install the packages.</para>
+<para>Click <guibutton>Cancel</guibutton> to cancel the process. The Package Manager application exits.</para>
+</step>
+<step><para>(Optional) If the repositories that are to be added are secure repositories, an SSL key and certificate is required. An <literal>Add New Repositories</literal> dialog box is displayed.</para>
+<itemizedlist><listitem><para>Click the <emphasis role="strong">Instructions</emphasis> link in the <literal>Add New Repositories</literal> dialog box to download the SSL key and certificate. </para>
+</listitem>
+<listitem><para>Click the <guibutton>Browse</guibutton> button to locate the SSL key on your system.</para>
+</listitem>
+<listitem><para>Click the <guibutton>Browse</guibutton> button to locate the SSL certificate on your system.</para>
+</listitem>
+<listitem><para>Click <guibutton>OK</guibutton> to proceed.</para>
+</listitem>
+</itemizedlist>
+<para>The <literal>Adding New Repositories</literal> status bar is displayed.</para>
+</step>
+<step><para>(Optional) If packages are being installed, the <literal>Install/Update</literal> dialog box is displayed. Click <guibutton>Cancel</guibutton> to cancel the package installation.</para>
+<para>The application will close when all packages are installed.</para>
+</step>
+</procedure>
+</sect2>
+</sect1>
 <sect1 id="um_info"><title>Working With the Update Manager</title>
 <sect2 id="gijqh"><title>About The Update Manager</title>
 <para>The Update Manager is a separate application that starts from the desktop when updates to the installed packages are available in the repository.</para>
@@ -372,47 +458,45 @@
 </mediaobject>
 </figure>
 <para>You can use the Update Manager application to update the installed packages in your image.</para>
-<note><para>For the OpenSolaris 2009.06 release, the Update Manager updates <emphasis role="strong">all</emphasis> installed packages in the image. This action is equivalent to updating the image.</para>
+<note><para>For the OpenSolaris 2009.06 release, the Update Manager updates <emphasis role="strong">all</emphasis> installed packages in the image. This action is equivalent to running the <command>pkg image-update</command> command from the command-line.</para>
 </note>
 </sect2>
 <sect2 id="using_um"><title>Using the Update Manager</title>
 <para>When updates are available to the installed packages, a notification icon is displayed in the notification panel on the OpenSolaris desktop.</para>
 <para> You can also click <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Update Manager</guimenuitem></menuchoice> to manually launch the Update Manager.</para>
-<para>When you are notified of a software update, perform the following steps to begin the process of updating your system :</para>
-<orderedlist><listitem><para>Click the notification icon on the desktop to display the <guilabel>Update Manager</guilabel> window.</para>
+<para>When you are notified of a software update, perform the following steps to begin the process of updating your system:</para>
+<orderedlist><listitem><para>Click the notification icon on the desktop to display the <literal>Update Manager</literal> window.</para>
 </listitem>
-<listitem><para>Click the <guibutton>Update All</guibutton> button in the <guilabel>Update Manager</guilabel> window.</para>
+<listitem><para>Click the <guibutton>Update All</guibutton> button in the <literal>Update Manager</literal> window.</para>
 <note><para>Select a package and click the <guilabel>Details</guilabel> panel if you want to view more information about the package.</para>
 </note>
 </listitem>
-<listitem><para>The <guilabel>Update All</guilabel> dialog box is displayed. Proceed with the Update All process or cancel the action.</para>
+<listitem><para>The <literal>Update All</literal> dialog box is displayed. Proceed with the Update All process or cancel the action.</para>
 <itemizedlist><listitem><para>Click <guibutton>Proceed</guibutton> to create a new boot environment and update all packages in the current image.</para>
 <para>During the Update All process, a clone of the active boot environment is created. This clone enables the user to boot into the boot environment state that existed before the Update All process was started. </para>
 <para>If the Package Manager is unable to create a new boot environment, an error message will be displayed. See the <xref linkend="gileh"/> section on how to rectify the error and continue with updating your image.</para>
-<note><para>A name for the new boot environment is automatically generated.</para>
+<note><para>A name for the new boot environment is automatically generated. You can accept the name generated by the system, or provide your own name for the boot environment.</para>
 </note>
 </listitem>
 <listitem><para>Click <guibutton>Cancel</guibutton> to cancel the process.</para>
 </listitem>
 </itemizedlist>
 </listitem>
-<listitem><para>If you chose to proceed, the <guilabel>Installing Updates</guilabel> windows are displayed. The package installation process consists of four stages:</para>
-<orderedlist><listitem><para>Evaluate.</para>
+<listitem><para>If you chose to proceed, the <literal>Installing Updates</literal> windows are displayed. The package installation process consists of four stages:</para>
+<orderedlist><listitem><para>Prepare</para>
 </listitem>
 <listitem><para>Download.</para>
 </listitem>
 <listitem><para>Install.</para>
 </listitem>
-<listitem><para>Index.</para>
-</listitem>
 </orderedlist>
-<para>You can choose to cancel the process only during the Evaluate and Download stages. Click the <guibutton>Cancel</guibutton> button to cancel the installation process. No changes are made and you are returned to the main window of the Update Manager.</para>
+<para>You can choose to cancel the process only during the <emphasis role="strong">Prepare</emphasis> and <emphasis role="strong">Download</emphasis> stages. Click the <guibutton>Cancel</guibutton> button to cancel the installation process. No changes are made and you are returned to the main window of the Update Manager.</para>
 <note><para>If an error occurs during any of the stages, the <guilabel>Details</guilabel> panel is expanded and the details of the error are displayed. An error status indicator is shown next to the failed stage.</para>
 </note>
 </listitem>
 <listitem><para>Click the <guilabel>Details</guilabel> panel to view more information about each of the installation processes.</para>
 </listitem>
-<listitem><para>Read the <ulink url="http://opensolaris.org/os/project/indiana/resources/relnotes/200811/x86/">Release Notes</ulink> before rebooting your system.</para>
+<listitem><para>Read the <xref linkend="release_notes"/> before rebooting your system.</para>
 <warning role="caution"><para>You must reboot your system for the changes to take effect.</para>
 </warning>
 </listitem>
@@ -420,7 +504,7 @@
 </sect2>
 <sect2 id="gileh"><title>Update All Errors</title>
 <para>A new boot environment clone <emphasis role="strong">must</emphasis> be created for the Update All process to be completed. The following error message is displayed if a boot environment clone cannot be created due to space restrictions :</para>
-<para><literal>Not enough disk space: the Update All action cannot be performed. Do you want to launch BE Management to manage your existing BEs and free up disk space?</literal></para>
+<para><literal>Not enough disk space, the selected action cannot be performed. Click OK to manage your existing BEs and free up disk space or Cancel to cancel the action</literal>.</para>
 <para>Click <guibutton>No</guibutton> to cancel the Update All process and return to the Update Manager main window.</para>
 <para>Perform the following steps if you want to rectify the error and continue with the Update All process: </para>
 <orderedlist><listitem><para>Click <guibutton>Yes</guibutton> in the error dialog box to go to the <literal>Boot Environment Management</literal> dialog.</para>
@@ -432,26 +516,33 @@
 </orderedlist>
 </sect2>
 </sect1>
+<sect1 id="release_notes"><title>Release Notes</title>
+<para>The OpenSolaris 2009.06 Release Notes are available at the following locations:</para>
+<itemizedlist><listitem><para>x86 <ulink url="http://opensolaris.org/os/project/indiana/resources/relnotes/200811/x86/">Release Notes</ulink></para>
+</listitem>
+<listitem><para><trademark class="registered">SPARC</trademark> <ulink url="http://opensolaris.org/os/project/indiana/resources/relnotes/200906/sparc">Release Notes</ulink></para>
+</listitem>
+</itemizedlist>
+</sect1>
+<sect1 id="gimfg"><title>Package Manager Screencast</title>
+<para>A screencast that shows Package Manager usage for beginners is available. Click the link below to go to the screencast.</para>
+<para><ulink url="http://webcast-west.sun.com/interactive/09D02034/index.html">OpenSolaris 2009.06 Package Manager Screencast</ulink></para>
+</sect1>
 </chapter>
 <glossary id="glossary"><title>Image Packaging System Glossary</title>
 <glossentry><glossterm>publisher</glossterm>
-<glossdef lang="en"><itemizedlist><listitem><para>A person, group, or corporation that designs, creates, and publishes a package to a repository.</para>
-</listitem>
-<listitem><para>A location that is configured to point to a repository and might contain additional information about the package, such as the publisher of the package. The repository in turn serves the packages from the (default) authority, for downloading purposes. The developer-quality packages managed by Sun and made available through http://pkg.opensolaris.com is an example of an authority.</para>
-<note><para>Before the 2009.06 release, the term <emphasis>authority</emphasis> was used instead of <emphasis>publisher</emphasis>.</para>
-</note>
-</listitem>
-</itemizedlist>
+<glossdef lang="en"><para>A person, group, or corporation that designs, creates, and publishes a package to a repository. The repository in turn serves the packages from the (default) publisher, for downloading purposes. The developer-quality packages managed by Sun and made available through <ulink url="http://pkg.opensolaris.com/dev">http://pkg.opensolaris.com/dev</ulink> is an example of a publisher.</para>
+<para>The term <emphasis role="strong">authority</emphasis> has been replaced with the term <emphasis role="strong">publisher</emphasis> from the OpenSolaris 2009.06 release onwards.</para>
 </glossdef>
 </glossentry>
 <glossentry><glossterm>boot environment</glossterm>
-<glossdef><para>For an OpenSolaris release, a boot environment is an instance of a bootable OpenSolaris environment. The boot environment consists of a root file system and, optionally, other file systems, such as <filename>/usr</filename>, <filename>/var</filename>, or <filename>/export</filename>. These other file systems are mounted below the root file system. The root file system and all other file systems of the boot environment that contain system software are required to be ZFS datasets.</para>
-<para>The active boot environment is the one that is currently booted. Exactly one active boot environment can be booted. An inactive boot environment is not currently booted, but can be in a state of waiting for activation on the next reboot.</para>
+<glossdef><para>For an OpenSolaris release, a boot environment is an instance of a bootable OpenSolaris environment. The root file system and all other file systems of the boot environment that contain system software are required to be ZFS datasets.</para>
+<para>The active boot environment is the one that is currently booted. Many boot environments can present on an OpenSolaris system and an inactive boot environment can be in a state of waiting for activation upon system reboot.</para>
 </glossdef>
 </glossentry>
 <glossentry><glossterm>clone</glossterm>
 <glossdef><para>An exact copy. </para>
-<para>For installation, a clone could be an exact copy of an operating system, a file system, or a volume. This copy has 100% compatibility with the original.</para>
+<para>A clone could be an exact copy of an operating system, a file system, or a volume. This copy has 100% compatibility with the original.</para>
 </glossdef>
 </glossentry>
 <glossentry><glossterm>dataset</glossterm>
@@ -459,7 +550,8 @@
 </glossdef>
 </glossentry>
 <glossentry><glossterm>image</glossterm>
-<glossdef><para>A collection of software in a package that comprises an entire operating system. The package is suitable for installation.</para>
+<glossdef><para>A collection of software in a package that comprises an entire or partial operating system. The package is suitable for installation.</para>
+<para>An image is a location on your system where packages and their associated files, directories, links, and dependencies can be installed.</para>
 </glossdef>
 </glossentry>
 <glossentry><glossterm>package</glossterm>
@@ -467,13 +559,12 @@
 </glossdef>
 </glossentry>
 <glossentry><glossterm>preferred repository</glossterm>
-<glossdef><para>A default repository that is the source for packages. If a user does not explicitly specify a repository when installing and updating packages, the preferred publisher is chosen as the source for packages. </para>
-<para>During the creation of an image, the initially specified publisher is marked as the preferred publisher. Any one of the publishers associated with an image can be set as the preferred publisher.</para>
+<glossdef><para>A default repository that is the source for packages. If a user does not explicitly specify a repository when installing and updating packages, the preferred repository is chosen as the source for packages.</para>
 </glossdef>
 </glossentry>
 <glossentry><glossterm>repository</glossterm>
-<glossdef><para>A location where packages are available for downloading. A repository can contain packages from many authorities. Conversely, many repositories can contain packages from a single authority. Also called the depot server.</para>
+<glossdef><para>A location where packages are available for downloading. A publisher can publish packages to many repositories.</para>
 </glossdef>
 </glossentry>
 </glossary>
-</book>
\ No newline at end of file
+</book>
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/C/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/C/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/de/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/de/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/de/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/de/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/es/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/es/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/es/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/es/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/fr/legal.xml
--- a/src/gui/help/fr/legal.xml	Thu Apr 09 08:23:57 2009 +0100
+++ b/src/gui/help/fr/legal.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -1,37 +1,58 @@
-<!-- Fragment document type declaration subset:
-ArborText, Inc., 1988-2002, v.4002
-<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN" [
-<!ENTITY sun-trademarks SYSTEM "sun-trademarks.sgm">
-<!ENTITY other-trademarks SYSTEM "other-trademarks.sgm">
-]>
--->
-<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(>
-<!-- @(#)legal.sgm 1.16 05/09/22 SMI; read only legal wrapper -->
-<para>Sun Microsystems, Inc. has intellectual property rights relating to technology embodied in the product that is described in this document. In particular, and without limitation, these intellectual
-property rights may include one or more U.S. patents or pending patent applications in the U.S. and in other countries.</para><para>U.S. Go<?Pub Caret>vernment Rights &ndash; Commercial software.  Government users are subject to the Sun Microsystems, Inc. standard license agreement and applicable provisions of the FAR and its supplements.</para><para>
-This distribution may include materials developed by third parties.</para>
-<para>Parts of the product may be derived from Berkeley BSD systems, licensed from the University of California. UNIX is a registered trademark in the U.S. and other countries, exclusively
-licensed through X/Open Company, Ltd.</para>
-<para>Sun, Sun Microsystems, the Sun logo,
-the Solaris logo, the Java Coffee Cup logo, docs.sun.com, &sun-trademarks;Java, and
-Solaris are trademarks or registered trademarks of Sun Microsystems, Inc. or its subsidiaries in the U.S.
-and other countries. All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc. in the U.S. and other countries.
-Products bearing SPARC trademarks are based upon an architecture developed by Sun
-Microsystems, Inc. &other-trademarks;</para>
-<para>The OPEN LOOK and <trademark>Sun</trademark> Graphical User Interface was developed by Sun Microsystems, Inc. for
-its users and licensees. Sun acknowledges the pioneering efforts of Xerox in researching
-and developing the concept of visual or graphical user interfaces for the computer
-industry. Sun holds a non-exclusive license from Xerox to the Xerox Graphical User
-Interface, which license also covers Sun's licensees who implement OPEN LOOK GUIs
-and otherwise comply with Sun's written license agreements.</para>
-<para>Products covered by and information contained in this publication are controlled by U.S. Export Control
-laws and may be subject to the export or import laws in other countries. Nuclear,
-missile, chemical or biological weapons or nuclear maritime end uses or end users,
-whether direct or indirect, are strictly prohibited. Export or reexport to countries
-subject to U.S. embargo or to entities identified on U.S. export exclusion lists,
-including, but not limited to, the denied persons and specially designated nationals
-lists is strictly prohibited.</para>
-<para>DOCUMENTATION IS PROVIDED &ldquo;AS IS&rdquo; AND ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT,
-ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.</para>
+<!-- Fragment document type declaration subset:
+Arbortext, Inc., 1988-2008, v.4002
+<!DOCTYPE SOLBOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN" [
+<!ENTITY fr-other-trademarks SYSTEM "fr-other-trademarks.sgm">
+<!ENTITY sun-trademarks SYSTEM "sun-trademarks.sgm">
+]>
+-->
+<?Pub EntList bull rArr sect>
+<?Pub CX solbook(helpset(title()helpinfo(authorgroup()pubsnumber()releaseinfo()pubdate()publisher()copyright()legalnotice(para()>
+<!-- @(#)fr-legal.sgm 1.16 05/09/22 SMI; read only legal wrapper --><?Pub
+Caret><para lang="fr"></para><!--&auml;&agrave;--><para>Sun Microsystems,
+Inc. d&eacute;tient les droits de propri&eacute;t&eacute; intellectuelle relatifs &agrave;
+la technologie incorpor&eacute;e dans le produit qui est d&eacute;crit dans
+ce document. En particulier, et ce sans limitation, ces droits de propri&eacute;t&eacute;
+intellectuelle peuvent inclure un ou plusieurs brevets am&eacute;ricains ou
+des applications de brevet en attente aux Etats-Unis et dans d'autres pays.</para><para>
+Cette distribution peut comprendre des composants d&eacute;velopp&eacute;s
+par des tierces personnes.</para><para>Certaines composants de ce produit
+peuvent &ecirc;tre d&eacute;riv&eacute;es du logiciel Berkeley BSD, licenci&eacute;s
+par l'Universit&eacute; de Californie. UNIX est une marque d&eacute;pos&eacute;e
+aux Etats-Unis et dans d'autres pays; elle est licenci&eacute;e exclusivement
+par X/Open Company, Ltd. </para><para>Sun, Sun Microsystems, le logo Sun,
+le logo Solaris, le logo Java Coffee Cup, docs.sun.com, &sun-trademarks; Java
+et Solaris sont des marques de fabrique ou des marques d&eacute;pos&eacute;es
+de Sun Microsystems, Inc., ou ses filiales, aux Etats-Unis et dans d'autres
+pays. Toutes les marques SPARC sont utilis&eacute;es sous licence et sont
+des marques de fabrique ou des marques d&eacute;pos&eacute;es de SPARC International,
+Inc. aux Etats-Unis et dans d'autres pays. Les produits portant les marques
+SPARC sont bas&eacute;s sur une architecture d&eacute;velopp&eacute;e par
+Sun Microsystems, Inc. &fr-other-trademarks;</para><para>L'interface d'utilisation
+graphique OPEN LOOK et <trademark>Sun</trademark> a &eacute;t&eacute; d&eacute;velopp&eacute;e
+par Sun Microsystems, Inc. pour ses utilisateurs et licenci&eacute;s. Sun
+reconna&icirc;t les efforts de pionniers de Xerox pour la recherche et le
+d&eacute;veloppement du concept des interfaces d'utilisation visuelle ou graphique
+pour l'industrie de l'informatique. Sun d&eacute;tient une licence non exclusive
+de Xerox sur l'interface d'utilisation graphique Xerox, cette licence couvrant &eacute;galement
+les licenci&eacute;s de Sun qui mettent en place l'interface d'utilisation
+graphique OPEN LOOK et qui, en outre, se conforment aux licences &eacute;crites
+de Sun.</para><para>Les produits qui font l'objet de cette publication et
+les informations qu'il contient sont r&eacute;gis par la legislation am&eacute;ricaine
+en mati&egrave;re de contr&ocirc;le des exportations et peuvent &ecirc;tre
+soumis au droit d'autres pays dans le domaine des exportations et importations.
+Les utilisations finales, ou utilisateurs finaux, pour des armes nucl&eacute;aires,
+des missiles, des armes chimiques ou biologiques ou pour le nucl&eacute;aire
+maritime, directement ou indirectement, sont strictement interdites. Les exportations
+ou r&eacute;exportations vers des pays sous embargo des Etats-Unis, ou vers
+des entit&eacute;s figurant sur les listes d'exclusion d'exportation am&eacute;ricaines,
+y compris, mais de mani&egrave;re non exclusive, la liste de personnes qui
+font objet d'un ordre de ne pas participer, d'une fa&ccedil;on directe ou
+indirecte, aux exportations des produits ou des services qui sont r&eacute;gis
+par la legislation am&eacute;ricaine en mati&egrave;re de contr&ocirc;le des
+exportations et la liste de ressortissants sp&eacute;cifiquement design&eacute;s,
+sont rigoureusement interdites.</para><para>LA DOCUMENTATION EST FOURNIE "EN
+L'ETAT" ET TOUTES AUTRES CONDITIONS, DECLARATIONS ET GARANTIES EXPRESSES OU
+TACITES SONT FORMELLEMENT EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE,
+Y COMPRIS NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE,
+A L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON. </para>
+<?Pub *0000004289 0>
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/fr/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/fr/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)fr-other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/fr/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/fr/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/it/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/it/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/it/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/it/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/ja/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/ja/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/ja/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/ja/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/ko/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/ko/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/ko/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/ko/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/pt_BR/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/pt_BR/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/pt_BR/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/pt_BR/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/ru/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/ru/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/ru/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/ru/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/sv/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/sv/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/sv/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/sv/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/zh_CN/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/zh_CN/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/zh_CN/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/zh_CN/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/zh_HK/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/zh_HK/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/zh_HK/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/zh_HK/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/zh_TW/other-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/zh_TW/other-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,12 @@
+<!-- @(#)other-trademarks.sgm 1.5 99/02/10 96/10/10 SMI; read/write file for legal attributions -->
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH THIRD
+PARTY TRADEMARKS THAT REQUIRE ATTRIBUTION APPEAR IN 'TMARK.' IF YOU BELIEVE
+A THIRD PARTY MARK NOT APPEARING IN 'TMARK' SHOULD BE ATTRIBUTED, CONSULT
+YOUR EDITOR OR THE SUN TRADEMARK GROUP FOR GUIDANCE. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/gui/help/zh_TW/sun-trademarks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/help/zh_TW/sun-trademarks.xml	Thu Apr 09 19:33:26 2009 +0100
@@ -0,0 +1,10 @@
+<!-- Fragment document type declaration subset:
+ArborText, Inc., 1988-2002, v.4002
+<!DOCTYPE BOOK PUBLIC "-//Sun Microsystems//DTD SolBook 3.5//EN">
+-->
+<!-- @(#)sun-trademarks.sgm 1.5 99/02/10 SMI; read/write file for legal trademarks -->
+<?Pub CX book(title()bookinfo(bookbiblio()legalnotice(para()para(>
+<!--REPLACE THIS COMMENT WITH ATTRIBUTION OF ALL OTHER SUN TRADEMARKS MENTIONED
+SIGNIFICANTLY THROUGHOUT PRODUCT OR DOCUMENTATION. TEXT WITHIN THE <_COMMENT>
+TAGS WILL NOT BE PRINTED OR DISPLAYED IN YOUR DOCUMENT. DO NOT MODIFY ANY
+TEXT EXCEPT THE ATTRIBUTIONS YOU INSERT.-->
diff -r 4a3a17ce4334 -r 37317ca76af3 src/pkgdefs/SUNWipkg-gui-l10n/prototype
--- a/src/pkgdefs/SUNWipkg-gui-l10n/prototype	Thu Apr 09 08:23:57 2009 +0100
+++ b/src/pkgdefs/SUNWipkg-gui-l10n/prototype	Thu Apr 09 19:33:26 2009 +0100
@@ -6,40 +6,64 @@
 d none usr/share/gnome/help/package-manager 755 root bin
 d none usr/share/gnome/help/package-manager/de 755 root bin
 f none usr/share/gnome/help/package-manager/de/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/de/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/de/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/de/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/es 755 root bin
 f none usr/share/gnome/help/package-manager/es/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/es/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/es/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/es/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/fr 755 root bin
+f none usr/share/gnome/help/package-manager/fr/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/fr/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/fr/package-manager.xml 444 root bin
-f none usr/share/gnome/help/package-manager/fr/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/fr/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/it 755 root bin
 f none usr/share/gnome/help/package-manager/it/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/it/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/it/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/it/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/ja 755 root bin
 f none usr/share/gnome/help/package-manager/ja/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/ja/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/ja/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/ja/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/ko 755 root bin
 f none usr/share/gnome/help/package-manager/ko/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/ko/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/ko/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/ko/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/pt_BR 755 root bin
-f none usr/share/gnome/help/package-manager/pt_BR/package-manager.xml 444 root bin
 f none usr/share/gnome/help/package-manager/pt_BR/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/pt_BR/other-trademarks.xml 444 root bin
+f none usr/share/gnome/help/package-manager/pt_BR/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/pt_BR/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/sv 755 root bin
+f none usr/share/gnome/help/package-manager/sv/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/sv/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/sv/package-manager.xml 444 root bin
-f none usr/share/gnome/help/package-manager/sv/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/sv/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/ru 755 root bin
+f none usr/share/gnome/help/package-manager/ru/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/ru/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/ru/package-manager.xml 444 root bin
-f none usr/share/gnome/help/package-manager/ru/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/ru/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/zh_CN 755 root bin
+f none usr/share/gnome/help/package-manager/zh_CN/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/zh_CN/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/zh_CN/package-manager.xml 444 root bin
-f none usr/share/gnome/help/package-manager/zh_CN/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/zh_CN/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/zh_HK 755 root bin
+f none usr/share/gnome/help/package-manager/zh_HK/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/zh_HK/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/zh_HK/package-manager.xml 444 root bin
-f none usr/share/gnome/help/package-manager/zh_HK/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/zh_HK/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/zh_TW 755 root bin
 f none usr/share/gnome/help/package-manager/zh_TW/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/zh_TW/other-trademarks.xml 444 root bin
 f none usr/share/gnome/help/package-manager/zh_TW/package-manager.xml 444 root bin
+f none usr/share/gnome/help/package-manager/zh_TW/sun-trademarks.xml 444 root bin
 d none usr/share/locale 755 root other
 d none usr/share/locale/ar 755 root other
 d none usr/share/locale/ar/LC_MESSAGES 755 root other
diff -r 4a3a17ce4334 -r 37317ca76af3 src/pkgdefs/SUNWipkg-gui/prototype
--- a/src/pkgdefs/SUNWipkg-gui/prototype	Thu Apr 09 08:23:57 2009 +0100
+++ b/src/pkgdefs/SUNWipkg-gui/prototype	Thu Apr 09 19:33:26 2009 +0100
@@ -42,9 +42,13 @@
 d none usr/share/gnome/help/package-manager/C 755 root bin
 f none usr/share/gnome/help/package-manager/C/package-manager.xml 444 root bin
 f none usr/share/gnome/help/package-manager/C/legal.xml 444 root bin
+f none usr/share/gnome/help/package-manager/C/other-trademarks.xml 444 root bin
+f none usr/share/gnome/help/package-manager/C/sun-trademarks.xml 444 root bin
 d none usr/share/gnome/help/package-manager/C/figures 755 root bin
-f none usr/share/gnome/help/package-manager/C/figures/package_manager.png 444 root bin
+f none usr/share/gnome/help/package-manager/C/figures/pm_pkglist.png 444 root bin
+f none usr/share/gnome/help/package-manager/C/figures/pm_store.png 444 root bin
 f none usr/share/gnome/help/package-manager/C/figures/update_all.png 444 root bin
+f none usr/share/gnome/help/package-manager/C/figures/wi_start.png 444 root bin
 d none usr/share/icons 755 root other
 d none usr/share/icons/hicolor 755 root other
 d none usr/share/icons/hicolor/48x48 755 root other