Merge cnav.htm into ref-27.htm
Change-Id: I4fcd8fd60d133325d279f773f9597b7f39e7e7f4
Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cnav.htm b/bundles/org.eclipse.platform.doc.user/concepts/cnav.htm
deleted file mode 100644
index b8b94d5..0000000
--- a/bundles/org.eclipse.platform.doc.user/concepts/cnav.htm
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html lang="en">
-<HEAD>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2014. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-
-<LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Project Explorer view</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"> </script>
-</HEAD>
-
-<BODY BGCOLOR="#ffffff">
-<h1>
-Project Explorer view</H1>
-<P CLASS="Intro">
-
-The Project Explorer view provides a hierarchical view of the resources in the Workbench.
-From here, you can open files for editing or select resources for operations such
-as exporting.</p>
-<P CLASS="Para">
-<img src="../images/Image241_nav_view.png" alt="Picture of Project Explorer view showing a simple hierarchy (project, folders, files)" border="0"></P>
-<P CLASS="Para">
-Right-click on any resource in the Project Explorer view to open a pop-up menu that
-allows you to perform operations such as copying, moving, creating new
-resources, comparing resources with each other, or performing team
-operations. To see a description of what each menu item does, move selection
-highlight to that menu item and press the context-sensitive help key (e.g., F1
-on Microsoft Windows).</P>
-<P CLASS="Para">
-By default, the Project Explorer view is included in the Resources perspective. To add it
-to the current perspective, click
-<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.navigator.ProjectExplorer)")'>
-<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link">
-<b>Window > Show View > Other... > General > Project Explorer</b></a>.</P>
-<h2>
-Toolbar</h2>
-<P>
-The toolbar of the Project Explorer view contains the following buttons:</P>
-<dl>
- <dt>Collapse All</dt>
- <dd>Collapses the tree expansion state of all resources in the view.</dd>
- <dt>Link with Editor</dt>
- <dd>Toggles whether the Project Explorer view selection is linked to the active editor.
- When this option is selected, changing the active editor will automatically update the
- Project Explorer selection to the resource being edited.</dd>
- <dt>Menu</dt>
- <dd>Provides menu items that allow you to sort or filter the contents of the
- Project Explorer view as well as select a working set.</dd>
-</dl>
-<h2>
-Icons</h2>
-<p CLASS="Para">The following icons can appear in the Project Explorer view.</p>
-<table BORDER="1" cellspacing="0">
- <thead>
- <tr>
- <th ROWSPAN="1" COLSPAN="1">
- <p CLASS="Para">Icon</p>
- </th>
- <th ROWSPAN="1" COLSPAN="1">
- <p CLASS="Para">Description</p>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td ROWSPAN="1" COLSPAN="1" valign="top" align="left"><img src="../images/prj_obj.svg" alt="Open project icon" border="0"></td>
- <td ROWSPAN="1" COLSPAN="1" valign="top" align="left">
- Project (open) </td>
- </tr>
- <tr>
- <td ROWSPAN="1" COLSPAN="1" valign="top" align="left"><img src="../images/fldr_obj.svg" alt="Folder icon" border="0"></td>
- <td ROWSPAN="1" COLSPAN="1" valign="top" align="left">
- Folder
- </td>
- </tr>
- <tr>
- <td COLSPAN="1" valign="top" align="left"><img src="../images/file_obj.svg" alt="File icon" border="0"></td>
- <td COLSPAN="1" valign="top" align="left"> File</td>
- </tr>
- </tbody>
-</table>
-<h3 class="related">Related concepts</h3>
-<a href="concepts-12.htm">Resources</a><br>
-<a href="concepts-5.htm">Views</a>
-
-<h3 class="related">Related tasks</h3>
-<a href="../tasks/tasks-48b.htm">Showing or hiding files in the Project Explorer view</a><br>
-<a href="../tasks/tasks-3.htm">Opening views</a><br>
-<a href="../tasks/tasks-3e.htm">Moving and docking views</a><br>
-
-<h3 class="related">Related reference</h3>
-<a href="../reference/ref-27.htm">Project Explorer view</a>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-12.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-12.htm
index 3014f01..832a1a9 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-12.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-12.htm
@@ -49,7 +49,7 @@
<h3 class="related">Related concepts</h3>
<a href="concepts-2.htm">Workbench</a><br>
-<a href="cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="concepts-17.htm">Resource hierarchies</a><br>
<a href="concepts-13.htm">Linked resources</a><br>
<a href="concepts-22.htm">Builds</a>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-13.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-13.htm
index e384136..8b5b36b 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-13.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-13.htm
@@ -58,7 +58,7 @@
<h3 class="related">Related concepts</h3>
<a href="concepts-2.htm">Workbench</a><br>
-<a href="cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="concepts-12.htm">Resources</a><br>
<a href="concepts-17.htm">Resource hierarchies</a><br>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-17.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-17.htm
index c0df7d9..7862d14 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-17.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-17.htm
@@ -31,7 +31,7 @@
<h3 class="related">Related concepts</h3>
<a href="concepts-12.htm">Resources</a><br>
-<a href="cnav.htm"><br>Project Explorer view</a><br>
+<a href="../reference/ref-27.htm"><br>Project Explorer view</a><br>
<h3 class="related">Related tasks</h3>
<a href="../tasks/tasks-46ag.htm">Finding a resource quickly</a><br>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-6.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-6.htm
index 9e822c2..f740bee 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-6.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-6.htm
@@ -53,7 +53,7 @@
<a href="concepts-6a.htm">External editors</a><br>
<a href="cbookmrk.htm">Bookmarks</a><br>
<a href="ctskview.htm">Tasks view</a><br>
-<a href="cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<h3 class="related">Related tasks</h3>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm b/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm
index 76478a6..25ea7c7 100644
--- a/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm
+++ b/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm
@@ -81,7 +81,7 @@
</DIV>
<h3 class="related">Related concepts</h3>
-<a href="cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="ctskview.htm">Tasks view</a><br>
<h3 class="related">Related tasks</h3>
diff --git a/bundles/org.eclipse.platform.doc.user/images/Image241_nav_view.png b/bundles/org.eclipse.platform.doc.user/images/Image241_nav_view.png
deleted file mode 100644
index 15de9b8..0000000
--- a/bundles/org.eclipse.platform.doc.user/images/Image241_nav_view.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm b/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm
index babd010..55ed596 100644
--- a/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm
+++ b/bundles/org.eclipse.platform.doc.user/reference/ref-27.htm
@@ -20,11 +20,13 @@
<P CLASS="Intro">This view provides a hierarchical view of the
artifacts in the Workbench, which is customized by the specific
configuration of your Workbench.</p>
+<P>From here, you can open files for editing or select resources for operations such as exporting.</P>
<P CLASS="Para">A typical Project Explorer with only the Java
Development Tools (JDT) installed looks similar to the Package Explorer:</P>
<P CLASS="Para"><img src="../images/Image275_project_explorer.png"
alt="Project Explorer View" border="0"></P>
-<p CLASS="Head">To add the Project Explorer view to the current
+<P>Right-click on any resource in the Project Explorer view to open a pop-up menu that allows you to perform operations such as copying, moving, creating new resources, comparing resources with each other, or performing team operations. To see a description of what each menu item does, move selection highlight to that menu item and press the context-sensitive help key (e.g., F1 on Microsoft Windows).</P>
+<p CLASS="Head">By default, the Project Explorer view is included in the Resources perspective. To add the Project Explorer view to the current
perspective, click <a class="command-link"
href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.navigator.ProjectExplorer)")'>
<img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window
@@ -40,12 +42,20 @@
linked to the active editor. When this option is selected, changing the
active editor will automatically update the Project Explorer selection to the
resource being edited.</P>
+<H3>Select and deselect content to filter to the content in the tree</H3>
+<P>This command opens a dialog allowing to configure some filters to enable.</P>
<P><BR>
</P>
-<H2>Menus</H2>
-<P>Click the black upside-down triangle icon to open a menu of items
-specific to the Project Explorer. Right-click inside the view to open a
-context menu. </P>
+<H2>View Menus</H2>
+<P>Click the ⋮ vertical ellipsis to open a menu of items
+specific to the Project Explorer. Some extra menu entries can be
+added by extension and may not be documented here.</P>
+<H3>Project Presentation</H3>
+<P>Select whether the physically nested projects should be shown as root elements (Flat), or
+should be shown under their parent project in place of their corresponding folder (Hierarchical).
+<H3>Top-Level Elements</H3>
+<P>Select whether the top level-elements should be the selected working sets with projects as children,
+or the visible projects.</P>
<H3>Select Working Set</H3>
<P>Opens the <B>Select Working Set</B> dialog to allow selecting a
working set for the Project Explorer.</P>
@@ -54,6 +64,9 @@
<H3>Edit Active Working Set</H3>
<P>Opens the <B>Edit Working Set</B> dialog to allow changing the
current working set.</P>
+<P><BR>
+In addition to these menu items, the Project Explorer menu shows a list of
+recently used working sets that have been selected in the view.</P>
<DIV CLASS="Topic">
<h3>Filters and Customization</h3>
<P CLASS="Para">This command allows you to change the view for your
@@ -79,11 +92,12 @@
<H3>Link with Editor</H3>
<P>See the toolbar item description above.</P>
<P><BR>
-In addition to these menu items, the Project Explorer menu shows a list of
-recently used working sets that have been selected in the view.</P>
-<P><BR>
</P>
+
<h2>Context menu</h2>
+<P>The context-menu allows to access some general Project management operations as
+well as operations that are specific to your selection. Some plugins can extend the
+context-menu with additional entries that might not be documented here.</P>
<DIV CLASS="Topic">
<h3 CLASS="Head">New</H3>
<P CLASS="Para">This command allows you to create a new resource in
@@ -208,6 +222,7 @@
</DIV>
<h3 class="related">Related concepts</h3>
+<a href="../concepts/cworkset.htm">Working Sets</a> <br>
<a href="../concepts/concepts-26.htm">Team programming with CVS</a> <br>
<a HREF="../concepts/concepts-29.htm">Three-way compare</a> <br>
<a href="../concepts/concepts-13.htm">Linked resources</a>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-1c.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-1c.htm
index 3ec2466..5450370 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-1c.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-1c.htm
@@ -22,7 +22,7 @@
</p>
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br />
- <a href="../concepts/cnav.htm">Project Explorer view</a><br />
+ <a href="../reference/ref-27.htm">Project Explorer view</a><br />
<a href="../concepts/csearchview.htm">Search view</a>
<h3 class="related">Related tasks</h3>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-46ag.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-46ag.htm
index 300f845..496b418 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-46ag.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-46ag.htm
@@ -42,7 +42,7 @@
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br>
<a href="../concepts/concepts-17.htm">Resource hierarchies</a><br>
-<a href="../concepts/cnav.htm">Project Explorer view</a>
+<a href="../reference/ref-27.htm">Project Explorer view</a>
<h3 class="related">Related tasks</h3>
<a href="tasks-84.htm">Searching for text within a file</a><br>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-48b.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-48b.htm
index c3c3ee7..80fccbd 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-48b.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-48b.htm
@@ -36,7 +36,7 @@
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br>
<a href="../concepts/concepts-17.htm">Resource hierarchies</a><br>
-<a href="../concepts/cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="../concepts/cworkset.htm">Working sets</a>
<h3 class="related">Related tasks</h3>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-63.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-63.htm
index ccd91ae..35c26cb 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-63.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-63.htm
@@ -34,7 +34,7 @@
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br>
-<a href="../concepts/cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="../concepts/concepts-13.htm">Linked resources</a>
<h3 class="related">Related tasks</h3>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-63cg.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-63cg.htm
index 1a0414b..48ad075 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-63cg.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-63cg.htm
@@ -35,7 +35,7 @@
</P>
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br>
-<a href="../concepts/cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="../concepts/concepts-13.htm">Linked resources</a>
<h3 class="related">Related tasks</h3>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-66.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-66.htm
index 53d082f..ee6fef8 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-66.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-66.htm
@@ -26,7 +26,7 @@
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br>
-<a href="../concepts/cnav.htm">Project Explorer view</a>
+<a href="../reference/ref-27.htm">Project Explorer view</a>
<h3 class="related">Related tasks</h3>
<a href="tasks-49.htm">Viewing resource properties</a><br>
diff --git a/bundles/org.eclipse.platform.doc.user/tasks/tasks-67.htm b/bundles/org.eclipse.platform.doc.user/tasks/tasks-67.htm
index efe8e7a..567e0b2 100644
--- a/bundles/org.eclipse.platform.doc.user/tasks/tasks-67.htm
+++ b/bundles/org.eclipse.platform.doc.user/tasks/tasks-67.htm
@@ -42,7 +42,7 @@
<h3 class="related">Related concepts</h3>
<a href="../concepts/concepts-12.htm">Resources</a><br>
-<a href="../concepts/cnav.htm">Project Explorer view</a><br>
+<a href="../reference/ref-27.htm">Project Explorer view</a><br>
<a href="../concepts/concepts-13.htm">Linked resources</a>
<h3 class="related">Related tasks</h3>
