another batch
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_dependencies_properties.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/dependencies_properties.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_dependencies_properties.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/dependencies_properties.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_dependencies_required.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/dependencies_required.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_dependencies_required.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/dependencies_required.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_archive.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_archive.png
deleted file mode 100644
index 6ea23f7..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_archive.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_data.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_data.png
deleted file mode 100644
index c65d74b..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_data.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_handler.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_handler.png
deleted file mode 100644
index a895ee8..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_handler.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_options.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_options.png
deleted file mode 100644
index 1b94bc2..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_options.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_source.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_source.png
deleted file mode 100644
index 4427d7f..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_installation_source.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_exporting.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_exporting.png
deleted file mode 100644
index 106e8c7..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_exporting.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_publishing.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_publishing.png
deleted file mode 100644
index 66f95eb..0000000
--- a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_publishing.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_included_details.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/features_details.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_included_details.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/features_details.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_included_features.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/features_included.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_included_features.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/features_included.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_copyright.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_copyright.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_copyright.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_copyright.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_description.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_description.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_description.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_description.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_license.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_license.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_license.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_license.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_sites.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_sites.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_information_sites.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/information_sites.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_environments.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/overview_environments.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_environments.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/overview_environments.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_general.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/overview_general.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_overview_general.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/overview_general.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_plugins_fragments.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/plugins.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_plugins_fragments.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/plugins.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_plugins_details.png b/bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/plugins_details.png
similarity index 100%
rename from bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/feature_editor_plugins_details.png
rename to bundles/org.eclipse.pde.doc.user/guide/images/feature_editor/plugins_details.png
Binary files differ
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/dependencies.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/dependencies.htm
new file mode 100644
index 0000000..32e880b
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/dependencies.htm
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Feature Dependencies</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Feature Dependencies </p>
+<p>The <strong>Dependencies</strong> page  lists all features and plug-ins that must be present   in the product before the <em>Update Manager</em> installs this feature. If any of these   pre-requisites is missing, the feature will not be installed.</p>
+<p align="left"><img src="../../../images/feature_editor/dependencies_required.png" alt="Dependencies" hspace="30"></p>
+<p align="left"> The requirement   can be based solely on plug-in IDs, or further constrained using expected   versions and match rules.</p>
+<p><img src="../../../images/feature_editor/dependencies_properties.png" alt="Properties" hspace="30"></p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/feature_editor.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/feature_editor.htm
new file mode 100644
index 0000000..3250d7b
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/feature_editor.htm
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Feature Manifest Editor</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Feature Manifest Editor </p>
+<p>PDE provides a form-based multi-page feature manifest editor that manage and edit the <em>feature.xml</em> file. </p>
+<p>For details on the individual editor pages, refer to the following documents:</p>
+<ul>
+  <li><a href="overview.htm">Overview</a></li>
+  <li><a href="information.htm">Feature Information</a></li>
+  <li><a href="plugins.htm">Included Plug-ins</a></li>
+  <li><a href="included_features.htm">Included Features</a></li>
+  <li><a href="dependencies.htm">Feature Dependencies</a></li>
+  <li><a href="installation.htm">Feature Installation</a></li>
+</ul>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/included_features.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/included_features.htm
new file mode 100644
index 0000000..0c98062
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/included_features.htm
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Included Features</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+.style2 {
+	font-size: 12pt;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Included Features </p>
+<p>The Included Features reference all features nested inside this feature and their properties.</p>
+<p>&nbsp;</p>
+<p class="style2">Feature List</p>
+<p>The feature list enumerates all the features that are directly nested and therefore considered part of this feature. </p>
+<p><img src="../../../images/feature_editor/features_included.png" alt="Included Features" width="256" height="135"></p>
+<p>When the feature is built, all included features are recursively built and   packaged.</p>
+<p>&nbsp;</p>
+<p class="style2">Included Feature Details</p>
+<p><img src="../../../images/feature_editor/features_details.png" alt="Feature Details" hspace="30"></p>
+<p>An included feature may be marked as <strong>optional</strong>. Users may choose to not install optional features. They may also choose to disable them if they are   installed or install them later. A missing optional feature is not treated as   an error.</p>
+<p>An included feature can be updated by patches. By default, Update Manager searches for updates to an included feature at the update site for the parent feature, but this setting can be overridden. </p>
+<p>If an included feature contains platform-specific code or resources, then environment   conditions should be specified and associated with that feature.</p>
+<p></p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/information.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/information.htm
new file mode 100644
index 0000000..746387f
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/information.htm
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Feature Information</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+.style2 {
+	font-size: 12pt;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Feature Information</p>
+<p>The main purpose of the <strong>Feature Information</strong> page is to specify information that is required by Update Manager to install the feature. </p>
+<p>&nbsp;</p>
+<p class="style2">Feature Description</p>
+<p>A feature description is a brief component description. </p>
+<p><img src="../../../images/feature_editor/information_description.png" alt="Description" width="456" height="184"></p>
+<p>Typically, a description is plain text and intended to be translated. Alternatively, you can provide the description in HTML format and point to it via a URL. The URL can be specified as   absolute or relative. If relative, it is assumed to be relative to (and packaged   in) the feature archive. </p>
+<p>&nbsp;</p>
+<p class="style2">Copyright Notice </p>
+<p>The feature <strong>copyright notice</strong> is typically provided as plain text and is intended to be translated. </p>
+<p><img src="../../../images/feature_editor/information_copyright.png" alt="Copyright" width="460" height="183"></p>
+<p>Alternatively, you can provide the copyright notice in HTML format and point to it via a URL <strong></strong>. The URL can be specified as   absolute or relative. If relative, it is assumed to be relative to (and packaged   in) the feature archive. </p>
+<p>&nbsp;</p>
+<p class="style2">License Agreement</p>
+<p>The <strong>license agreement</strong> is a feature <em>click-through</em> license. It is typically  simple text and is Intended to be translated. </p>
+<p>The license is   displayed in a standard dialog with [Accept] [Reject] actions during the   download/ installation process. </p>
+<p><img src="../../../images/feature_editor/information_license.png" alt="License" width="456" height="177"></p>
+<p>Note that <em>click-through</em> license must be   specified for any feature that will be selected for installation or update using   the <em>Update Manager</em>. When using nested features, only the nesting parent   (i.e. the feature selected for installation or update) must have <em>click-through</em> license text defined. </p>
+<p><em><strong>The license text is required even if the optional url attribute is specified. </strong></em></p>
+<p>&nbsp;</p>
+<p class="style2">Sites to Visit</p>
+<p><strong>Sites to Visit</strong> specify the name and URL of sites to go to for new features. </p>
+<p><img src="../../../images/feature_editor/information_sites.png" alt="Sites To Visit" width="459" height="175"></p>
+<p>In general, a provider can use <strong>Sites to Visit</strong> to reference its own site(s), or   site(s) of partners that offer complementary features. </p>
+<p>Eclipse uses this data simply as a way to distribute new site URLs to the clients. Sites that belong to   root features (at the top of the hierarchy) typically appear in <strong>Sites to Visit</strong>   in <em>Update Manager</em>. </p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/installation.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/installation.htm
new file mode 100644
index 0000000..8f3979d
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/installation.htm
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Feature Installation</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+.style2 {
+	font-size: 12pt;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Feature Installation </p>
+<p align="left">The <strong>Installation</strong> page contains information used by <em>Update Manager</em> when installing the feature.</p>
+<p align="left">&nbsp;</p>
+<p align="left" class="style2">Feature Data </p>
+<p align="left">In addition to plug-ins, opaque data entries can be specified to   carry custom feature information. These entries usually come together with   custom install handlers. </p>
+<p align="left">Install handlers can be used to perform non-standard   install tasks and manipulate data entries once they are downloaded by the <em>Update   Manager</em>. </p>
+<p align="left">You can read more about this and other feature issues in the <em>Platform   Install and Update guide</em>.</p>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/overview.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/overview.htm
new file mode 100644
index 0000000..2ee4a31
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/overview.htm
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Feature Overview</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+.style2 {
+	font-size: 12pt;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Overview</p>
+<p>The <STRONG>Overview</STRONG> page serves a dual purpose:</p>
+<OL>
+  <LI>It contains two main sections, <STRONG>General Information</STRONG> and <STRONG>Supported Environments</STRONG>, that define important properties of the   feature..   
+  <LI>It functions as a quick reference on how to define, export and publish a feature by providing the <strong>Feature Content</strong>, <strong>Exporting</strong> and <strong>Publishing</strong> sections. These sections provides hyperlinks which you can follow to navigate to pages or invoke commands. </LI>
+</OL>
+<p>&nbsp;</p>
+<p class="style2">General Information </p>
+<p><img src="../../../images/feature_editor/overview_general.png" alt="Feature Overview" hspace="30"> </p>
+<p>An<strong> ID</strong> is mandatory and must comply with the <a href="../../../../../org.eclipse.platform.doc.isv/reference/misc/plugin_manifest.html">specifications</a>.</p>
+<p>A <strong>version</strong> is mandatory and must be of the form <em>major.minor.</em><em>micro.qualifier</em> (e.g. 1.3.0). </p>
+<p>A <strong>name</strong> is the translatable presentation name of the feature. This field is required. </p>
+<p>A <strong>provider</strong> is the translatable name of the feature provider. This field is optional. </p>
+<p align="left">Branding information for primary features is stored in a <strong>branding   plug-in</strong>. If not explicitly set, Eclipse will assume that the branding plug-in   has the same identifier as the feature.</p>
+<p align="left">The <strong>update site URL</strong> denotes a URL that is used by <em>Update Manager</em> when searching for updates to your feature.</p>
+<p align="left">The <strong>update site name</strong>  is the human-readable label of the referenced update site. </p>
+<p align="left">&nbsp;</p>
+<p align="left" class="style2">Supported Environments</p>
+<p align="left">By default, your feature is treated as universally portable. You can add   constraints by providing supported operating/windowing systems, languages and/or   system architectures. This information will be used to ensure that your feature   is not installed or shown in the context that does not match these constraints.</p>
+<p><img src="../../../images/feature_editor/overview_environments.png" alt="Feature Environments" hspace="30"></p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/plugins.htm b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/plugins.htm
new file mode 100644
index 0000000..de89052
--- /dev/null
+++ b/bundles/org.eclipse.pde.doc.user/guide/tools/editors/feature_editor/plugins.htm
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Included Plug-ins</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {
+	font-size: 18px;
+	font-weight: bold;
+}
+.style2 {
+	font-size: 12pt;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+
+<body>
+<p class="style1">Included Plug-ins</p>
+<p>The Plug-ins page lists all the plug-ins and fragments that should be packaged in the feature and specifies their properties </p>
+<p>&nbsp;</p>
+<p class="style2">Plug-in List </p>
+<p>The plug-in list enumerates all the plug-ins and fragments that are included directly in the feature. </p>
+<p><img src="../../../images/feature_editor/plugins.png" alt="Plug-ins" hspace="30"></p>
+<p>Press the <strong>Add...</strong> button to show the list of available plug-ins and add plug-ins to the list.</p>
+<p>The preferred <strong>versioning</strong> scheme is for the plug-ins referenced to be given a <strong>0.0.0</strong> version. This is a special value that   will be replaced by the actual plug-in version when exporting the feature. This option is especially convenient when   plug-in versions contain a <em>qualifier</em> segment. </p>
+<p>&nbsp;</p>
+<p class="style2">Plug-in Details </p>
+<p>Plug-in details are used as guidelines by <em>Update Manager</em> to determine what, when and how to install the plug-ins included by a feature. </p>
+<p><img src="../../../images/feature_editor/plugins_details.png" alt="Plug-in Details" hspace="30"></p>
+<p>The <strong>download size</strong> and <strong>installation size</strong> are optional hints that can be provided to allow <em>Update Manager</em> to provide useful feedback to the user about the feature being installed.</p>
+<p>The <strong>unpack</strong> option determines whether a plug-in is to remain intact in a JAR after installation. The default is to unpack (i.e. flatten).</p>
+<p>If a plug-in or fragment contains platform-specific code, then environment   conditions should be specified and associated with that plug-in or fragment.</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.pde.doc.user/toc.xml b/bundles/org.eclipse.pde.doc.user/toc.xml
index 1783df6..544ed7c 100644
--- a/bundles/org.eclipse.pde.doc.user/toc.xml
+++ b/bundles/org.eclipse.pde.doc.user/toc.xml
@@ -58,11 +58,11 @@
 			</topic>

 			<topic label="Feature Manifest Editor" href="guide/tools/editors/feature_editor/feature_editor.htm">

 				<topic label="Overview" href="guide/tools/editors/feature_editor/overview.htm"/>

-				<topic label="Information" href="guide/tools/editors/feature_editor/information.htm"/>

-				<topic label="Plug-ins" href="guide/tools/editors/feature_editor/plugins.htm"/>

+				<topic label="Feature Information" href="guide/tools/editors/feature_editor/information.htm"/>

+				<topic label="Included Plug-ins" href="guide/tools/editors/feature_editor/plugins.htm"/>

 				<topic label="Included Features" href="guide/tools/editors/feature_editor/included_features.htm"/>

-				<topic label="Dependencies" href="guide/tools/editors/feature_editor/dependencies.htm"/>

-				<topic label="Installation" href="guide/tools/editors/feature_editor/installation.htm"/>

+				<topic label="Feature Dependencies" href="guide/tools/editors/feature_editor/dependencies.htm"/>

+				<topic label="Feature Installation" href="guide/tools/editors/feature_editor/installation.htm"/>

 			</topic>

 			<topic label="Site Manifest Editor" href="guide/tools/editors/site_editor/site_editor.htm">

 				<topic label="Site Map" href="guide/tools/editors/site_editor/site_map.htm"/>