Bug 578309: Tidy up documentation HTML files in /concepts Wrap lines at 120 Change-Id: I15cb2a31ed8f6f81e55d6cd61fba44d202e2dc64 Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.common/+/190406 Tested-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm index f9facb8..9b27c4e 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm
@@ -3,62 +3,40 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> - <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" - type="text/css"> - <meta name="keyword" content= - "shortcut key, accelerator key, hot key, hotkey"> - <meta name="keyword" content= - "shortcut keys, accelerator keys, hot keys, hotkeys"> - <meta name="keyword" content= - "accessibility, disability, special needs"> - <meta name="keyword" content= - "accessible, disabilities, special need"> - <meta http-equiv="Content-Type" content= - "text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css"> + <meta name="keyword" content="shortcut key, accelerator key, hot key, hotkey"> + <meta name="keyword" content="shortcut keys, accelerator keys, hot keys, hotkeys"> + <meta name="keyword" content="accessibility, disability, special needs"> + <meta name="keyword" content="accessible, disabilities, special need"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Accessibility features for Eclipse</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1>Accessibility features in Eclipse</h1> - <p>Accessibility features help people with a physical disability, - such as restricted mobility or limited vision, or those with - special needs to use software products successfully. These are - the major accessibility features in Eclipse:</p> + <p>Accessibility features help people with a physical disability, such as restricted mobility or limited vision, or + those with special needs to use software products successfully. These are the major accessibility features in + Eclipse:</p> <ul> - <li>Eclipse uses Microsoft Active Accessibility (MSAA) APIs to - render user interface elements accessible to assistive - technology.</li> - <li>You can operate all features using the keyboard instead of - the mouse. See the related task.</li> - <li>You can use screen-reader software such as Freedom - Scientific's JAWS <sup>TM</sup> and a digital speech - synthesizer to hear what is displayed on the screen. You can - also use voice recognition software, such as IBM ViaVoice - <sup>TM</sup> to enter data and to navigate the user - interface.</li> - <li>You can magnify what is displayed on your screen in the - graphical views.</li> - <li>Fonts and colors defined by Eclipse can be set using the - <a class="command-link" href= + <li>Eclipse uses Microsoft Active Accessibility (MSAA) APIs to render user interface elements accessible to + assistive technology.</li> + <li>You can operate all features using the keyboard instead of the mouse. See the related task.</li> + <li>You can use screen-reader software such as Freedom Scientific's JAWS <sup>TM</sup> and a digital speech + synthesizer to hear what is displayed on the screen. You can also use voice recognition software, such as IBM + ViaVoice <sup>TM</sup> to enter data and to navigate the user interface.</li> + <li>You can magnify what is displayed on your screen in the graphical views.</li> + <li>Fonts and colors defined by Eclipse can be set using the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <strong>General > Appearance > Colors and - Fonts</strong></a> preference page. See the related link.</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General > Appearance > + Colors and Fonts</strong></a> preference page. See the related link.</li> </ul> - <p><strong>Note:</strong> The Accessibility features mentioned in - this document apply to the Windows operating system.</p> - <h3 class="related">Related tasks</h3><a href= - "navigation.htm">Navigating the user interface using the + <p><strong>Note:</strong> The Accessibility features mentioned in this document apply to the Windows operating + system.</p> + <h3 class="related">Related tasks</h3><a href="navigation.htm">Navigating the user interface using the keyboard</a><br> - <a href="text_editor.htm">Accessibility features in textual - editors</a> - <h3 class="related">Related reference</h3><a href= - "keyboardshortcuts.htm">Keys</a><br> - <a href="fontsandcolors.htm">Font and color settings in - Eclipse</a><br> - <a href="../../reference/ref-7.htm">Accessibility preference - page</a> + <a href="text_editor.htm">Accessibility features in textual editors</a> + <h3 class="related">Related reference</h3><a href="keyboardshortcuts.htm">Keys</a><br> + <a href="fontsandcolors.htm">Font and color settings in Eclipse</a><br> + <a href="../../reference/ref-7.htm">Accessibility preference page</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm index 780013f..10ef103 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm
@@ -3,17 +3,14 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> - <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" - type="text/css"> - <meta http-equiv="Content-Type" content= - "text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Color Dialog Mappings Table</title> </head> <body> <h1>Windows Color Dialog Reference</h1> - <p>Below are the tables that show the colors of the fonts in the - matrix of the Windows color dialog and the color settings that - each of these correspond to.</p> + <p>Below are the tables that show the colors of the fonts in the matrix of the Windows color dialog and the color + settings that each of these correspond to.</p> <h2>Windows Color Dialog Color Matrix</h2> <table border="1"> <col>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm index ece129f..629a740 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm
@@ -3,36 +3,26 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> - <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" - type="text/css"> - <meta http-equiv="Content-Type" content= - "text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Fonts and colors in Eclipse</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1>Fonts and colors in Eclipse</h1> - <p>Eclipse uses the fonts and colors provided by the operating - system as much as possible. On Windows the platform color and - font settings are found on the <b>General > Colors and - Fonts</b> preference page. The font used by most widgets in - Eclipse is the one set in the Message Box settings of the - properties. However, operating systems do not provide enough - colors to handle all of the extra information that colors and - fonts provide in Eclipse.</p> + <p>Eclipse uses the fonts and colors provided by the operating system as much as possible. On Windows the platform + color and font settings are found on the <b>General > Colors and Fonts</b> preference page. The font used by most + widgets in Eclipse is the one set in the Message Box settings of the properties. However, operating systems do not + provide enough colors to handle all of the extra information that colors and fonts provide in Eclipse.</p> <h2>Fonts</h2> - <p>There are 4 main fonts in use by the Eclipse platform. They - are:</p> + <p>There are 4 main fonts in use by the Eclipse platform. They are:</p> <dl> <dt><em>Banner Font</em></dt> - <dd>Used in PDE editors, welcome pages and in the title area of - many wizards. For instance the New Project wizard uses this - font for the top title,</dd> + <dd>Used in PDE editors, welcome pages and in the title area of many wizards. For instance the New Project wizard + uses this font for the top title,</dd> <dt><em>Header Font</em></dt> - <dd>Used as a section heading. For instance the Welcome page - for the Eclipse Platform uses this font for the top title,</dd> + <dd>Used as a section heading. For instance the Welcome page for the Eclipse Platform uses this font for the top + title,</dd> <dt><em>Text Font</em></dt> <dd>Used in text editors.</dd> <dt><em>Dialog Font</em></dt> @@ -40,12 +30,9 @@ </dl> <p>These fonts can be set via the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Appearance > Colors and - Fonts</b></a> preference page. As well as these 4 fonts there are - several other secondary font settings. These default to the text - font. They can be found on the Colors and Fonts preference - page:</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Appearance > Colors + and Fonts</b></a> preference page. As well as these 4 fonts there are several other secondary font settings. These + default to the text font. They can be found on the Colors and Fonts preference page:</p> <ul> <li><b>Compare Text Font</b></li> <li><b>Console Text Font</b></li> @@ -55,127 +42,93 @@ <li><b>Java Compare Text Font</b></li> <li><b>Java Editor Text Font</b></li> <li><b>Memory Views Table Font</b></li> - <li><b>Part Title Font</b> (optional: used by some - presentations)</li> - <li><b>View Message Font</b> (optional: used by some - presentations)</li> + <li><b>Part Title Font</b> (optional: used by some presentations)</li> + <li><b>View Message Font</b> (optional: used by some presentations)</li> </ul> <h2>Colors</h2> - <p>Eclipse uses colors as an information enhancement in many - places. Whenever possible the operating system color settings are - used, but in cases where the operating system settings are not - enough, Eclipse defines other colors. All of these colors can be - adjusted via the following preference pages:</p> + <p>Eclipse uses colors as an information enhancement in many places. Whenever possible the operating system color + settings are used, but in cases where the operating system settings are not enough, Eclipse defines other colors. All + of these colors can be adjusted via the following preference pages:</p> <ul> <li><b><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.ColorsAndFonts)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Appearance > Colors and - Fonts</b></a> > Basic</b> (Error text, hyperlink text, - active hyperlink text)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Appearance > + Colors and Fonts</b></a> > Basic</b> (Error text, hyperlink text, active hyperlink text)</li> <li><b><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.GeneralTextEditor)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Editors > Text - Editors</b></a></b> (Foreground, background and other - appearance colors)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors > Text + Editors</b></a></b> (Foreground, background and other appearance colors)</li> <li><b><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Annotations)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Editors > Text Editors > - Annotations</b></a></b> (Text editors annotation colors)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors > Text + Editors > Annotations</b></a></b> (Text editors annotation colors)</li> <li><b><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.LinkedModePreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Editors > Text Editors > - Linked Mode</b></a></b> (Text editors linked mode colors)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors > Text + Editors > Linked Mode</b></a></b> (Text editors linked mode colors)</li> <li><b><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.QuickDiff)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Editors > Text Editors > - Quick Diff</b></a></b> (Colors used by text editors quick diff - feature)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors > Text + Editors > Quick Diff</b></a></b> (Colors used by text editors quick diff feature)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.search.preferences.SearchPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Search</b></a> (Foreground for - potential matches)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Search</b></a> + (Foreground for potential matches)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.ConsolePreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Run/Debug > Console</b></a> (Standard - Out, Standard Error, Standard In)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Run/Debug > Console</b></a> + (Standard Out, Standard Error, Standard In)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.DebugPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Run/Debug</b></a> (Variable Views changed - value, Memory View unbuffered lines)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Run/Debug</b></a> (Variable Views + changed value, Memory View unbuffered lines)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Ant</b></a> (Error, Warning, Information, - Verbose, Debug)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Ant</b></a> (Error, Warning, + Information, Verbose, Debug)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavaEditorPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Java > Editor</b></a> (Line number, - matching brackets, current line, print, find scope, hyperlink, - selection foreground, selection background)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Java > Editor</b></a> (Line + number, matching brackets, current line, print, find scope, hyperlink, selection foreground, selection + background)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavaEditorColoringPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Java > Editor > Syntax - Coloring</b></a> (Javadoc HTML tags, Javadoc keywords, Javadoc - links, Javadoc others, keyword 'return', keywords excluding - 'return', Method names, Multi line comment, Operators and - brackets, Others, Single-line comment, Strings, Task Tags)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Java > Editor > Syntax + Coloring</b></a> (Javadoc HTML tags, Javadoc keywords, Javadoc links, Javadoc others, keyword 'return', keywords + excluding 'return', Method names, Multi line comment, Operators and brackets, Others, Single-line comment, Strings, + Task Tags)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.CodeAssistPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Java > Editor > Content Assist</b></a> - (completion proposal background, completion proposal - foreground, method parameter background, method parameter - foreground, completion overwrite background, completion - overwrite foreground)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Java > Editor > Content + Assist</b></a> (completion proposal background, completion proposal foreground, method parameter background, method + parameter foreground, completion overwrite background, completion overwrite foreground)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.pde.ui.EditorPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Plug-in Development > Editors</b></a> - (Text, Processing instructions, Constant strings, Tags, - Comments)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Plug-in Development > + Editors</b></a> (Text, Processing instructions, Constant strings, Tags, Comments)</li> <li><a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ConsolePreferences)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Team > CVS > Console</b></a> (Command - line, Message, Error)</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Team > CVS > Console</b></a> + (Command line, Message, Error)</li> </ul> - <h2><img src="../../images/win_only.svg" alt="Windows only" - border="0">Accessibility and the Windows Color Dialog</h2> - <p>For color selection, Eclipse uses a dialog provided by the - operating system. On windows, the color selection dialog does not - respond properly to assistive technology. When you first get into - the dialog, focus is on one of the basic colors, but the dialog - provides no indication of this through assistive technology. You - can select colors in Eclipse with this dialog in the following - way:</p> + <h2><img src="../../images/win_only.svg" alt="Windows only" border="0">Accessibility and the Windows Color + Dialog</h2> + <p>For color selection, Eclipse uses a dialog provided by the operating system. On windows, the color selection + dialog does not respond properly to assistive technology. When you first get into the dialog, focus is on one of the + basic colors, but the dialog provides no indication of this through assistive technology. You can select colors in + Eclipse with this dialog in the following way:</p> <ol> - <li>Select to customize the color of something in Eclipse, for - example the color of Error Text in your Workbench Colors and - Fonts Basic preferences.</li> - <li>In the color selection dialog, tab twice to go from the - Basic Color matrix to the Define Custom Colors button and press - Enter.</li> - <li>You can now enter the basic colors using an HSL or RGB - specification according to the following definitions. See the - <a href="colordialog.htm">Windows Color Dialog Reference</a> - for a tables and values for these colors.<br></li> + <li>Select to customize the color of something in Eclipse, for example the color of Error Text in your Workbench + Colors and Fonts Basic preferences.</li> + <li>In the color selection dialog, tab twice to go from the Basic Color matrix to the Define Custom Colors button + and press Enter.</li> + <li>You can now enter the basic colors using an HSL or RGB specification according to the following definitions. + See the <a href="colordialog.htm">Windows Color Dialog Reference</a> for a tables and values for these + colors.<br></li> </ol> - <h3 class="related">Related tasks</h3><a href= - "accessmain.htm">Accessibility features in Eclipse</a><br> - <a href="navigation.htm">Navigating the user interface by using - the keyboard</a> - <h3 class="related">Related reference</h3><a href= - "keyboardshortcuts.htm">Keys</a><br> + <h3 class="related">Related tasks</h3><a href="accessmain.htm">Accessibility features in Eclipse</a><br> + <a href="navigation.htm">Navigating the user interface by using the keyboard</a> + <h3 class="related">Related reference</h3><a href="keyboardshortcuts.htm">Keys</a><br> <a href="colordialog.htm">Windows Color Dialog Reference</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm index 1e11c83..75cf346 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm
@@ -3,90 +3,58 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> - <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" - type="text/css"> - <meta http-equiv="Content-Type" content= - "text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Keys</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1>Keys</h1> - <p>The function of the keyboard can be extensively customized in - Eclipse using the <a class="command-link" href= + <p>The function of the keyboard can be extensively customized in Eclipse using the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <strong>General > Keys</strong></a> preference - page. Within Eclipse, key strokes and key sequences are assigned - to invoke particular commands.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General > Keys</strong></a> + preference page. Within Eclipse, key strokes and key sequences are assigned to invoke particular commands.</p> <h2>Key Strokes, Key Sequences, and Key Bindings</h2> - <p>A 'key stroke' is the pressing of a key on the keyboard, while - optionally holding down one or more of these modifier keys: - <code>Ctrl</code>, <code>Alt</code> (<code>⌥</code> on macOS), - <code>Shift</code>, or <code>⌘</code> (only on macOS.) For - example, holding down <code>Ctrl</code> then pressing - <code>A</code> produces the key stroke <code>Ctrl+A</code>. The - pressing of the modifier keys themselves do not constitute key - strokes.</p> - <p>A 'key sequence' is one or more key strokes. Traditionally, - Emacs assigned two or three key stroke key sequences to - particular commands. For example, the normal key sequence - assigned to <code>Close All</code> in emacs is <code>Ctrl+X - Ctrl+C</code>. To enter this key sequence, one presses the key - stroke <code>Ctrl+X</code> followed by the key stroke - <code>Ctrl+C</code>. While Eclipse supports key sequences of - arbitrary lengths, it is recommended that keyboard shortcuts be - four key strokes in length (or less).</p> - <p>A 'key binding' is the assignment of a key sequence to a - command.</p> + <p>A 'key stroke' is the pressing of a key on the keyboard, while optionally holding down one or more of these + modifier keys: <code>Ctrl</code>, <code>Alt</code> (<code>⌥</code> on macOS), <code>Shift</code>, or <code>⌘</code> + (only on macOS.) For example, holding down <code>Ctrl</code> then pressing <code>A</code> produces the key stroke + <code>Ctrl+A</code>. The pressing of the modifier keys themselves do not constitute key strokes.</p> + <p>A 'key sequence' is one or more key strokes. Traditionally, Emacs assigned two or three key stroke key sequences + to particular commands. For example, the normal key sequence assigned to <code>Close All</code> in emacs is + <code>Ctrl+X Ctrl+C</code>. To enter this key sequence, one presses the key stroke <code>Ctrl+X</code> followed by + the key stroke <code>Ctrl+C</code>. While Eclipse supports key sequences of arbitrary lengths, it is recommended that + keyboard shortcuts be four key strokes in length (or less).</p> + <p>A 'key binding' is the assignment of a key sequence to a command.</p> <h2>Schemes</h2> - <p>A 'scheme' is a set of bindings. Eclipse includes two - schemes:</p> + <p>A 'scheme' is a set of bindings. Eclipse includes two schemes:</p> <ul> <li>Default</li> <li>Emacs (extends Default)</li> </ul> - <p>The <em>Default</em> scheme contains a general set of - bindings, in many cases recognizable as traditional key sequences - for well known commands. For instance, <code>Ctrl+A</code> is - assigned to <code>Select All</code>, and <code>Ctrl+S</code> is - assigned to <code>Save</code>.</p> - <p>The <em>Emacs</em> scheme contains a set of key bindings - familiar to users of Emacs. For instance, <code>Ctrl+X H</code> - is assigned to <code>Select All</code>, and <code>Ctrl+X S</code> - is assigned to <code>Save</code>.</p> - <p>It is important to understand why the <em>Emacs</em> scheme - says that it 'extends Default'. The <em>Emacs</em> scheme is not - a complete set of bindings like the <em>Default</em> scheme. - Rather, it borrows from the <em>Default</em> scheme where - possible, only defining explicit Emacs-style bindings where they - vary from the <em>Default</em> scheme. Generally, only well known - commands like <code>Select All</code>, <code>Save</code>, etc. + <p>The <em>Default</em> scheme contains a general set of bindings, in many cases recognizable as traditional key + sequences for well known commands. For instance, <code>Ctrl+A</code> is assigned to <code>Select All</code>, and + <code>Ctrl+S</code> is assigned to <code>Save</code>.</p> + <p>The <em>Emacs</em> scheme contains a set of key bindings familiar to users of Emacs. For instance, <code>Ctrl+X + H</code> is assigned to <code>Select All</code>, and <code>Ctrl+X S</code> is assigned to <code>Save</code>.</p> + <p>It is important to understand why the <em>Emacs</em> scheme says that it 'extends Default'. The <em>Emacs</em> + scheme is not a complete set of bindings like the <em>Default</em> scheme. Rather, it borrows from the + <em>Default</em> scheme where possible, only defining explicit Emacs-style bindings where they vary from the + <em>Default</em> scheme. Generally, only well known commands like <code>Select All</code>, <code>Save</code>, etc. have specific Emacs key sequences associated with them.</p> - <p>Choose the scheme you are most comfortable with by changing - the 'Scheme' setting on the keys preference page. If you choose - the <em>Default</em> scheme, all <em>Emacs</em> bindings are - ignored. If you choose the <em>Emacs</em> scheme, explicit - Emacs-style key sequence assignments take precedence over any - conflicting assignments in the <em>Default</em> scheme.</p> + <p>Choose the scheme you are most comfortable with by changing the 'Scheme' setting on the keys preference page. If + you choose the <em>Default</em> scheme, all <em>Emacs</em> bindings are ignored. If you choose the <em>Emacs</em> + scheme, explicit Emacs-style key sequence assignments take precedence over any conflicting assignments in the + <em>Default</em> scheme.</p> <h2>Contexts</h2> - <p>Key bindings can vary based on the current context of - Eclipse.</p> - <p>Sometimes the active part might be a Java file editor, for - instance, where a different set of key sequence assignments may - be more appropriate than if the active part was an html file - editor. As a specific example, typically <code>Ctrl+B</code> is - assigned to <code>Build</code> in a context such as Java file - editing, while <code>Ctrl+B</code> is assigned to <code>Make Text - Bold</code> in a context such as HTML file editing. This context - is usually determined by the active part, but it can be - influenced by the active window or dialog as well. If the active - part does not choose a particular context, the workbench will set - the active context to <em>In Windows</em>.</p> - <p>Eclipse includes a number of different contexts. Some examples - are:</p> + <p>Key bindings can vary based on the current context of Eclipse.</p> + <p>Sometimes the active part might be a Java file editor, for instance, where a different set of key sequence + assignments may be more appropriate than if the active part was an html file editor. As a specific example, typically + <code>Ctrl+B</code> is assigned to <code>Build</code> in a context such as Java file editing, while + <code>Ctrl+B</code> is assigned to <code>Make Text Bold</code> in a context such as HTML file editing. This context + is usually determined by the active part, but it can be influenced by the active window or dialog as well. If the + active part does not choose a particular context, the workbench will set the active context to <em>In + Windows</em>.</p> + <p>Eclipse includes a number of different contexts. Some examples are:</p> <ul> <li>In Dialogs and Windows</li> <li>In Windows (extends In Dialogs and Windows)</li> @@ -99,157 +67,97 @@ <li>Editing Ant buildfiles<br> <br></li> </ul> - <p>Much like configurations, contexts can extend other contexts. - For example, the <em>Editing Java Source</em> context borrows key - bindings from the <em>Editing Text</em> context, which in turn - borrows key bindings from the <em>In Windows</em> context.</p> - <p>Note: It is not recommended to promote a key binding to a - context which it extends. For example, it is not recommended to - move an <em>Editing Text</em> key binding to the <em>In Dialogs - and Windows</em> context. This may have unexpected results.</p> - <p>It is possible for some key bindings to work in dialogs. Those - key bindings are assigned to the <em>In Dialogs and Windows</em> - context. One example of such a key binding is the key binding for - "cut". It is possible to change these key bindings. For example, - it is possible to have Ctrl+X as cut in dialogs, but Ctrl+W as - cut in windows.</p> + <p>Much like configurations, contexts can extend other contexts. For example, the <em>Editing Java Source</em> + context borrows key bindings from the <em>Editing Text</em> context, which in turn borrows key bindings from the + <em>In Windows</em> context.</p> + <p>Note: It is not recommended to promote a key binding to a context which it extends. For example, it is not + recommended to move an <em>Editing Text</em> key binding to the <em>In Dialogs and Windows</em> context. This may + have unexpected results.</p> + <p>It is possible for some key bindings to work in dialogs. Those key bindings are assigned to the <em>In Dialogs and + Windows</em> context. One example of such a key binding is the key binding for "cut". It is possible to change these + key bindings. For example, it is possible to have Ctrl+X as cut in dialogs, but Ctrl+W as cut in windows.</p> <h2>Platform and Locale</h2> - <p>Key bindings also vary by platform and locale. On the macOS - platform, <code>⌘+S</code> is assigned to <code>Save</code>, - instead of the usual <code>Ctrl+S</code>. On Chinese locales - (zh), <code>Alt+/</code> is assigned to <code>Content - Assist</code>, instead of the usual <code>Ctrl+Space</code>.</p> - <p>The current platform and locale is determined when Eclipse - starts, and does not vary over the course of an Eclipse + <p>Key bindings also vary by platform and locale. On the macOS platform, <code>⌘+S</code> is assigned to + <code>Save</code>, instead of the usual <code>Ctrl+S</code>. On Chinese locales (zh), <code>Alt+/</code> is assigned + to <code>Content Assist</code>, instead of the usual <code>Ctrl+Space</code>.</p> + <p>The current platform and locale is determined when Eclipse starts, and does not vary over the course of an Eclipse instance.</p> <h2>Customizing Key bindings</h2> - <p>With multi-stroke key sequences, schemes, and contexts, there - are a lot of things to keep in mind when customizing key - bindings. To make things easier, all key customization is done on - the <a class="command-link" href= + <p>With multi-stroke key sequences, schemes, and contexts, there are a lot of things to keep in mind when customizing + key bindings. To make things easier, all key customization is done on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Keys</b></a> preference page.</p> - <p><img src="../../images/keys1.png" alt= - "Keys preference page the About command with no binding"></p> - <p>In this example we want to bind <b>CTRL+5</b> to the About - command. By default the keys preference page will show you all - possible keybindings. You can see the About command listed in the - Help category. You can bind the command by putting focus in the - Binding text box and pressing CTRL and 5 like you would if you - were executing the command.</p> - <p><img src="../../images/keys2.png" alt= - "Keys preference page the About command bound to CTRL+5"></p> - <p>When you type CTRL+5 you have created a binding for About. The - right-most column will indicate that this is a user binding by - displaying a <b>U</b>. If there was a conflict with another key, - this column would also display a <b>C</b>. The binding will be in - the default context, "In Windows". You can now use the When combo - box to change the key binding context (for example, to move this - binding to "Editing Text").</p> - <p>If you wanted to add a second key binding to About, you can - use the <b>Copy Command</b> button to create a second command - entry for you to bind another key to. If you want to delete a - binding, you can either use the <b>Remove Binding</b> button or - simply give focus to the Binding text box and hit - <b>Backspace</b>.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Keys</b></a> preference + page.</p> + <p><img src="../../images/keys1.png" alt="Keys preference page the About command with no binding"></p> + <p>In this example we want to bind <b>CTRL+5</b> to the About command. By default the keys preference page will show + you all possible keybindings. You can see the About command listed in the Help category. You can bind the command by + putting focus in the Binding text box and pressing CTRL and 5 like you would if you were executing the command.</p> + <p><img src="../../images/keys2.png" alt="Keys preference page the About command bound to CTRL+5"></p> + <p>When you type CTRL+5 you have created a binding for About. The right-most column will indicate that this is a user + binding by displaying a <b>U</b>. If there was a conflict with another key, this column would also display a + <b>C</b>. The binding will be in the default context, "In Windows". You can now use the When combo box to change the + key binding context (for example, to move this binding to "Editing Text").</p> + <p>If you wanted to add a second key binding to About, you can use the <b>Copy Command</b> button to create a second + command entry for you to bind another key to. If you want to delete a binding, you can either use the <b>Remove + Binding</b> button or simply give focus to the Binding text box and hit <b>Backspace</b>.</p> <h2>The Dynamic Nature of Key bindings</h2> - <p>Key bindings are provided by plug-ins, and in Eclipse, - plug-ins can be added or removed. This can cause key bindings - declared by these plug-ins to be added or removed. Eclipse stores - custom key bindings in a way to compensate for this. Consider the - example above where <code>CTRL+6</code> was assigned to - <code>About</code> in the <em>Default</em> scheme. Say you - install a new plug-in that assigns <code>CTRL+6</code> to a - particular command. Eclipse will preserve your assignment to - <code>About</code>.</p> + <p>Key bindings are provided by plug-ins, and in Eclipse, plug-ins can be added or removed. This can cause key + bindings declared by these plug-ins to be added or removed. Eclipse stores custom key bindings in a way to compensate + for this. Consider the example above where <code>CTRL+6</code> was assigned to <code>About</code> in the + <em>Default</em> scheme. Say you install a new plug-in that assigns <code>CTRL+6</code> to a particular command. + Eclipse will preserve your assignment to <code>About</code>.</p> <h2>Conflict Resolution</h2> - <p>There are only a finite number of simple, common key strokes - available to assign to a multitude of commands. We have seen that - scheme, context, platform, and locale all partition key sequence - assignments into domains where they don't conflict with one - another. Consider the case for <code>Ctrl+B</code> above if - contexts did not exist. One plug-in would assign - <code>Ctrl+B</code> to <code>Build</code>, the other plug-in - would assign <code>Ctrl+B</code> to <code>Make Bold Text</code>. - How would Eclipse properly resolve this conflict?</p> - <p>Though conflicts are drastically reduced by employing the - above mechanisms, they can still occur. Two plug-ins, independent - of one another, could assign the same key sequence to different - commands with the same context, scheme, platform, and locale. - Consider if a plug-in assigned <code>Ctrl+F4</code> in the <em>In - Windows</em> context and <em>Default</em> scheme to one of its - commands. This directly conflicts with Eclipse assigning - <code>Ctrl+F4</code> to the close command in the same context and - scheme.</p> - <p>This is a conflict. It wouldn't be proper to invoke both - commands, nor would it be proper to simply choose one of the two - commands to receive the key stroke. We pop up the Key Assist - Dialog with the conflicting commands and allow the user to select - one. The Key Assist Dialog is the same dialog that displays - command choices for multiple key stroke key bindings. For - example, if 2 commands were bound to <b>F12</b> you might - see:</p> - <p><img src="../../images/keys3.png" alt= - "Keys Assist dialog"></p> - <p>If the user sets a keybinding and creates a conflict, the - conflicting bindings will be displayed in the conflicts list. - This can be used to navigate between conflicting keybindings so - that they can be changed.</p> - <p><img src="../../images/keys4.png" alt= - "Keys preference page conflict list"></p> - <p>These types of conflicts can be resolved by explicitly - assigning the key sequence to one of the commands, or remove it - from the other.</p> - <p>Another type of conflict can be caused by multiple-key stroke - key sequences. For example, in the <em>Emacs</em> scheme, there - are many multiple-key stroke key sequences beginning with the key - stroke <code>Ctrl+X</code>. <code>Ctrl+X K</code> is assigned to - <code>Close</code>. <code>Ctrl+X H</code> is assigned to - <code>Select All</code>.</p> - <p>As previously mentioned, the <em>Emacs</em> scheme borrows key - bindings from the <em>Default</em> scheme. In the default scheme, - <code>Ctrl+X</code> is assigned to <code>Cut</code>. Though the - <em>Emacs</em> scheme doesn't explicitly redefine - <code>Ctrl+X</code>, pressing <code>Ctrl+X</code> is required as - part of many of its key bindings. In the <em>Emacs</em> scheme, - when one presses <code>Ctrl+X</code>, one is half way to entering - one of many possible assigned key sequences. One would not expect - the <code>Cut</code> action to be invoked at this time.</p> - <p>For this type of conflict, the rule is that the - <code>Ctrl+X</code> key sequence assigned to <code>Cut</code> - would be ignored. Otherwise, it would not be possible to complete - many of the key bindings in the <em>Emacs</em> configuration.</p> + <p>There are only a finite number of simple, common key strokes available to assign to a multitude of commands. We + have seen that scheme, context, platform, and locale all partition key sequence assignments into domains where they + don't conflict with one another. Consider the case for <code>Ctrl+B</code> above if contexts did not exist. One + plug-in would assign <code>Ctrl+B</code> to <code>Build</code>, the other plug-in would assign <code>Ctrl+B</code> to + <code>Make Bold Text</code>. How would Eclipse properly resolve this conflict?</p> + <p>Though conflicts are drastically reduced by employing the above mechanisms, they can still occur. Two plug-ins, + independent of one another, could assign the same key sequence to different commands with the same context, scheme, + platform, and locale. Consider if a plug-in assigned <code>Ctrl+F4</code> in the <em>In Windows</em> context and + <em>Default</em> scheme to one of its commands. This directly conflicts with Eclipse assigning <code>Ctrl+F4</code> + to the close command in the same context and scheme.</p> + <p>This is a conflict. It wouldn't be proper to invoke both commands, nor would it be proper to simply choose one of + the two commands to receive the key stroke. We pop up the Key Assist Dialog with the conflicting commands and allow + the user to select one. The Key Assist Dialog is the same dialog that displays command choices for multiple key + stroke key bindings. For example, if 2 commands were bound to <b>F12</b> you might see:</p> + <p><img src="../../images/keys3.png" alt="Keys Assist dialog"></p> + <p>If the user sets a keybinding and creates a conflict, the conflicting bindings will be displayed in the conflicts + list. This can be used to navigate between conflicting keybindings so that they can be changed.</p> + <p><img src="../../images/keys4.png" alt="Keys preference page conflict list"></p> + <p>These types of conflicts can be resolved by explicitly assigning the key sequence to one of the commands, or + remove it from the other.</p> + <p>Another type of conflict can be caused by multiple-key stroke key sequences. For example, in the <em>Emacs</em> + scheme, there are many multiple-key stroke key sequences beginning with the key stroke <code>Ctrl+X</code>. + <code>Ctrl+X K</code> is assigned to <code>Close</code>. <code>Ctrl+X H</code> is assigned to <code>Select + All</code>.</p> + <p>As previously mentioned, the <em>Emacs</em> scheme borrows key bindings from the <em>Default</em> scheme. In the + default scheme, <code>Ctrl+X</code> is assigned to <code>Cut</code>. Though the <em>Emacs</em> scheme doesn't + explicitly redefine <code>Ctrl+X</code>, pressing <code>Ctrl+X</code> is required as part of many of its key + bindings. In the <em>Emacs</em> scheme, when one presses <code>Ctrl+X</code>, one is half way to entering one of many + possible assigned key sequences. One would not expect the <code>Cut</code> action to be invoked at this time.</p> + <p>For this type of conflict, the rule is that the <code>Ctrl+X</code> key sequence assigned to <code>Cut</code> + would be ignored. Otherwise, it would not be possible to complete many of the key bindings in the <em>Emacs</em> + configuration.</p> <h2>Export Key Bindings</h2> - <p>The bindings can be exported to a CSV file. For this purpose, - press the button <strong>Export CSV ...</strong>. This will - launch a file dialog, where you can specify the location of the - export file. Note: The export file is for reporting purposes only - and <strong>can not be used to import</strong> the binding files - into Eclipse.</p> + <p>The bindings can be exported to a CSV file. For this purpose, press the button <strong>Export CSV ...</strong>. + This will launch a file dialog, where you can specify the location of the export file. Note: The export file is for + reporting purposes only and <strong>can not be used to import</strong> the binding files into Eclipse.</p> <h2>Show Key Bindings When Command is Invoked</h2> - <p>For learning purposes, presentations or screen casts it is - very helpful to show the corresponding key binding when a command - is invoked. Whenever the command is invoked (via the keyboard or - via menu clicks), the key binding, the command's name and - description are shown on the screen.</p> - <p><img src="../../images/show_key_bindings.png" alt= - "Key binding of triggered command shown on screen" style= + <p>For learning purposes, presentations or screen casts it is very helpful to show the corresponding key binding when + a command is invoked. Whenever the command is invoked (via the keyboard or via menu clicks), the key binding, the + command's name and description are shown on the screen.</p> + <p><img src="../../images/show_key_bindings.png" alt="Key binding of triggered command shown on screen" style= "width: 40%"></p> - <p>This can be activated via the check boxes in the <em>Show key - binding when command is invoked</em> group on the <a class= - "command-link" href= + <p>This can be activated via the check boxes in the <em>Show key binding when command is invoked</em> group on the + <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <strong>General > Keys</strong></a> preference - page. To toggle this setting quickly, the command 'Toggle Show - Key Bindings' can be used (e.g. via the Find Actions dialog).</p> - <h3 class="related">Related concepts</h3><a href= - "accessmain.htm">Accessibility features in Eclipse</a><br> - <a href="../../tasks/tkeybindings.htm">Changing the key - bindings</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General > Keys</strong></a> + preference page. To toggle this setting quickly, the command 'Toggle Show Key Bindings' can be used (e.g. via the + Find Actions dialog).</p> + <h3 class="related">Related concepts</h3><a href="accessmain.htm">Accessibility features in Eclipse</a><br> + <a href="../../tasks/tkeybindings.htm">Changing the key bindings</a><br> <a href="../help.htm">Help</a> - <h3 class="related">Related reference</h3><a href= - "fontsandcolors.htm">Font and color settings in Eclipse</a> + <h3 class="related">Related reference</h3><a href="fontsandcolors.htm">Font and color settings in Eclipse</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm index 7dd9f59..b7c212e 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm
@@ -3,154 +3,107 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."> - <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" - type="text/css"> - <meta http-equiv="Content-Type" content= - "text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Navigating the user interface using the keyboard</title> </head> <body> <h1>Navigating the user interface using the keyboard</h1> - <p>The user interface is navigable using the keyboard. The Tab - key is used to iterate through the controls in a window (for - example, a dialog, or the current perspective's views and editors - and the main controls for the Workbench window). To tab out of - views that use the Tab key (such as editors) use Ctrl+Tab. When - the focus is on an editor or view tab, pressing the left/right - arrow key moves to the previous/next tab and pressing Enter moves - the focus to the current selection in the editor or view.</p> + <p>The user interface is navigable using the keyboard. The Tab key is used to iterate through the controls in a + window (for example, a dialog, or the current perspective's views and editors and the main controls for the Workbench + window). To tab out of views that use the Tab key (such as editors) use Ctrl+Tab. When the focus is on an editor or + view tab, pressing the left/right arrow key moves to the previous/next tab and pressing Enter moves the focus to the + current selection in the editor or view.</p> <h2>Menus</h2> - <p>Most menus are assigned mnemonics for each entry which allow - you to select them by typing the underlined letter instead of the - mouse. You can also select an item by moving through the menus - and sub-menus with the arrow keys.</p> - <p>The various menus available can be accessed using the keyboard - in the following ways:</p> + <p>Most menus are assigned mnemonics for each entry which allow you to select them by typing the underlined letter + instead of the mouse. You can also select an item by moving through the menus and sub-menus with the arrow keys.</p> + <p>The various menus available can be accessed using the keyboard in the following ways:</p> <ul> <li>F10 accesses the menus on the main menu bar.</li> - <li>Shift+F10 pops up the context menu for the current view. - (Note: this shortcut is actually dependent on your window - manager, but for most people it should be Shift+F10.)</li> - <li>Ctrl+F10 will open the pull down menu for the current view - if there is one. For editors, Ctrl+F10 will open the menu for - the marker bar on the left of the editor area.</li> - <li>Alt+mnemonic will activate the Workbench menu for a - particular entry (e.g., Alt+W will bring down the Window + <li>Shift+F10 pops up the context menu for the current view. (Note: this shortcut is actually dependent on your + window manager, but for most people it should be Shift+F10.)</li> + <li>Ctrl+F10 will open the pull down menu for the current view if there is one. For editors, Ctrl+F10 will open the + menu for the marker bar on the left of the editor area.</li> + <li>Alt+mnemonic will activate the Workbench menu for a particular entry (e.g., Alt+W will bring down the Window menu).</li> - <li>Microsoft Windows only: Pressing Alt will give focus to the - menu bar.</li> + <li>Microsoft Windows only: Pressing Alt will give focus to the menu bar.</li> </ul> <h2>Controls</h2> - <p>Mnemonics are assigned to most control labels (e.g., buttons, - checkboxes, radio buttons, etc.) in dialog boxes, preference - pages, and property pages. To access the control associated with - a label, use the Alt key along with the letter that is underlined - in the label.</p> + <p>Mnemonics are assigned to most control labels (e.g., buttons, checkboxes, radio buttons, etc.) in dialog boxes, + preference pages, and property pages. To access the control associated with a label, use the Alt key along with the + letter that is underlined in the label.</p> <h2>Navigation Context</h2> - <p>Navigation context is saved for the packages, navigator views, - Workbench preferences and properties dialogs. The selected page - for the preferences and properties dialog is saved between - invocations of the dialog but are not saved between workbench - invocations.</p> + <p>Navigation context is saved for the packages, navigator views, Workbench preferences and properties dialogs. The + selected page for the preferences and properties dialog is saved between invocations of the dialog but are not saved + between workbench invocations.</p> <h2>Cycling Editors, Views and Perspectives</h2> - <p>To switch between editors, views and perspectives, the - workbench provides a cycling function that is invoked by Ctrl and - a function key. All of these cycling functions recall the last - thing selected to allow for rapid cycling back and forth between - two items. The cycling functions are</p> + <p>To switch between editors, views and perspectives, the workbench provides a cycling function that is invoked by + Ctrl and a function key. All of these cycling functions recall the last thing selected to allow for rapid cycling + back and forth between two items. The cycling functions are</p> <ul> <li>Ctrl+F6 - Cycle to Editor</li> <li>Ctrl+F7 - Cycle to View</li> <li>Ctrl+F8 - Cycle to Perspective</li> </ul> - <p>If you use the "StickyKeys" input, you might need to enable - the "Keep next/previous editor, view and perspectives dialog - open" option on the <a class="command-link" href= + <p>If you use the "StickyKeys" input, you might need to enable the "Keep next/previous editor, view and perspectives + dialog open" option on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <strong>General</strong></a> preference page.</p> - <p>Also, Ctrl+E can be used to activate the editor drop-down, and - Ctrl+PageUp and Ctrl+PageDown can be used for switching between - open editors, or between views within the same context.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General</strong></a> preference + page.</p> + <p>Also, Ctrl+E can be used to activate the editor drop-down, and Ctrl+PageUp and Ctrl+PageDown can be used for + switching between open editors, or between views within the same context.</p> <h2>Accelerators</h2> - <p>Many of the actions in Eclipse have an accelerator assigned to - them. For additional information on accelerators, see <a href= - "keyboardshortcuts.htm">Keys</a>.</p> + <p>Many of the actions in Eclipse have an accelerator assigned to them. For additional information on accelerators, + see <a href="keyboardshortcuts.htm">Keys</a>.</p> <h2>Find Actions</h2> - <p>To quickly access UI elements such as views, commands, - preference pages, and others, you can use the Find Actions + <p>To quickly access UI elements such as views, commands, preference pages, and others, you can use the Find Actions dialog, available under <a class="command-link" href= - 'javascript:executeCommand("org.eclipse.ui.window.quickAccess")'><img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" - alt="command link"> <b>Window > Navigation > Find - Actions</b></a> and bound to <b>Ctrl+3</b> by default. Start - typing in the filter field to see matches. For example, to open - the help view, type <b>Ctrl+3</b> followed by "help". One of the - first matches will be to open the help view; other matches show - commands and preference pages related to help. You can use the - arrow keys to select a different match for a given filter string. - Press Enter to select the highlighted entry. This will execute - the command, or open the view, perspective, or wizard etc.</p> + 'javascript:executeCommand("org.eclipse.ui.window.quickAccess")'><img src= + "PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Navigation > Find + Actions</b></a> and bound to <b>Ctrl+3</b> by default. Start typing in the filter field to see matches. For example, + to open the help view, type <b>Ctrl+3</b> followed by "help". One of the first matches will be to open the help view; + other matches show commands and preference pages related to help. You can use the arrow keys to select a different + match for a given filter string. Press Enter to select the highlighted entry. This will execute the command, or open + the view, perspective, or wizard etc.</p> <h2>Following Embedded Links</h2> - <p>For links embedded in dialogs, such as the links between - preference pages, or hyper-links in the About dialog, press - "Space" key to activate the currently selected link.</p> + <p>For links embedded in dialogs, such as the links between preference pages, or hyper-links in the About dialog, + press "Space" key to activate the currently selected link.</p> <h2>Changing Size of Views and Editors</h2> - <p>You can adjust size of most views and editors using commands - in the "Size" system menu. By default the system menu for the - active part is bound to <b>Alt+"-"</b>. After a "Size" submenu - (Left, Right, Top, or Bottom) is selected, the selected part's - side will be highlighted and can be moved using the arrow - keys.</p> + <p>You can adjust size of most views and editors using commands in the "Size" system menu. By default the system menu + for the active part is bound to <b>Alt+"-"</b>. After a "Size" submenu (Left, Right, Top, or Bottom) is selected, the + selected part's side will be highlighted and can be moved using the arrow keys.</p> <h2>Help system</h2> - <p>You can navigate the help system by keyboard using the - following key combinations:</p> + <p>You can navigate the help system by keyboard using the following key combinations:</p> <ul> - <li>Pressing Tab inside a frame (page) takes you to the next - link, button or topic node.</li> - <li>To expand/collapse a tree node, press Right/Left - arrows.</li> - <li>To move to the next topic node, press Down arrow or - Tab</li> - <li>To move to the previous topic node, press Up arrow or - Shift+Tab</li> + <li>Pressing Tab inside a frame (page) takes you to the next link, button or topic node.</li> + <li>To expand/collapse a tree node, press Right/Left arrows.</li> + <li>To move to the next topic node, press Down arrow or Tab</li> + <li>To move to the previous topic node, press Up arrow or Shift+Tab</li> <li>To display selected topic, press Enter.</li> <li>To scroll all the way up or down press Home or End.</li> - <li>To go back press Alt+Left arrow; to go forward press - Alt+Right arrow.</li> - <li>To go to the next frame, or toolbar press Ctrl+Tab - (Ctrl+F6, if using Mozilla, or Mozilla based browser).</li> - <li>To move to previous frame, press Shift+Ctrl+Tab. - (Shift-Ctrl+F6, if using Mozilla, or Mozilla based + <li>To go back press Alt+Left arrow; to go forward press Alt+Right arrow.</li> + <li>To go to the next frame, or toolbar press Ctrl+Tab (Ctrl+F6, if using Mozilla, or Mozilla based browser).</li> + <li>To move to previous frame, press Shift+Ctrl+Tab. (Shift-Ctrl+F6, if using Mozilla, or Mozilla based browser).</li> - <li>To move to the frame displaying topic content press Alt+K - (when using embedded help browser on Windows, or Internet - Explorer).</li> + <li>To move to the frame displaying topic content press Alt+K (when using embedded help browser on Windows, or + Internet Explorer).</li> <li>To move to Contents tab, press Alt+C</li> <li>To move to Search Results tab, press Alt+R</li> <li>To move between tabs, press Right/Left arrows.</li> <li>To switch view, select a tab and press Enter.</li> - <li>To switch and move to a view, select a tab and press Up - arrow.</li> + <li>To switch and move to a view, select a tab and press Up arrow.</li> <li>To move to the search entry field, press Alt+S</li> - <li>To print the current page or active frame, press - Ctrl+P.</li> - <li>To find a string in the current page or active frame, press - Ctrl+F (when using embedded help browser on Windows, or - Internet Explorer).</li> + <li>To print the current page or active frame, press Ctrl+P.</li> + <li>To find a string in the current page or active frame, press Ctrl+F (when using embedded help browser on + Windows, or Internet Explorer).</li> </ul> - <p>Most labels of controls on help system pop-up dialogs have - mnemonics are assigned to them. To access the control associated - with a label, use the Alt key along with the letter that is - underlined.</p> - <h3 class="related">Related concepts</h3><a href= - "accessmain.htm">Accessibility features in Eclipse</a><br> - <a href="text_editor.htm">Accessibility features in textual - editors</a><br> - <a href="../../tasks/tkeybindings.htm">Changing the key - bindings</a><br> + <p>Most labels of controls on help system pop-up dialogs have mnemonics are assigned to them. To access the control + associated with a label, use the Alt key along with the letter that is underlined.</p> + <h3 class="related">Related concepts</h3><a href="accessmain.htm">Accessibility features in Eclipse</a><br> + <a href="text_editor.htm">Accessibility features in textual editors</a><br> + <a href="../../tasks/tkeybindings.htm">Changing the key bindings</a><br> <a href="keyboardshortcuts.htm">Keys</a><br> <a href="../help.htm">Help</a> - <h3 class="related">Related reference</h3><a href= - "fontsandcolors.htm">Font and color settings in Eclipse</a> + <h3 class="related">Related reference</h3><a href="fontsandcolors.htm">Font and color settings in Eclipse</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm index a5c5292..163fd4c 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm
@@ -4,155 +4,108 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2009, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." /> - <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" - type="text/css" /> - <meta http-equiv="Content-Type" content= - "text/html; charset=utf-8" /> + <link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Accessibility features in textual editors</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1>Accessibility features in textual editors</h1> - <p>Textual editors in Eclipse can be configured to better fit the - needs of people using Accessible Technology such as screen - readers and magnifiers. This document describes the relevant - options.</p> + <p>Textual editors in Eclipse can be configured to better fit the needs of people using Accessible Technology such as + screen readers and magnifiers. This document describes the relevant options.</p> <h2>Code Folding</h2> - <p>Some editors offer code folding by default which can be - confusing. Disabling this feature can help to better read the - code. Search for "folding" in the <b>Preferences</b> dialog to - find related options.</p> + <p>Some editors offer code folding by default which can be confusing. Disabling this feature can help to better read + the code. Search for "folding" in the <b>Preferences</b> dialog to find related options.</p> <h2>Accessing Annotations</h2> - <p>You can navigate to the next annotation by pressing - <b>Ctrl+.</b> and to the previous one by pressing <b>Ctrl+,</b>. - Out of the box not all available annotation types are included in - that navigation, for example, breakpoints are not part of it. - Breakpoints and other annotation types can either be enabled via - the <b>Next Annotation</b> toolbar button drop-down menu or by - checking <b>Include in next/previous navigation</b> on the + <p>You can navigate to the next annotation by pressing <b>Ctrl+.</b> and to the previous one by pressing + <b>Ctrl+,</b>. Out of the box not all available annotation types are included in that navigation, for example, + breakpoints are not part of it. Breakpoints and other annotation types can either be enabled via the <b>Next + Annotation</b> toolbar button drop-down menu or by checking <b>Include in next/previous navigation</b> on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.editors.preferencePages.Annotations)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>General > Editors > Text Editors - > Annotations</strong></a> preference page.</p> - <p>Navigating to an annotation moves the text caret to the - annotated line, and displays the annotation text in the status - line. The next section explains how to read the status line under - Windows.</p> - <p>Some annotation types, for example warnings and errors, can be - accessed by pressing <b>F2</b> after having navigated to one of - them or setting the caret inside the annotation.</p> - <h2><img src="../../images/win_only.svg" alt="Windows only" - border="0" />Reading the status line with JAWS</h2> - <p>JAWS desktop users press <b>Insert+PageDown</b> to read the - Eclipse status line and JAWS laptop users press <b>Caps - Lock+PageDown</b>.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General > Editors > + Text Editors > Annotations</strong></a> preference page.</p> + <p>Navigating to an annotation moves the text caret to the annotated line, and displays the annotation text in the + status line. The next section explains how to read the status line under Windows.</p> + <p>Some annotation types, for example warnings and errors, can be accessed by pressing <b>F2</b> after having + navigated to one of them or setting the caret inside the annotation.</p> + <h2><img src="../../images/win_only.svg" alt="Windows only" border="0" />Reading the status line with JAWS</h2> + <p>JAWS desktop users press <b>Insert+PageDown</b> to read the Eclipse status line and JAWS laptop users press + <b>Caps Lock+PageDown</b>.</p> <h2>Accessing the Current Line Number</h2> - <p>You can get the current line number by pressing <b>Ctrl+L</b> - or via <b>Navigate > Go To Line...</b>.</p> + <p>You can get the current line number by pressing <b>Ctrl+L</b> or via <b>Navigate > Go To Line...</b>.</p> <h2>Hovers and Pop-up Windows</h2> - <p><b>F2</b> can be used to show and give focus to most hovers - and pop-up windows in textual editors, like content assist - proposals, content assist argument proposals, Quick Assists, - Quick Fixes, errors and warnings. This allows the screen reader - to read its contents. The key sequence for the <b>Show Tooltip - Description</b> command can be changed on the <a class= - "command-link" href= + <p><b>F2</b> can be used to show and give focus to most hovers and pop-up windows in textual editors, like content + assist proposals, content assist argument proposals, Quick Assists, Quick Fixes, errors and warnings. This allows the + screen reader to read its contents. The key sequence for the <b>Show Tooltip Description</b> command can be changed + on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>General > Keys</strong></a> - preference page.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General > + Keys</strong></a> preference page.</p> <h2>Quick Diff Hover</h2> - <p>Like normal hovers can be shown by pressing <b>F2</b>, the - quick diff and revision hovers that appear when hovering over the - quick diff ruler on the left can also be shown by pressing a key - sequence. However, out of the box no key sequence is defined for - that. Go to the <a class="command-link" href= + <p>Like normal hovers can be shown by pressing <b>F2</b>, the quick diff and revision hovers that appear when + hovering over the quick diff ruler on the left can also be shown by pressing a key sequence. However, out of the box + no key sequence is defined for that. Go to the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>General > Keys</strong></a> - preference page to assign a key sequence to the <b>Show Quick - Diff Ruler Tooltip</b> command.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General > + Keys</strong></a> preference page to assign a key sequence to the <b>Show Quick Diff Ruler Tooltip</b> command.</p> <h2>Annotation Hover</h2> - <p>Like normal hovers can be shown by pressing <b>F2</b>, the - annotation hover that appears when hovering over the vertical - ruler on the left can also be shown by pressing a key sequence. - However, out of the box no key sequence is defined for that. Go - to the <a class="command-link" href= + <p>Like normal hovers can be shown by pressing <b>F2</b>, the annotation hover that appears when hovering over the + vertical ruler on the left can also be shown by pressing a key sequence. However, out of the box no key sequence is + defined for that. Go to the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Keys)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>General > Keys</strong></a> - preference page to assign a key sequence to the <b>Show Ruler - Annotation Tooltip</b> command.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>General > + Keys</strong></a> preference page to assign a key sequence to the <b>Show Ruler Annotation Tooltip</b> command.</p> <h2>Content Assist Auto Activation</h2> - <p>In order to prevent content assist to open automatically and - hence maybe unexpectedly, it is recommended to disable auto - activation. In the SDK the options below are available. Other - editors might offer similar preferences.</p> + <p>In order to prevent content assist to open automatically and hence maybe unexpectedly, it is recommended to + disable auto activation. In the SDK the options below are available. Other editors might offer similar + preferences.</p> <ul> - <li>Deselect <b>Enable auto activation</b> on the <a class= - "command-link" href= + <li>Deselect <b>Enable auto activation</b> on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntCodeAssistPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>Ant > Editor > Content - Assist</strong></a> preference page</li> - <li>Deselect <b>Enable auto activation</b> on the <a class= - "command-link" href= + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>Ant > Editor > + Content Assist</strong></a> preference page</li> + <li>Deselect <b>Enable auto activation</b> on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.CodeAssistPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>Java > Editor > Content - Assist</strong></a> preference page</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>Java > Editor > + Content Assist</strong></a> preference page</li> </ul> <h2>Reading Words in the Java Editor</h2> - <p>In order to get correct results when letting the screen reader - read words in the Java editor it is recommended to disable - <b>Smart caret positioning in Java names</b> on the <a class= - "command-link" href= + <p>In order to get correct results when letting the screen reader read words in the Java editor it is recommended to + disable <b>Smart caret positioning in Java names</b> on the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.jdt.ui.preferences.JavaEditorPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link" /> <strong>Java > Editor</strong></a> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link" /> <strong>Java > Editor</strong></a> preference page.</p> <h2>Reading Java Code in the Java Editor</h2> - <p>Some screen readers do not read punctuation by default, - however it is useful to hear punctuation when reading code. When - using a Java Editor with a screen reader, you can do the - following:</p> + <p>Some screen readers do not read punctuation by default, however it is useful to hear punctuation when reading + code. When using a Java Editor with a screen reader, you can do the following:</p> <ul> <li>JAWS:<br /> - <p>JAWS reads most punctuation out of the box, however it - does not say commas. To change this:</p> + <p>JAWS reads most punctuation out of the box, however it does not say commas. To change this:</p> <ul> <li><b>Utilities > Configuration Manager</b></li> <li><b>Set Options > Customize Punctuation...</b></li> - <li>Select <b>comma</b> in the list, and change the setting - from <b>All</b> to <b>Most</b></li> + <li>Select <b>comma</b> in the list, and change the setting from <b>All</b> to <b>Most</b></li> <li><b>OK</b></li> <li><b>File > Save</b> (to save the configuration)</li> - <li><b>File > Exit</b> (to exit the JAWS Configuration - Manager)</li> + <li><b>File > Exit</b> (to exit the JAWS Configuration Manager)</li> </ul> </li> <li>NVDA: <ul> - <li>NVDA menu (<b>Insert+n</b>) <b>> Preferences > - Voice settings...</b>: enable <b>Speak all + <li>NVDA menu (<b>Insert+n</b>) <b>> Preferences > Voice settings...</b>: enable <b>Speak all punctuation</b></li> - <li>NVDA menu (<b>Insert+n</b>) <b>> Save - configuration</b></li> + <li>NVDA menu (<b>Insert+n</b>) <b>> Save configuration</b></li> </ul> </li> <li>Orca: <ul> - <li><b>Preferences > Speech > Punctuation level: - All</b></li> + <li><b>Preferences > Speech > Punctuation level: All</b></li> <li><b>OK</b></li> </ul> </li> <li>VoiceOver:<br /> - <p>VoiceOver reads most punctuation out of the box, however - it does not say commas. To change this:</p> + <p>VoiceOver reads most punctuation out of the box, however it does not say commas. To change this:</p> <ul> <li><b>VoiceOver Utility</b></li> <li><b>Verbosity</b> tab</li> @@ -162,21 +115,15 @@ <li>Window-Eyes: <ul> <li><b>Global > Menu level</b>: <b>Advanced</b></li> - <li><b>Screen > Punctuation</b>: enable <b>Textual</b>, - <b>Math</b>, and <b>Miscellaneous</b></li> + <li><b>Screen > Punctuation</b>: enable <b>Textual</b>, <b>Math</b>, and <b>Miscellaneous</b></li> <li><b>File > Save</b></li> </ul> </li> </ul> - <h3 class="related">Related tasks</h3><a href= - "accessmain.htm">Accessibility features in Eclipse</a><br /> - <a href="navigation.htm">Navigating the user interface by using - the keyboard</a> - <h3 class="related">Related reference</h3><a href= - "../../reference/ref-7.htm">Accessibility preference - page</a><br /> + <h3 class="related">Related tasks</h3><a href="accessmain.htm">Accessibility features in Eclipse</a><br /> + <a href="navigation.htm">Navigating the user interface by using the keyboard</a> + <h3 class="related">Related reference</h3><a href="../../reference/ref-7.htm">Accessibility preference page</a><br /> <a href="keyboardshortcuts.htm">Keys</a><br /> - <a href="fontsandcolors.htm">Font and color settings in - Eclipse</a> + <a href="fontsandcolors.htm">Font and color settings in Eclipse</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cbookmrk.htm b/bundles/org.eclipse.platform.doc.user/concepts/cbookmrk.htm index 09aa277..e8bccbf 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/cbookmrk.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/cbookmrk.htm
@@ -3,38 +3,26 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Bookmarks</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Bookmarks</h1> - <p class="Para">You can place an "anchor" either on a resource - within the Workbench, or at a specific line within a file, by - creating a bookmark. Then you can use the Bookmarks view to - return to those files quickly.</p> - <p class="Para">The Bookmarks view (<b>Window > Show View > - Bookmarks</b>) displays all bookmarks that you have created.</p> - <h3 class="related">Related concepts</h3><a href= - "ctskview.htm">Tasks view</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-81b.htm">Creating a bookmark for an entire - file</a><br> - <a href="../tasks/tasks-81.htm">Creating a bookmark within a - file</a><br> + <p class="Para">You can place an "anchor" either on a resource within the Workbench, or at a specific line within a + file, by creating a bookmark. Then you can use the Bookmarks view to return to those files quickly.</p> + <p class="Para">The Bookmarks view (<b>Window > Show View > Bookmarks</b>) displays all bookmarks that you have + created.</p> + <h3 class="related">Related concepts</h3><a href="ctskview.htm">Tasks view</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-81b.htm">Creating a bookmark for an entire file</a><br> + <a href="../tasks/tasks-81.htm">Creating a bookmark within a file</a><br> <a href="../tasks/tasks-82.htm">Deleting a bookmark</a><br> - <a href="../tasks/tasks-77.htm">Adding line items in the Tasks - view</a><br> - <a href="../tasks/tasks-77b.htm">Associating a task with an - editable resource</a> - <h3 class="related">Related concepts</h3><a href= - "concepts-11.htm">Markers</a><br> + <a href="../tasks/tasks-77.htm">Adding line items in the Tasks view</a><br> + <a href="../tasks/tasks-77b.htm">Associating a task with an editable resource</a> + <h3 class="related">Related concepts</h3><a href="concepts-11.htm">Markers</a><br> <a href="ctskview.htm">Tasks view</a><br> <a href="cprbview.htm">Problems view</a><br> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-28.htm">Bookmarks view</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-28.htm">Bookmarks view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cdecorations.htm b/bundles/org.eclipse.platform.doc.user/concepts/cdecorations.htm index a7d998e..ed91ffe 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/cdecorations.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/cdecorations.htm
@@ -3,31 +3,22 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Label decorations</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Label decorations</h1> - <p class="Para">Label decorations are used to show extra - information about an item by modifying its label or icon. They - can be used to obtain information about the state of an item - without having to look at its properties in the Properties view - or open its Properties dialog.</p> - <p class="Para">A number of label decorators may be available. To - control which decorators are visible, go to the <a class= - "command-link" href= + <p class="Para">Label decorations are used to show extra information about an item by modifying its label or icon. + They can be used to obtain information about the state of an item without having to look at its properties in the + Properties view or open its Properties dialog.</p> + <p class="Para">A number of label decorators may be available. To control which decorators are visible, go to the + <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Decorators)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Appearance > Label - Decorations</b></a> preference page. This preference page - provides a selectable list and description of the available + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Appearance > Label + Decorations</b></a> preference page. This preference page provides a selectable list and description of the available decorations.</p> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-11.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-11.htm index 6982979..2c1e6a7 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-11.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-11.htm
@@ -3,77 +3,60 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Markers</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Markers</h1> - <p class="Head">Markers are objects that may be associated with - Workbench resources. There are many uses of markers in the - Workbench. The three main uses of markers in the Workbench - are:</p> + <p class="Head">Markers are objects that may be associated with Workbench resources. There are many uses of markers + in the Workbench. The three main uses of markers in the Workbench are:</p> <ul> <li>Tasks</li> <li>Problems</li> <li>Bookmarks</li> </ul> - <p class="Head">Markers are shown in a marker view (Tasks, - Problems or Bookmark view) or on the marker bar in the editor - area.</p> - <p class="Head">The following sections give more detail on each - of these marker types.</p> + <p class="Head">Markers are shown in a marker view (Tasks, Problems or Bookmark view) or on the marker bar in the + editor area.</p> + <p class="Head">The following sections give more detail on each of these marker types.</p> <div class="Subtopic"> <h2>Tasks</h2> - <p class="Para">A task marker represents a work item. There are - two kinds of tasks:</p> + <p class="Para">A task marker represents a work item. There are two kinds of tasks:</p> <ul class="UnorderedList"> - <li class="Item">Automatically-generated information - associated with the resource</li> - <li class="Item">User specified tasks that may or may not be - associated with a resource</li> + <li class="Item">Automatically-generated information associated with the resource</li> + <li class="Item">User specified tasks that may or may not be associated with a resource</li> </ul> <p>Both of these task types appear in the Tasks view.</p> <h2>Problems</h2> - <p>Problem markers represent invalid states and are categorized - as follows..</p> + <p>Problem markers represent invalid states and are categorized as follows..</p> </div> <ul> <li> <div class="Subtopic"> - <strong>Errors</strong>: Error markers are often used to - indicate the source location of syntax or compilation + <strong>Errors</strong>: Error markers are often used to indicate the source location of syntax or compilation errors. </div> </li> <li> <div class="Subtopic"> - <strong>Warnings</strong>: Warning markers indicate the - source location of, for example, compilation warnings. + <strong>Warnings</strong>: Warning markers indicate the source location of, for example, compilation warnings. </div> </li> <li> <div class="Subtopic"> - <strong>Information</strong>: Information markers indicate - the source location of information only tasks. + <strong>Information</strong>: Information markers indicate the source location of information only tasks. </div> </li> </ul> <p>Problems are shown in the Problems view.</p> <h2>Bookmarks</h2> - <p>Bookmarks place an anchor either at a specific line in a - resource or on the resource itself. They are shown in the + <p>Bookmarks place an anchor either at a specific line in a resource or on the resource itself. They are shown in the Bookmarks view.</p> - <h3 class="related">Related concepts</h3><a href= - "cbookmrk.htm">Bookmarks</a><br> + <h3 class="related">Related concepts</h3><a href="cbookmrk.htm">Bookmarks</a><br> <a href="ctskview.htm">Tasks view</a><br> <a href="cprbview.htm">Problems view</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-81.htm">Creating a bookmark within a file</a><br> - <a href="../tasks/tasks-81b.htm">Creating a bookmark for an - entire file</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-81.htm">Creating a bookmark within a file</a><br> + <a href="../tasks/tasks-81b.htm">Creating a bookmark for an entire file</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 44e6da4..b3b9d0d 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-12.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-12.htm
@@ -3,69 +3,50 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Resources</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Resources</h1> - <p class="Head"><i>Resources</i> is a collective term for the - projects, folders, and files that exist in the Workbench. The - navigation views provide a hierarchical view of resources and - allows you to open them for editing. Other tools may display and - handle these resources differently.</p> - <p class="Head">There are three basic types of resources that - exist in the Workbench:</p> + <p class="Head"><i>Resources</i> is a collective term for the projects, folders, and files that exist in the + Workbench. The navigation views provide a hierarchical view of resources and allows you to open them for editing. + Other tools may display and handle these resources differently.</p> + <p class="Head">There are three basic types of resources that exist in the Workbench:</p> <dl> <dt>Files</dt> - <dd>Comparable to files as you see them in the file - system.</dd> + <dd>Comparable to files as you see them in the file system.</dd> <dt>Folders</dt> - <dd>Comparable to directories on a file system. In the - Workbench, folders are contained in projects or other folders. - Folders can contain files and other folders.</dd> + <dd>Comparable to directories on a file system. In the Workbench, folders are contained in projects or other + folders. Folders can contain files and other folders.</dd> <dt>Projects</dt> - <dd>Contain folders and files. Projects are used for builds, - version management, sharing, and resource organization. Like - folders, projects map to directories in the file system. (When - you create a project, you specify a location for it in the file - system.)</dd> - <dd>A project is either open or closed. When a project is - closed, it cannot be changed in the Workbench. The resources of - a closed project will not appear in the Workbench, but the - resources still reside on the local file system. Closed - projects require less memory. Since they are not examined - during builds, closing a project can improve build time.</dd> - <dd>When a project is open, the structure of the project can be - changed and you will see the contents.</dd> + <dd>Contain folders and files. Projects are used for builds, version management, sharing, and resource + organization. Like folders, projects map to directories in the file system. (When you create a project, you specify + a location for it in the file system.)</dd> + <dd>A project is either open or closed. When a project is closed, it cannot be changed in the Workbench. The + resources of a closed project will not appear in the Workbench, but the resources still reside on the local file + system. Closed projects require less memory. Since they are not examined during builds, closing a project can + improve build time.</dd> + <dd>When a project is open, the structure of the project can be changed and you will see the contents.</dd> </dl> - <p>Folders and files can be linked to locations in the file - system outside of the project's location. These special folders - and files are called <a href="concepts-13.htm">linked - resources</a>.</p> - <p>Different tools that plug into the Workbench use their own - specialized types of projects, folders, and files.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a><br> + <p>Folders and files can be linked to locations in the file system outside of the project's location. These special + folders and files are called <a href="concepts-13.htm">linked resources</a>.</p> + <p>Different tools that plug into the Workbench use their own specialized types of projects, folders, and files.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</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> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-53.xhtml">Importing resources into the + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-53.xhtml">Importing resources into the Workbench</a><br> <a href="../tasks/tasks-42.htm">Creating a project</a><br> <a href="../tasks/tasks-43.htm">Creating a folder</a><br> <a href="../tasks/tasks-44.htm">Creating a file</a><br> <a href="../tasks/tasks-45.htm">Creating linked resources</a><br> <a href="../tasks/tasks-47.htm">Closing projects</a><br> - <a href="../tasks/tasks-49.htm">Viewing resource - properties</a><br> - <a href="../tasks/tasks-46ag.htm">Finding a resource - quickly</a><br> + <a href="../tasks/tasks-49.htm">Viewing resource properties</a><br> + <a href="../tasks/tasks-46ag.htm">Finding a resource quickly</a><br> <a href="../tasks/tasks-63cg.htm">Copying resources</a><br> <a href="../tasks/tasks-63.htm">Moving resources</a><br> <a href="../tasks/tasks-68.htm">Comparing resources</a><br>
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 8ca2ab1..c1fbe3e 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-13.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-13.htm
@@ -3,67 +3,43 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Linked resources</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Linked resources</h1> - <p>Linked resources are files and folders that are stored in - locations in the file system outside of the project's location. - These special resources can be used to add files and folders to - your project that for some reason must be stored in a certain - place outside of your project. For example, a linked folder can - be used to store build output separately from your source - files.</p> - <p>You can even use linked resources to overlap other resources - in the workspace, so resources from one project can appear in - another project. If you do want to have overlapping resources in - your workspace, do so with caution. Keep in mind that this means - changing a resource in one place will cause simultaneous changes - in the duplicate resource. Deleting one duplicate resource will - delete both!</p> - <p>Deleting a linked resource will <em>not</em> cause the - corresponding resource in the file system to be deleted. However, - deleting child resources of linked folders <em>will</em> cause - them to be removed from the file system.</p> - <p>Linked resource target paths can be either defined as absolute - paths, or relative to a path variable.</p> - <p>The linked resource target path can be changed by selecting - the <b>Edit...</b> button in the <b>File > Properties > - Resource</b> property page of the linked resource.</p> - <p>A list of all linked resources that exist in a project can be - seen and edited from the <b>File > Properties > Resource - > Linked Resources</b> property page, under the <b>Linked - Resources</b> tab.</p> - <p>Some plug-ins built on top of the Eclipse platform are not - compatible with linked resources. If this is the case, you can - completely disable the linked resource feature to prevent them - from being created in your workspace. Linked resources can be - disabled from the <a class="command-link" href= + <p>Linked resources are files and folders that are stored in locations in the file system outside of the project's + location. These special resources can be used to add files and folders to your project that for some reason must be + stored in a certain place outside of your project. For example, a linked folder can be used to store build output + separately from your source files.</p> + <p>You can even use linked resources to overlap other resources in the workspace, so resources from one project can + appear in another project. If you do want to have overlapping resources in your workspace, do so with caution. Keep + in mind that this means changing a resource in one place will cause simultaneous changes in the duplicate resource. + Deleting one duplicate resource will delete both!</p> + <p>Deleting a linked resource will <em>not</em> cause the corresponding resource in the file system to be deleted. + However, deleting child resources of linked folders <em>will</em> cause them to be removed from the file system.</p> + <p>Linked resource target paths can be either defined as absolute paths, or relative to a path variable.</p> + <p>The linked resource target path can be changed by selecting the <b>Edit...</b> button in the <b>File > + Properties > Resource</b> property page of the linked resource.</p> + <p>A list of all linked resources that exist in a project can be seen and edited from the <b>File > Properties + > Resource > Linked Resources</b> property page, under the <b>Linked Resources</b> tab.</p> + <p>Some plug-ins built on top of the Eclipse platform are not compatible with linked resources. If this is the case, + you can completely disable the linked resource feature to prevent them from being created in your workspace. Linked + resources can be disabled from the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.LinkedResources)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Workspace > Linked - Resources</b></a> preference page. Certain types of projects or - team repository providers may also disallow linked resources from - being created in some projects.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Workspace > Linked + Resources</b></a> preference page. Certain types of projects or team repository providers may also disallow linked + resources from being created in some projects.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</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> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-45.htm">Creating linked resources</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-45.htm">Creating linked resources</a><br> <a href="../tasks/tasks-67.htm">Deleting resources</a><br> - <a href="../tasks/tasks-49.htm">Viewing resource - properties</a><br> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-14b.htm">Linked resources</a> + <a href="../tasks/tasks-49.htm">Viewing resource properties</a><br> + <h3 class="related">Related reference</h3><a href="../reference/ref-14b.htm">Linked resources</a> </body> </html>
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 f31fddc..25b6c8d 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-17.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-17.htm
@@ -3,38 +3,28 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Resource hierarchies</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Resource hierarchies</h1> - <p class="Head">Resources are stored and displayed in the - Workbench in hierarchies. Described below are the terms used when - referring to resources that are stored and displayed in a - hierarchical structure.</p> + <p class="Head">Resources are stored and displayed in the Workbench in hierarchies. Described below are the terms + used when referring to resources that are stored and displayed in a hierarchical structure.</p> <dl> <dt>Root</dt> - <dd>The top level of the Workbench contents (in the file - system).</dd> + <dd>The top level of the Workbench contents (in the file system).</dd> <dt>Parent resource</dt> - <dd>Any resource that contains another resource. Only projects - and folders can be parent resources.</dd> + <dd>Any resource that contains another resource. Only projects and folders can be parent resources.</dd> <dt>Child resource</dt> - <dd>Any resource that is contained within another resource. - Only files and folders can be child resources.</dd> + <dd>Any resource that is contained within another resource. Only files and folders can be child resources.</dd> </dl> - <p>Resource hierarchies are displayed in the Project Explorer - view, which is one of the default views in the Resource + <p>Resource hierarchies are displayed in the Project Explorer view, which is one of the default views in the Resource perspective.</p> - <h3 class="related">Related concepts</h3> - <a href="concepts-12.htm">Resources</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-12.htm">Resources</a><br> <a href="../reference/ref-27.htm">Project Explorer view</a><br> - <h3 class="related">Related tasks</h3> - <a href="../tasks/tasks-46ag.htm">Finding a resource quickly</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-46ag.htm">Finding a resource quickly</a><br> <a href="../tasks/tasks-48b.htm">Showing or hiding files in the Project Explorer view</a><br> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-17a.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-17a.htm index 958a3fd..f84514d 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-17a.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-17a.htm
@@ -3,36 +3,23 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Local history</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Local history</h1> - <p>A local edit history of a file is maintained when you create - or modify a file. Each time you edit and save the file, a copy is - saved so that you can replace the current file with a previous - edit or even restore a deleted file. You can also compare the - contents of all the local edits. Each edit in the local history - is uniquely represented by the date and time the file was - saved.</p> - <p>Only files have local history; projects and folders do - not.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-27.htm">Versions</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-70.htm">Comparing resources with local - history</a><br> - <a href="../tasks/tasks-87.htm">Replacing a resource with local - history</a><br> - <a href="../tasks/tasks-87b.htm">Restoring deleted resources from - local history</a><br> - <a href="../tasks/tasks-88.htm">Setting local history - preferences<br></a><br> - <a href="../tasks/tasks-100.htm">Creating a version of a - project</a> + <p>A local edit history of a file is maintained when you create or modify a file. Each time you edit and save the + file, a copy is saved so that you can replace the current file with a previous edit or even restore a deleted file. + You can also compare the contents of all the local edits. Each edit in the local history is uniquely represented by + the date and time the file was saved.</p> + <p>Only files have local history; projects and folders do not.</p> + <h3 class="related">Related concepts</h3><a href="concepts-27.htm">Versions</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-70.htm">Comparing resources with local history</a><br> + <a href="../tasks/tasks-87.htm">Replacing a resource with local history</a><br> + <a href="../tasks/tasks-87b.htm">Restoring deleted resources from local history</a><br> + <a href="../tasks/tasks-88.htm">Setting local history preferences<br></a><br> + <a href="../tasks/tasks-100.htm">Creating a version of a project</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-18.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-18.htm index 24ab821..5f4b458 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-18.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-18.htm
@@ -3,58 +3,38 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Toolbars in the Workbench</title> <meta name="keyword" content="shortcut bar"> </head> <body> <h1 class="Head">Toolbars</h1> <p>There are four kinds of toolbars in the Workbench.</p> - <p>The <i>main toolbar</i>, sometimes called the Workbench - toolbar, is displayed at the top of the Workbench window directly - beneath the menu bar. The contents of this toolbar change based - on the active perspective. Items in the toolbar might be enabled - or disabled based on the state of either the active view or - editor. Sections of the main toolbar can be rearranged using the - mouse.</p> - <p>There are also individual <i>view toolbars</i>, which appear - in the title bar of a view. Actions in a view's toolbar apply - only to the view in which they appear. Some view toolbars include - a <b>Menu</b> button, shown as an inverted triangle, that contain - actions for that view.</p> - <p class="Head">A third type of toolbar is the perspective - switcher. The perspective switcher allows quick access to - perspectives that are currently open. It also has a button that - can open new perspectives. The perspective switcher is normally - located in the top-right, next to the main toolbar. However, it - is also possible to position it below the main toolbar - ("top-left"), or to position it vertically on the left-hand side - of the workbench ("left"). The name of the perspectives is shown - by default, but it is possible to hide the text and show only the - icons. To reposition the perspective or hide the text, - right-click on it and choose the appropriate item from the - context menu.</p> - <p class="Head">Minimizing a view stack will also produce a - toolbar in the trim at the outer edge of the workbench window (a - <i>Trim Stack</i>). This bar will contain an icon for each of the - views in the stack. Clicking on one of these icons will result in - the view being displayed as an overlay onto the existing - presentation.</p> - <p class="Head">In all cases, you can find out what toolbar - buttons do by moving your mouse pointer over the button and - reading the tooltip that opens. See the list of related reference - topics below for a table of all toolbar buttons.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a><br> + <p>The <i>main toolbar</i>, sometimes called the Workbench toolbar, is displayed at the top of the Workbench window + directly beneath the menu bar. The contents of this toolbar change based on the active perspective. Items in the + toolbar might be enabled or disabled based on the state of either the active view or editor. Sections of the main + toolbar can be rearranged using the mouse.</p> + <p>There are also individual <i>view toolbars</i>, which appear in the title bar of a view. Actions in a view's + toolbar apply only to the view in which they appear. Some view toolbars include a <b>Menu</b> button, shown as an + inverted triangle, that contain actions for that view.</p> + <p class="Head">A third type of toolbar is the perspective switcher. The perspective switcher allows quick access to + perspectives that are currently open. It also has a button that can open new perspectives. The perspective switcher + is normally located in the top-right, next to the main toolbar. However, it is also possible to position it below the + main toolbar ("top-left"), or to position it vertically on the left-hand side of the workbench ("left"). The name of + the perspectives is shown by default, but it is possible to hide the text and show only the icons. To reposition the + perspective or hide the text, right-click on it and choose the appropriate item from the context menu.</p> + <p class="Head">Minimizing a view stack will also produce a toolbar in the trim at the outer edge of the workbench + window (a <i>Trim Stack</i>). This bar will contain an icon for each of the views in the stack. Clicking on one of + these icons will result in the view being displayed as an overlay onto the existing presentation.</p> + <p class="Head">In all cases, you can find out what toolbar buttons do by moving your mouse pointer over the button + and reading the tooltip that opens. See the list of related reference topics below for a table of all toolbar + buttons.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</a><br> <a href="concepts-5.htm">Views</a><br> <a href="concepts-4.htm">Perspectives</a><br> - <h3 class="related">Related tasks</h3><a href= - "../tasks/ttoolbars.htm">Rearranging the main toolbar</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-68.htm">Toolbar buttons</a> + <h3 class="related">Related tasks</h3><a href="../tasks/ttoolbars.htm">Rearranging the main toolbar</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-68.htm">Toolbar buttons</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-2.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-2.htm index e1b1c2d..9af8361 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-2.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-2.htm
@@ -3,44 +3,32 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>The Workbench</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Workbench</h1> - <p>The term <i>Workbench</i> refers to the desktop development - environment. The Workbench aims to achieve seamless tool - integration and controlled openness by providing a common - paradigm for the creation, management, and navigation of - workspace resources.</p> - <p>Each Workbench window contains one or more perspectives. - Perspectives contain views and editors and control what appears - in certain menus and tool bars. More than one Workbench window - can exist on the desktop at any given time.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-25.htm">Features</a><br> + <p>The term <i>Workbench</i> refers to the desktop development environment. The Workbench aims to achieve seamless + tool integration and controlled openness by providing a common paradigm for the creation, management, and navigation + of workspace resources.</p> + <p>Each Workbench window contains one or more perspectives. Perspectives contain views and editors and control what + appears in certain menus and tool bars. More than one Workbench window can exist on the desktop at any given + time.</p> + <h3 class="related">Related concepts</h3><a href="concepts-25.htm">Features</a><br> <a href="concepts-12.htm">Resources</a><br> <a href="concepts-4.htm">Perspectives</a><br> <a href="concepts-5.htm">Views</a><br> <a href="concepts-6.htm">Editors</a><br> <a href="concepts-27c.htm">CVS Repositories</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-9f.htm">Opening perspectives</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-9f.htm">Opening perspectives</a><br> <a href="../tasks/tasks-3.htm">Opening views</a><br> - <a href="../tasks/tasks-28.htm">Switching between - perspectives</a><br> - <a href="../tasks/tasks-9n.htm">Showing and hiding menu items and - toolbar buttons</a><br> - <a href="../tasks/tasks-9m.htm">Configuring perspective command - groups</a><br> - <a href="../tasks/tasks-9k.htm">Configuring perspective - shortcuts</a><br> + <a href="../tasks/tasks-28.htm">Switching between perspectives</a><br> + <a href="../tasks/tasks-9n.htm">Showing and hiding menu items and toolbar buttons</a><br> + <a href="../tasks/tasks-9m.htm">Configuring perspective command groups</a><br> + <a href="../tasks/tasks-9k.htm">Configuring perspective shortcuts</a><br> <a href="../tasks/tasks-124.htm">Installing new software</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-68.htm">Toolbar buttons</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-68.htm">Toolbar buttons</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-21a.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-21a.htm index 6cce481..74c0191 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-21a.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-21a.htm
@@ -3,28 +3,20 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2007, 2012. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Detached views</title> </head> <body> <h1 class="Head">Detached views</h1> - <p>Detached views and editors are shown in a separate window with - a smaller trim. They work like other views and editors except - they are always shown in front of the Workbench window.</p> - <p>You can create a new detached view or editor by dragging any - open part outside of the Workbench window or by selecting - <b>Detached</b> from the menu that opens when you right-click the - part's tab.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-9l.htm">Detaching views and editors</a><br> + <p>Detached views and editors are shown in a separate window with a smaller trim. They work like other views and + editors except they are always shown in front of the Workbench window.</p> + <p>You can create a new detached view or editor by dragging any open part outside of the Workbench window or by + selecting <b>Detached</b> from the menu that opens when you right-click the part's tab.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-9l.htm">Detaching views and editors</a><br> <a href="../tasks/tasks-3e.htm">Moving and docking views</a><br> - <a href="../gettingStarted/qs-39g.htm">Maximizing a view or - editor</a> + <a href="../gettingStarted/qs-39g.htm">Maximizing a view or editor</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-22.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-22.htm index af003f3..5431def 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-22.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-22.htm
@@ -3,71 +3,49 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Builds</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Builds</h1> - <p class="Head">A <i>build</i> is a process that derives new - resources from existing ones, updates existing resources, or - both.</p> - <p class="Head">In the Workbench, different <i>builders</i> are - invoked for different types of projects. For example, when a - build is triggered for a Java project, a Java builder converts - each Java source file (.java files) into one or more executable - class files (.class files). Builders usually enforce the - constraints of some domain. For example, a Web link builder could - update links to files whose name/location changes.</p> + <p class="Head">A <i>build</i> is a process that derives new resources from existing ones, updates existing + resources, or both.</p> + <p class="Head">In the Workbench, different <i>builders</i> are invoked for different types of projects. For example, + when a build is triggered for a Java project, a Java builder converts each Java source file (.java files) into one or + more executable class files (.class files). Builders usually enforce the constraints of some domain. For example, a + Web link builder could update links to files whose name/location changes.</p> <p>There are two kinds of builds:</p> <ul> <li> - <p>An <i>incremental build</i> leverages a previously built - state and applies the transforms of the configured builders - to the resources that have changed since the previous state - was computed (that is, since the last build).</p> + <p>An <i>incremental build</i> leverages a previously built state and applies the transforms of the configured + builders to the resources that have changed since the previous state was computed (that is, since the last + build).</p> </li> <li> - <p>A clean build discards any problems and previously built - state. The next build after a clean will transform all - resources according to the domain rules of the configured - builders.</p> + <p>A clean build discards any problems and previously built state. The next build after a clean will transform + all resources according to the domain rules of the configured builders.</p> </li> </ul> - <p>Incremental and clean builds can be done over a specific set - of projects or the workspace as a whole. Specific files and - folders cannot be built. There are two ways that builds can be - performed:</p> + <p>Incremental and clean builds can be done over a specific set of projects or the workspace as a whole. Specific + files and folders cannot be built. There are two ways that builds can be performed:</p> <ul> - <li>Automatic builds are performed as resources are saved. - Automatic builds are always incremental and always operate over - the entire workspace. You can configure your preferences ( - <a class="command-link" href= + <li>Automatic builds are performed as resources are saved. Automatic builds are always incremental and always + operate over the entire workspace. You can configure your preferences ( <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workspace)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Workspace</b></a>) to perform - builds automatically on resource modification.</li> - <li>Manual builds are initiated when you explicitly select a - menu item or press the equivalent shortcut key. Manual builds - can be either clean or incremental and can operate over - collections of projects or the entire workspace.</li> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Workspace</b></a>) to + perform builds automatically on resource modification.</li> + <li>Manual builds are initiated when you explicitly select a menu item or press the equivalent shortcut key. Manual + builds can be either clean or incremental and can operate over collections of projects or the entire + workspace.</li> </ul> - <h3 class="related">Related concepts</h3><a href= - "concepts-exttools.htm">External tools</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-73.htm">Building resources</a><br> - <a href="../tasks/tasks-75.htm">Performing builds - manually</a><br> - <a href="../tasks/tasks-16.htm">Performing builds - automatically</a><br> - <a href="../tasks/tasks-17.htm">Saving resources automatically - before a manual build</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-exttools.htm">External tools</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-73.htm">Building resources</a><br> + <a href="../tasks/tasks-75.htm">Performing builds manually</a><br> + <a href="../tasks/tasks-16.htm">Performing builds automatically</a><br> + <a href="../tasks/tasks-17.htm">Saving resources automatically before a manual build</a><br> <a href="../tasks/tasks-14.htm">Changing build order</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-25.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-25.htm index c46b645..e9faa6c 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-25.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-25.htm
@@ -3,61 +3,39 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2009. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Features</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head" dir="ltr">Features</h1> - <p>On disk, an Eclipse based product is structured as a - collection of <em>plug-ins</em>. Each plug-in contains the code - that provides some of the product's functionality. The code and - other files for a plug-in are installed on the local computer, - and get activated automatically as required. A product's plug-ins - are grouped together into features. A <em>feature</em> is a unit - of separately downloadable and installable functionality.</p> - <p>The fundamentally modular nature of the Eclipse platform makes - it easy to install additional features and plug-ins into an - Eclipse based product, and to update the product's existing - features and plug-ins. You can do this using the Eclipse - platform's install and update support found in the <b>Help</b> - menu. Eclipse allows you to discover, download, and install - features and plug-ins from special web-based Eclipse software - sites.</p> - <p>Large Eclipse based products can organize their features into - trees starting from the root feature that represents the entire - product. This root feature then includes smaller units of - functionality all the way down to leaf features that list one or - more plug-ins and fragments. The capability to group features - hierarchically allows products to be stacked using a 'Russian - doll' approach - a large product can build on top of a smaller - one by including it and adding more features.</p> - <p>Some included features may be useful add-ons, but are not - vital to the proper functioning of the overall product. Feature - providers can elect to mark them as <b>optional</b>. Optional - features will only be installed if all their required features - and plug-ins are available. If not installed right away, optional - features can be added at a later date.</p> - <p>The <b>About</b> option on the <b>Help</b> menu provides - information about installed features and plug-ins. The <b>Check - for Updates</b> and <b>Install New Software</b> commands on the - <b>Help</b> menu provide the ability to update existing features, - and to find, download, and install new features.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-132.htm">Installation Details for - Features</a><br> - <a href="../tasks/tasks-131.htm">Installation Details for - Plug-ins</a><br> - <a href="../tasks/tasks-120.htm">Updating the - installation</a><br> + <p>On disk, an Eclipse based product is structured as a collection of <em>plug-ins</em>. Each plug-in contains the + code that provides some of the product's functionality. The code and other files for a plug-in are installed on the + local computer, and get activated automatically as required. A product's plug-ins are grouped together into features. + A <em>feature</em> is a unit of separately downloadable and installable functionality.</p> + <p>The fundamentally modular nature of the Eclipse platform makes it easy to install additional features and plug-ins + into an Eclipse based product, and to update the product's existing features and plug-ins. You can do this using the + Eclipse platform's install and update support found in the <b>Help</b> menu. Eclipse allows you to discover, + download, and install features and plug-ins from special web-based Eclipse software sites.</p> + <p>Large Eclipse based products can organize their features into trees starting from the root feature that represents + the entire product. This root feature then includes smaller units of functionality all the way down to leaf features + that list one or more plug-ins and fragments. The capability to group features hierarchically allows products to be + stacked using a 'Russian doll' approach - a large product can build on top of a smaller one by including it and + adding more features.</p> + <p>Some included features may be useful add-ons, but are not vital to the proper functioning of the overall product. + Feature providers can elect to mark them as <b>optional</b>. Optional features will only be installed if all their + required features and plug-ins are available. If not installed right away, optional features can be added at a later + date.</p> + <p>The <b>About</b> option on the <b>Help</b> menu provides information about installed features and plug-ins. The + <b>Check for Updates</b> and <b>Install New Software</b> commands on the <b>Help</b> menu provide the ability to + update existing features, and to find, download, and install new features.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-132.htm">Installation Details for Features</a><br> + <a href="../tasks/tasks-131.htm">Installation Details for Plug-ins</a><br> + <a href="../tasks/tasks-120.htm">Updating the installation</a><br> <a href="../tasks/tasks-124.htm">Installing new software</a><br> <a href="../tasks/tasks-126.htm">Uninstalling software</a><br> - <a href="../tasks/tasks-123.htm">Reverting to a previous install - configuration</a> + <a href="../tasks/tasks-123.htm">Reverting to a previous install configuration</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm index 6adf4a6..1db6f39 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-26.htm
@@ -3,163 +3,114 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2015. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Team support with CVS</title> <meta name="keyword" content="team"> </head> <body style="background-color: rgb(255,255,255);"> <h1 class="Head">Team support with CVS</h1> - <p class="Para">In the Concurrent Versions System (CVS) team - programming environment, team members do all of their work in - their own Workbenches, isolated from others. Eventually they will - want to share their work. They do this via a CVS Repository.</p> + <p class="Para">In the Concurrent Versions System (CVS) team programming environment, team members do all of their + work in their own Workbenches, isolated from others. Eventually they will want to share their work. They do this via + a CVS Repository.</p> <h2 class="Para">Branches</h2> - <p class="Para">CVS uses a branch model to support multiple - courses of work that are somewhat isolated from each other but - still highly interdependent. Branches are where a development - team shares and integrates ongoing work. A branch can be thought - of as a shared workspace that is updated by team members as they - make changes to the project. This model allows individuals to - work on a CVS team project, share their work with others as - changes are made, and access the work of others as the project - evolves. A special branch, referred to as HEAD, represents the - main course of work in the repository (HEAD is often referred to - as the trunk).</p> + <p class="Para">CVS uses a branch model to support multiple courses of work that are somewhat isolated from each + other but still highly interdependent. Branches are where a development team shares and integrates ongoing work. A + branch can be thought of as a shared workspace that is updated by team members as they make changes to the project. + This model allows individuals to work on a CVS team project, share their work with others as changes are made, and + access the work of others as the project evolves. A special branch, referred to as HEAD, represents the main course + of work in the repository (HEAD is often referred to as the trunk).</p> <h2 class="Para">Sharing work</h2> <div class="Topic"> - <p class="Para">As team members produce new work, they share - this work by <i>committing</i> those changes to the branch. - Similarly, when they wish to get the latest available work, - they <i>update</i> their local workspaces to the changes on the - branch. Thus the branch is constantly changing, moving forward - as team members submit new work.</p> - <p class="Para">The branch effectively represents the current - state of the project. At any point a team member can update - their workspaces from the branch and know they are up to - date.</p> + <p class="Para">As team members produce new work, they share this work by <i>committing</i> those changes to the + branch. Similarly, when they wish to get the latest available work, they <i>update</i> their local workspaces to + the changes on the branch. Thus the branch is constantly changing, moving forward as team members submit new + work.</p> + <p class="Para">The branch effectively represents the current state of the project. At any point a team member can + update their workspaces from the branch and know they are up to date.</p> <div class="Figure"> - <div><img src="../images/ref-9.png" alt= - "Interaction with Branches and Workbenches"></div> + <div><img src="../images/ref-9.png" alt="Interaction with Branches and Workbenches"></div> </div> <div class="XRefList"></div> </div> <div class="Topic"> <h2>Optimistic team model</h2> - <p class="Para">CVS provides two important features required - for working in a team:</p> + <p class="Para">CVS provides two important features required for working in a team:</p> <ul> <li> - <p class="Para">A history of the work submitted by the - team</p> + <p class="Para">A history of the work submitted by the team</p> </li> <li> - <p class="Para">A way to coordinate and integrate this - work</p> + <p class="Para">A way to coordinate and integrate this work</p> </li> </ul> - <p class="Para">Maintaining history is important so that one - can compare the current work against previous drafts, revert to - older work that is better, and so on. Coordinating the work is - critical so that there exists one definition of the current - project state, containing the integrated work of the team. This - coordination is provided via the branch model.</p> - <p class="Para">An optimistic model is one where any member of - the team can make changes to any resource he or she has access - to. Because two team members can commit to the branch changes - to the same resource, conflicts can occur and must be dealt - with. This model is termed <i>optimistic</i> because it is - assumed that conflicts are rare.</p> + <p class="Para">Maintaining history is important so that one can compare the current work against previous drafts, + revert to older work that is better, and so on. Coordinating the work is critical so that there exists one + definition of the current project state, containing the integrated work of the team. This coordination is provided + via the branch model.</p> + <p class="Para">An optimistic model is one where any member of the team can make changes to any resource he or she + has access to. Because two team members can commit to the branch changes to the same resource, conflicts can occur + and must be dealt with. This model is termed <i>optimistic</i> because it is assumed that conflicts are rare.</p> <h2>Recommended work flow</h2> - <p class="Para">Usually resources do not exist in isolation, - they typically contain implicit or explicit dependencies on - other resources. For example, Web pages have links to other Web - pages, and source code has references to artifacts described in - other source code resources. No resource is an island.</p> - <p class="Para">As resources are committed to the branch, these - dependencies can be affected. Ensuring the integrity of the - dependencies is important because the branch represents the - current project state: at any point a team member could take - the branch contents as a basis for new work.</p> - <p class="Para">The ideal work flow therefore is one in which - the branch integrity is preserved.</p> - <h3 class="Para"><a name="IdealWorkFlow" id= - "IdealWorkFlow">Ideal flow enumerated</a></h3> + <p class="Para">Usually resources do not exist in isolation, they typically contain implicit or explicit + dependencies on other resources. For example, Web pages have links to other Web pages, and source code has + references to artifacts described in other source code resources. No resource is an island.</p> + <p class="Para">As resources are committed to the branch, these dependencies can be affected. Ensuring the + integrity of the dependencies is important because the branch represents the current project state: at any point a + team member could take the branch contents as a basis for new work.</p> + <p class="Para">The ideal work flow therefore is one in which the branch integrity is preserved.</p> + <h3 class="Para"><a name="IdealWorkFlow" id="IdealWorkFlow">Ideal flow enumerated</a></h3> <p class="Para">The ideal work flow proceeds as follows:</p> <ol> <li> - <p class="Para">Start fresh. Before starting work, update - the resources in the workspace with the current branch - state. If you are sure that you have no local work that you - care about, the fastest way to get caught up is to select - the projects you are interested in from the branch (or - HEAD) and select <b>Checkout</b> (or <b>Replace with > - Latest from Repository</b> if the projects already exist - locally). This will overwrite your local resources with - those from the branch.</p> + <p class="Para">Start fresh. Before starting work, update the resources in the workspace with the current + branch state. If you are sure that you have no local work that you care about, the fastest way to get caught up + is to select the projects you are interested in from the branch (or HEAD) and select <b>Checkout</b> (or + <b>Replace with > Latest from Repository</b> if the projects already exist locally). This will overwrite + your local resources with those from the branch.</p> </li> <li> - <p class="Para">Make changes. Work locally in your - Workbench, creating new resources, modifying existing ones, + <p class="Para">Make changes. Work locally in your Workbench, creating new resources, modifying existing ones, saving locally as you go.</p> </li> <li> - <p class="Para">Synchronize. When you are ready to commit - your work, synchronize with the repository.</p> + <p class="Para">Synchronize. When you are ready to commit your work, synchronize with the repository.</p> <ol type="a"> <li> - <p class="Para">Update. Examine incoming changes and - add them to your local Workbench. This allows you to - determine if there are changes which might affect the - integrity of what you are about to commit. Resolve - conflicts. Test again, run integrity checkers (for - example, check for broken hypertext links, ensure your + <p class="Para">Update. Examine incoming changes and add them to your local Workbench. This allows you to + determine if there are changes which might affect the integrity of what you are about to commit. Resolve + conflicts. Test again, run integrity checkers (for example, check for broken hypertext links, ensure your code compiles, and so on).</p> </li> <li> - <p class="Para">Commit. Now that you are confident that - your changes are well integrated with the latest branch - contents, commit your changes to the branch. To be - prudent, you may repeat the previous step if there are - new incoming changes.</p> + <p class="Para">Commit. Now that you are confident that your changes are well integrated with the latest + branch contents, commit your changes to the branch. To be prudent, you may repeat the previous step if + there are new incoming changes.</p> </li> </ol> </li> </ol> - <p class="Para">Of course this is an <i>ideal</i> work flow. - Under certain conditions you may be confident that the incoming - changes do not affect you and choose to commit without - updating. However, in general team members should make an - effort to follow a flow similar to the above in order to ensure - that the branch integrity is not accidentally compromised.</p> - <p class="Para">You can find more information on CVS at - <a href="https://directory.fsf.org/wiki/CVS" class="URL" + <p class="Para">Of course this is an <i>ideal</i> work flow. Under certain conditions you may be confident that the + incoming changes do not affect you and choose to commit without updating. However, in general team members should + make an effort to follow a flow similar to the above in order to ensure that the branch integrity is not + accidentally compromised.</p> + <p class="Para">You can find more information on CVS at <a href="https://directory.fsf.org/wiki/CVS" class="URL" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</p> </div> - <h3 class="related">Related concepts</h3><a href= - "concepts-27c.htm">CVS Repositories</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-27c.htm">CVS Repositories</a><br> <a href="concepts-27b.htm">Branches</a><br> <a href="concepts-27.htm">Versions</a><br> <a href="concepts-30.htm">Synchronizing with a CVS repository</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-92.htm">Creating a CVS repository - location</a><br> - <a href="../tasks/tasks-96.htm">Checking out a project from a CVS - repository</a><br> - <a href="../tasks/tasks-103.htm">Replacing resources in the - Workbench</a><br> - <a href="../tasks/tasks-117.htm">Sharing a new project using - CVS</a><br> - <a href="../tasks/tasks-115.htm">Synchronizing with the - repository</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-92.htm">Creating a CVS repository location</a><br> + <a href="../tasks/tasks-96.htm">Checking out a project from a CVS repository</a><br> + <a href="../tasks/tasks-103.htm">Replacing resources in the Workbench</a><br> + <a href="../tasks/tasks-117.htm">Sharing a new project using CVS</a><br> + <a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br> <a href="../tasks/tasks-113.htm">Updating</a><br> <a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br> <a href="../tasks/tasks-100b.htm">Merging from a branch</a><br> <a href="../tasks/tasks-114.htm">Committing</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-47.htm">CVS</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27.htm index 83e383c..b48f349 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27.htm
@@ -3,64 +3,42 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Versions</title> <meta name="keyword" content="team"> </head> <body style="background-color: rgb(255,255,255);"> <h1 class="Head">Versions</h1> - <p class="Para">Resources are versioned in order to capture a - snapshot of the current state of the resources at one specific - point in time. Resources in CVS are versioned by tagging them - with a version label. When a resource is versioned, it means that - a non-modifiable copy of it can be retrieved from the - repository.</p> - <p class="Intro">Versioning a project saves the line up of all - resource versions in the project. Resources other than projects - (files and folders) can be versioned. However, it is more common - to version entire projects together as the resources contained in - a project are often highly interdependent. Projects can be - versioned from the workspace or from the branch (including HEAD) - in the CVS Repositories view. The difference between these two - approaches is in deciding which child resource versions should be - part of the project version.</p> - <p class="Para">When tagging a project as a version from the - <i>Workbench</i>, the base revisions of the files in the - Workbench are tagged as belonging to that version. This is the - preferred method of versioning a project because you know exactly - which file revisions will be in the version. This operation is - allowed if you have outgoing changes or uncommitted changes. - Uncommitted changes are simply ignored and resources with - outgoing changes can still have their base revisions be part of - the version. Versioning a project with uncommitted or outgoing - changes is handy if you have to split the project at the point - where you started making changes to the resources and commit the - resources to another branch.</p> - <p class="Para">When tagging a project as a version from a - <i>branch</i> in the CVS Repositories view, you are versioning - whatever the latest resource versions are in the branch at that - moment in time. You should not version your projects from the - branch if you do not know what is committed in the branch. For - this reason, versioning from the Workbench is often - preferable.</p> + <p class="Para">Resources are versioned in order to capture a snapshot of the current state of the resources at one + specific point in time. Resources in CVS are versioned by tagging them with a version label. When a resource is + versioned, it means that a non-modifiable copy of it can be retrieved from the repository.</p> + <p class="Intro">Versioning a project saves the line up of all resource versions in the project. Resources other than + projects (files and folders) can be versioned. However, it is more common to version entire projects together as the + resources contained in a project are often highly interdependent. Projects can be versioned from the workspace or + from the branch (including HEAD) in the CVS Repositories view. The difference between these two approaches is in + deciding which child resource versions should be part of the project version.</p> + <p class="Para">When tagging a project as a version from the <i>Workbench</i>, the base revisions of the files in the + Workbench are tagged as belonging to that version. This is the preferred method of versioning a project because you + know exactly which file revisions will be in the version. This operation is allowed if you have outgoing changes or + uncommitted changes. Uncommitted changes are simply ignored and resources with outgoing changes can still have their + base revisions be part of the version. Versioning a project with uncommitted or outgoing changes is handy if you have + to split the project at the point where you started making changes to the resources and commit the resources to + another branch.</p> + <p class="Para">When tagging a project as a version from a <i>branch</i> in the CVS Repositories view, you are + versioning whatever the latest resource versions are in the branch at that moment in time. You should not version + your projects from the branch if you do not know what is committed in the branch. For this reason, versioning from + the Workbench is often preferable.</p> <p class="Para"></p> - <h3 class="related">Related concepts</h3><a href= - "concepts-27c.htm">CVS Repositories</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-27c.htm">CVS Repositories</a><br> <a href="concepts-27b.htm">Branches</a><br> <a href="concepts-17a.htm">Local history</a><br> <a href="concepts-12.htm">Resources</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-100.htm">Creating a version of a project</a><br> - <a href="../tasks/tasks-118.htm">Versioning projects in the - repository</a><br> - <a href="../tasks/tasks-107b.htm">Enabling the CVS resource - decorations</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-100.htm">Creating a version of a project</a><br> + <a href="../tasks/tasks-118.htm">Versioning projects in the repository</a><br> + <a href="../tasks/tasks-107b.htm">Enabling the CVS resource decorations</a><br> <a href="../tasks/tasks-105c.htm">Moving version tags</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-47.htm">CVS</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27b.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27b.htm index 0963946..2ddf29f 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27b.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27b.htm
@@ -3,65 +3,44 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Branches</title> <meta name="keyword" content="team"> </head> <body bgcolor="#FFFFFF"> <h1>Branches</h1> - <p>In CVS, teams share and integrate their ongoing work in - <i>branches</i>. Think of a branch as a shared work area that can - be updated at any time by team members. In this way, individuals - can work on a team project, share their work with others on the - team, and access the work of others during all stages of the - project. The branch effectively represents the current shared - state of the project.</p> - <p>Resources can be changed in the Workbench without affecting - the branch. Individuals must explicitly provide their changed - resources to the branch.</p> - <p>Every CVS repository has at least one branch, referred to as - HEAD. Under certain conditions, more than one branch may exist in - a repository. For example, one branch may be for ongoing work, - and another branch may be for maintenance work.</p> - <p>As you make changes locally in your Workbench, you are working - alone. When you are ready to make your local resource changes - available to other team members, you'll need to <i>commit</i> - your work to the branch. All such changes are classified as - outgoing changes when you do a synchronization.</p> - <p>Ideally, you should update your local workspace with any - changes others have made in a branch before committing to it. - This ensures that you have the very latest work from the other - team members. After you have updated from the branch, merged any - conflicting changes in your local Workbench, and tested your - changes locally, you can more easily commit your Workbench's - changes to the branch.</p> - <p>When you commit changes to the branch, your changes are copied - from your local Workbench to the branch. As a result, these - changes are then seen as incoming changes when other developers - update from the branch later.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-26.htm">Team programming with CVS</a><br> + <p>In CVS, teams share and integrate their ongoing work in <i>branches</i>. Think of a branch as a shared work area + that can be updated at any time by team members. In this way, individuals can work on a team project, share their + work with others on the team, and access the work of others during all stages of the project. The branch effectively + represents the current shared state of the project.</p> + <p>Resources can be changed in the Workbench without affecting the branch. Individuals must explicitly provide their + changed resources to the branch.</p> + <p>Every CVS repository has at least one branch, referred to as HEAD. Under certain conditions, more than one branch + may exist in a repository. For example, one branch may be for ongoing work, and another branch may be for maintenance + work.</p> + <p>As you make changes locally in your Workbench, you are working alone. When you are ready to make your local + resource changes available to other team members, you'll need to <i>commit</i> your work to the branch. All such + changes are classified as outgoing changes when you do a synchronization.</p> + <p>Ideally, you should update your local workspace with any changes others have made in a branch before committing to + it. This ensures that you have the very latest work from the other team members. After you have updated from the + branch, merged any conflicting changes in your local Workbench, and tested your changes locally, you can more easily + commit your Workbench's changes to the branch.</p> + <p>When you commit changes to the branch, your changes are copied from your local Workbench to the branch. As a + result, these changes are then seen as incoming changes when other developers update from the branch later.</p> + <h3 class="related">Related concepts</h3><a href="concepts-26.htm">Team programming with CVS</a><br> <a href="concepts-27c.htm">CVS Repositories</a><br> <a href="concepts-30.htm">Synchronizing with a CVS repository</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-92.htm">Creating a CVS repository - location</a><br> - <a href="../tasks/tasks-96.htm">Checking out a project from a CVS - repository</a><br> - <a href="../tasks/tasks-117.htm">Sharing a new project using - CVS</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-92.htm">Creating a CVS repository location</a><br> + <a href="../tasks/tasks-96.htm">Checking out a project from a CVS repository</a><br> + <a href="../tasks/tasks-117.htm">Sharing a new project using CVS</a><br> <a href="../tasks/tasks-100a.htm">Branching</a><br> - <a href="../tasks/tasks-115.htm">Synchronizing with the - repository</a><br> + <a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br> <a href="../tasks/tasks-113.htm">Updating</a><br> <a href="../tasks/tasks-114.htm">Committing</a><br> <a href="../tasks/tasks-113b.htm">Resolving conflicts</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-47.htm">CVS</a><br> + <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a><br> <a href="../reference/ref-32.htm">CVS Repositories view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm index ee4081f..ec9598e 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-27c.htm
@@ -3,40 +3,30 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2015. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>CVS Repositories</title> <meta name="keyword" content="team"> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">CVS Repositories</h1> <p class="Intro"></p> - <p class="Para">A Concurrent Versions System (CVS) repository is - a persistent data store that coordinates multi-user access to - projects and their contents. Projects in a repository can be of - two forms: immutable (a project version) or modifiable (a project - in a branch). Communication between the repository and Workbench - clients is possible over local or wide area networks. Currently - the Workbench supports two internal authentication protocols for - CVS: pserver and ssh. Authentication protocols provided by - external tools can also be used by CVS.</p> + <p class="Para">A Concurrent Versions System (CVS) repository is a persistent data store that coordinates multi-user + access to projects and their contents. Projects in a repository can be of two forms: immutable (a project version) or + modifiable (a project in a branch). Communication between the repository and Workbench clients is possible over local + or wide area networks. Currently the Workbench supports two internal authentication protocols for CVS: pserver and + ssh. Authentication protocols provided by external tools can also be used by CVS.</p> <div class="Topic"> - <p class="Para">You can find more information on CVS at - <a href="https://directory.fsf.org/wiki/CVS" class="URL" + <p class="Para">You can find more information on CVS at <a href="https://directory.fsf.org/wiki/CVS" class="URL" target="_blank">https://directory.fsf.org/wiki/CVS</a>.</p> </div> - <h3 class="related">Related concepts</h3><a href= - "concepts-26.htm">Team programming with CVS</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-26.htm">Team programming with CVS</a><br> <a href="concepts-27b.htm">Branches</a><br> <a href="concepts-27.htm">Versions</a><br> <a href="concepts-17a.htm">Local history</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-92.htm">Creating a CVS repository location</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-47.htm">CVS</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-92.htm">Creating a CVS repository location</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a><br> <a href="../reference/ref-32.htm">CVS Repositories view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-29.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-29.htm index 603bbf2..4a63bf6 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-29.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-29.htm
@@ -3,75 +3,50 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Three way comparisons</title> </head> <body style="background-color: rgb(255,255,255);"> <h1 class="Head">Three way comparisons</h1> - <p class="Para">Three way comparisons show the differences - between three different versions of a resource. This feature is - most useful when merging resources or when there is a conflict - during synchronization. Conflicts occur when two developers add a - version from the same branch to their Workbench, then each - developer modifies it, then one developer attempts to commit the - resource after the other developer has already committed it.</p> - <p class="Para">When this situation arises, you can view the - differences between three resource versions: the resource in the - Workbench, the version of the resource that is committed in the - branch, and the <i>common ancestor</i> from which the two - conflicting versions are based. If a common ancestor cannot be - determined, for example because a resource with the same name and - path was created and committed by two different developers, the + <p class="Para">Three way comparisons show the differences between three different versions of a resource. This + feature is most useful when merging resources or when there is a conflict during synchronization. Conflicts occur + when two developers add a version from the same branch to their Workbench, then each developer modifies it, then one + developer attempts to commit the resource after the other developer has already committed it.</p> + <p class="Para">When this situation arises, you can view the differences between three resource versions: the + resource in the Workbench, the version of the resource that is committed in the branch, and the <i>common + ancestor</i> from which the two conflicting versions are based. If a common ancestor cannot be determined, for + example because a resource with the same name and path was created and committed by two different developers, the comparison becomes a two-way comparison.</p> <h2>Interpreting compare results</h2> - <p>The Synchronize view allows you to view the differences - between two or three files. If a common ancestor is available, - the sync view performs a three way comparison. It is possible - that a common ancestor for two conflicting resource versions - cannot be determined, (e.g. a resource with the same name and - path is created and committed by two different developers). In - this case the compare becomes a regular two way compare.</p> - <p class="Para">In a three way compare the Workbench shows - you:</p> + <p>The Synchronize view allows you to view the differences between two or three files. If a common ancestor is + available, the sync view performs a three way comparison. It is possible that a common ancestor for two conflicting + resource versions cannot be determined, (e.g. a resource with the same name and path is created and committed by two + different developers). In this case the compare becomes a regular two way compare.</p> + <p class="Para">In a three way compare the Workbench shows you:</p> <ul class="UnorderedList"> - <li class="Item">what has been changed in the first child in - comparison to the common ancestor.</li> - <li class="Item">what has been changed in the second child in - comparison to the common ancestor.</li> + <li class="Item">what has been changed in the first child in comparison to the common ancestor.</li> + <li class="Item">what has been changed in the second child in comparison to the common ancestor.</li> </ul> - <p class="Para">In the picture below, the common ancestor is - displayed in the top pane of the text compare pane. The - differences that you see highlighted are what has changed in the - Workbench resource as compared to the common ancestor, and what - has been changed in the branch resource as compared to the common - ancestor. The sections that differ in all three files are - highlighted as differences.Conflicts are shown in red, incoming - changes in blue, and outgoing changes in gray.</p> - <p class="Para"><img src="../images/Image49_3_way_compare.png" - alt="Synchronize View with 3 way compare" border="0"></p> - <h3 class="related">Related concepts</h3><a href= - "../concepts/concepts-30.htm">Synchronizing with a CVS + <p class="Para">In the picture below, the common ancestor is displayed in the top pane of the text compare pane. The + differences that you see highlighted are what has changed in the Workbench resource as compared to the common + ancestor, and what has been changed in the branch resource as compared to the common ancestor. The sections that + differ in all three files are highlighted as differences.Conflicts are shown in red, incoming changes in blue, and + outgoing changes in gray.</p> + <p class="Para"><img src="../images/Image49_3_way_compare.png" alt="Synchronize View with 3 way compare" border= + "0"></p> + <h3 class="related">Related concepts</h3><a href="../concepts/concepts-30.htm">Synchronizing with a CVS repository</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-92.htm">Creating a CVS repository - location</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-92.htm">Creating a CVS repository location</a><br> <a href="../tasks/tasks-68.htm">Comparing resources</a><br> - <a href="../tasks/tasks-115.htm">Synchronizing with a - repository</a><br> - <a href="../tasks/tasks-68dg.htm">Merging changes in the compare - editor</a><br> + <a href="../tasks/tasks-115.htm">Synchronizing with a repository</a><br> + <a href="../tasks/tasks-68dg.htm">Merging changes in the compare editor</a><br> <a href="../tasks/tasks-113.htm">Updating</a><br> <a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br> - <a href="../tasks/tasks-68b.htm">Setting preferences for - comparing files</a><br> - <a href="../tasks/tasks-101.htm">Comparing resources with - repository versions</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-25.htm">Compare editor</a><br> + <a href="../tasks/tasks-68b.htm">Setting preferences for comparing files</a><br> + <a href="../tasks/tasks-101.htm">Comparing resources with repository versions</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-25.htm">Compare editor</a><br> <a href="../reference/ref-33.htm">CVS Synchronize view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-30.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-30.htm index d767fb6..2a87160 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-30.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-30.htm
@@ -3,56 +3,37 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Synchronizing with a CVS repository</title> </head> <body style="background-color: rgb(255,255,255);"> <h1 class="Head">Synchronizing with a CVS repository</h1> - <p class="Para">In the CVS team programming environment, there - are two distinct processes involved in synchronizing resources: - <i>updating</i> with the latest changes from a branch and - <i>committing</i> to the branch.</p> - <p class="Para">When you make changes in the Workbench, the - resources are saved locally. Eventually you will want to commit - your changes to the branch so others can have access to them. - Meanwhile, others may have committed changes to the branch. You - will want to update your Workbench resources with their - changes.</p> - <p class="Para"><b>Important!</b>: It is preferable to update - <i>before</i> committing, in case there are conflicts with the - resources in your Workbench and the resources currently in the - branch.</p> - <p>The synchronize view contains filters to control whether you - want to view only <i>incoming changes</i> or <i>outgoing - changes</i>. Incoming changes come from the branch. If accepted, - they will update the Workbench resource to the latest version - currently committed into the branch. Outgoing changes come from - the Workbench. If committed, they will change the branch - resources to match those currently present in the Workbench.</p> - <p>Regardless of which mode (filter) you select, the Synchronize - view always shows you conflicts that arise when you have locally - modified a resource for which a more recent version is available - in the branch. In this situation you can choose to do one of - three things: update the resource from the branch, commit your - version of the resource to the branch, or merge your work with - the changes in the branch resource. Typically you will want to - merge, as the other two options will result in loss of work.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-26.htm">Team programming with CVS</a><br> + <p class="Para">In the CVS team programming environment, there are two distinct processes involved in synchronizing + resources: <i>updating</i> with the latest changes from a branch and <i>committing</i> to the branch.</p> + <p class="Para">When you make changes in the Workbench, the resources are saved locally. Eventually you will want to + commit your changes to the branch so others can have access to them. Meanwhile, others may have committed changes to + the branch. You will want to update your Workbench resources with their changes.</p> + <p class="Para"><b>Important!</b>: It is preferable to update <i>before</i> committing, in case there are conflicts + with the resources in your Workbench and the resources currently in the branch.</p> + <p>The synchronize view contains filters to control whether you want to view only <i>incoming changes</i> or + <i>outgoing changes</i>. Incoming changes come from the branch. If accepted, they will update the Workbench resource + to the latest version currently committed into the branch. Outgoing changes come from the Workbench. If committed, + they will change the branch resources to match those currently present in the Workbench.</p> + <p>Regardless of which mode (filter) you select, the Synchronize view always shows you conflicts that arise when you + have locally modified a resource for which a more recent version is available in the branch. In this situation you + can choose to do one of three things: update the resource from the branch, commit your version of the resource to the + branch, or merge your work with the changes in the branch resource. Typically you will want to merge, as the other + two options will result in loss of work.</p> + <h3 class="related">Related concepts</h3><a href="concepts-26.htm">Team programming with CVS</a><br> <a href="concepts-27b.htm">Branches</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-115.htm">Synchronizing with the - repository</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-115.htm">Synchronizing with the repository</a><br> <a href="../tasks/tasks-113.htm">Updating</a><br> <a href="../tasks/tasks-113b.htm">Resolving conflicts</a><br> <a href="../tasks/tasks-100b.htm">Merging from a branch</a><br> <a href="../tasks/tasks-114.htm">Committing</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-47.htm">CVS</a><br> + <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a><br> <a href="../reference/ref-33.htm">CVS Synchronize view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-4.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-4.htm index 461a440..c9af9b8 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-4.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-4.htm
@@ -3,60 +3,39 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Perspectives</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Perspectives</h1> - <p>Each Workbench window contains one or more perspectives. A - perspective defines the initial set and layout of views in the - Workbench window. Within the window, each perspective shares the - same set of editors. Each perspective provides a set of - functionality aimed at accomplishing a specific type of task or - works with specific types of resources. For example, the Java - perspective combines views that you would commonly use while - editing Java source files, while the Debug perspective contains - the views that you would use while debugging Java programs. As - you work in the Workbench, you will probably switch perspectives - frequently.</p> - <p>Perspectives control what appears in certain menus and - toolbars. They define visible <i>action sets</i>, which you can - change to customize a perspective. You can save a perspective - that you build in this manner, making your own custom perspective - that you can open again later.</p> + <p>Each Workbench window contains one or more perspectives. A perspective defines the initial set and layout of views + in the Workbench window. Within the window, each perspective shares the same set of editors. Each perspective + provides a set of functionality aimed at accomplishing a specific type of task or works with specific types of + resources. For example, the Java perspective combines views that you would commonly use while editing Java source + files, while the Debug perspective contains the views that you would use while debugging Java programs. As you work + in the Workbench, you will probably switch perspectives frequently.</p> + <p>Perspectives control what appears in certain menus and toolbars. They define visible <i>action sets</i>, which you + can change to customize a perspective. You can save a perspective that you build in this manner, making your own + custom perspective that you can open again later.</p> <p>You can use the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Perspectives)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Perspectives</b></a> preference - page to open perspectives in the same window or in a new - window.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Perspectives</b></a> + preference page to open perspectives in the same window or in a new window.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</a><br> <a href="concepts-6.htm">Editors</a><br> <a href="concepts-5.htm">Views</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-9f.htm">Opening perspectives</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-9f.htm">Opening perspectives</a><br> <a href="../tasks/tasks-3.htm">Opening views</a><br> - <a href="../tasks/tasks-24.htm">Changing where perspectives - open<br></a> <a href="../tasks/tasks-31.htm">Specifying the - default perspective</a><br> - <a href="../tasks/tasks-28.htm">Switching between - perspectives</a><br> - <a href="../tasks/tasks-9k.htm">Configuring perspective - shortcuts</a><br> - <a href="../tasks/tasks-9m.htm">Configuring perspective command - groups</a><br> - <a href="../tasks/tasks-9n.htm">Showing and hiding menu items and - toolbar buttons</a><br> - <a href="../tasks/tasks-9i.htm">Saving a user defined - perspective</a><br> + <a href="../tasks/tasks-24.htm">Changing where perspectives open<br></a> <a href="../tasks/tasks-31.htm">Specifying + the default perspective</a><br> + <a href="../tasks/tasks-28.htm">Switching between perspectives</a><br> + <a href="../tasks/tasks-9k.htm">Configuring perspective shortcuts</a><br> + <a href="../tasks/tasks-9m.htm">Configuring perspective command groups</a><br> + <a href="../tasks/tasks-9n.htm">Showing and hiding menu items and toolbar buttons</a><br> + <a href="../tasks/tasks-9i.htm">Saving a user defined perspective</a><br> <a href="../tasks/tasks-9j.htm">Resetting perspectives</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-5.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-5.htm index 971d724..2ac4a3d 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-5.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-5.htm
@@ -3,41 +3,29 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Views</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Views</h1> - <p>Views support editors and provide alternative presentations as - well as ways to navigate the information in your Workbench. For - example, the Project Explorer and other navigation views display - projects and other resources that you are working with.</p> - <p>Views also have their own menus. To open the menu for a view, - click the icon at the left end of the view's title bar. Some - views also have their own toolbars. The actions represented by - buttons on view toolbars only affect the items within that - view.</p> - <p>A view might appear by itself, or stacked with other views in - a tabbed notebook. You can change the layout of a perspective by - opening and closing views and by docking them in different - positions in the Workbench window.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-4.htm">Perspectives</a><br> + <p>Views support editors and provide alternative presentations as well as ways to navigate the information in your + Workbench. For example, the Project Explorer and other navigation views display projects and other resources that you + are working with.</p> + <p>Views also have their own menus. To open the menu for a view, click the icon at the left end of the view's title + bar. Some views also have their own toolbars. The actions represented by buttons on view toolbars only affect the + items within that view.</p> + <p>A view might appear by itself, or stacked with other views in a tabbed notebook. You can change the layout of a + perspective by opening and closing views and by docking them in different positions in the Workbench window.</p> + <h3 class="related">Related concepts</h3><a href="concepts-4.htm">Perspectives</a><br> <a href="concepts-21a.htm">Detached views</a><br> <a href="concepts-6.htm">Editors</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-3.htm">Opening views</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-3.htm">Opening views</a><br> <a href="../tasks/tasks-3e.htm">Moving and docking views</a><br> - <a href="../tasks/tasks-9l.htm">Detaching views and - editors</a><br> - <a href="../gettingStarted/qs-39g.htm">Maximizing a view or - editor</a><br> - <a href="../tasks/tasks-9i.htm">Saving a user defined - perspective</a><br> + <a href="../tasks/tasks-9l.htm">Detaching views and editors</a><br> + <a href="../gettingStarted/qs-39g.htm">Maximizing a view or editor</a><br> + <a href="../tasks/tasks-9i.htm">Saving a user defined perspective</a><br> <a href="../tasks/tasks-9j.htm">Resetting perspectives</a> </body> </html>
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 ef954b7..98cbc8a 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-6.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-6.htm
@@ -3,61 +3,41 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Editors and the editor area</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Editors</h1> - <p>Most perspectives in the Workbench are comprised of an editor - area and one or more views.</p> - <p>You can associate different editors with different types of - files. For example, when you open a file for editing by - double-clicking it in one of the navigation views, the associated - editor opens in the Workbench. If there is no associated editor - for a resource, the Workbench attempts to launch an <i>external - editor</i> outside the Workbench. (On Windows, the Workbench will - first attempt to launch the editor in place as an OLE document. - This type of editor is referred to as an <i>embedded editor</i>. - For example, if you have a .doc file in the Workbench and - Microsoft Word is registered as the editor for .doc files in your - operating system, then opening the file will launch Word as an - OLE document within the Workbench editor area. The Workbench menu - bar and toolbar will be updated with options for Microsoft - Word.)</p> - <p>Any number of editors can be open at once, but only one can be - active at a time. The main menu bar and toolbar for the Workbench - window contain operations that are applicable to the active - editor.</p> - <p>Tabs in the editor area indicate the names of resources that - are currently open for editing. An asterisk (*) indicates that an - editor has unsaved changes.</p> - <p>By default, editors are stacked in the editor area, but you - can choose to tile them in order to view source files + <p>Most perspectives in the Workbench are comprised of an editor area and one or more views.</p> + <p>You can associate different editors with different types of files. For example, when you open a file for editing + by double-clicking it in one of the navigation views, the associated editor opens in the Workbench. If there is no + associated editor for a resource, the Workbench attempts to launch an <i>external editor</i> outside the Workbench. + (On Windows, the Workbench will first attempt to launch the editor in place as an OLE document. This type of editor + is referred to as an <i>embedded editor</i>. For example, if you have a .doc file in the Workbench and Microsoft Word + is registered as the editor for .doc files in your operating system, then opening the file will launch Word as an OLE + document within the Workbench editor area. The Workbench menu bar and toolbar will be updated with options for + Microsoft Word.)</p> + <p>Any number of editors can be open at once, but only one can be active at a time. The main menu bar and toolbar for + the Workbench window contain operations that are applicable to the active editor.</p> + <p>Tabs in the editor area indicate the names of resources that are currently open for editing. An asterisk (*) + indicates that an editor has unsaved changes.</p> + <p>By default, editors are stacked in the editor area, but you can choose to tile them in order to view source files simultaneously.</p> <p>Here is an example of a text editor in the Workbench:</p> - <p><img src="../images/Image5_text_editor.png" alt="Text editor" - border="0" width="800"></p> - <p>The gray border at the left margin of the editor area may - contain icons that flag errors, warnings, or problems detected by - the system. Icons also appear if you have created bookmarks, - added breakpoints for debugging, or recorded notes in the Tasks - view. You can view details for any icons in the left margin of - the editor by moving the mouse cursor over them.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a><br> + <p><img src="../images/Image5_text_editor.png" alt="Text editor" border="0" width="800"></p> + <p>The gray border at the left margin of the editor area may contain icons that flag errors, warnings, or problems + detected by the system. Icons also appear if you have created bookmarks, added breakpoints for debugging, or recorded + notes in the Tasks view. You can view details for any icons in the left margin of the editor by moving the mouse + cursor over them.</p> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</a><br> <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="../reference/ref-27.htm">Project Explorer view</a><br> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-46.htm">Opening files for editing</a><br> - <a href="../tasks/tasks-51.xhtml">Associating editors with file - types</a><br> - <a href="../tasks/tasks-52.htm">Editing files outside the - Workbench</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-46.htm">Opening files for editing</a><br> + <a href="../tasks/tasks-51.xhtml">Associating editors with file types</a><br> + <a href="../tasks/tasks-52.htm">Editing files outside the Workbench</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-6a.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-6a.htm index c50e44d..2ea4691 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-6a.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-6a.htm
@@ -3,44 +3,30 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>External editors</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">External editors</h1> - <p>Sometimes you may need to use an external program to edit a - file in the Workbench. This can occur, for example, when the - Workbench has no editor for that file type.</p> - <p>The external program will be used as the default editor if - that program is registered as the system default editor for that - file type and no other editor is registered for that file type in - the Workbench. For example, on most systems the default editor - for JPEG files is an application for editing or viewing image - files. If there is no other editor associated with .jpg or .jpeg - files in the Workbench, then opening a JPEG file from the - Workbench would cause the file to be opened externally, in the - system default editor.</p> - <p>To open an external program that is not the default editor, - you can use <b>Open With > Other...</b> from the context menu - of a file. External programs can also be registered in Eclipse as - the associated editor for a given file type. Use the <a class= - "command-link" href= + <p>Sometimes you may need to use an external program to edit a file in the Workbench. This can occur, for example, + when the Workbench has no editor for that file type.</p> + <p>The external program will be used as the default editor if that program is registered as the system default editor + for that file type and no other editor is registered for that file type in the Workbench. For example, on most + systems the default editor for JPEG files is an application for editing or viewing image files. If there is no other + editor associated with .jpg or .jpeg files in the Workbench, then opening a JPEG file from the Workbench would cause + the file to be opened externally, in the system default editor.</p> + <p>To open an external program that is not the default editor, you can use <b>Open With > Other...</b> from the + context menu of a file. External programs can also be registered in Eclipse as the associated editor for a given file + type. Use the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileEditors)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Editors > File + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Editors > File Associations</b></a> preference page to register editors.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-2.htm">Workbench</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-2.htm">Workbench</a><br> <a href="concepts-6.htm">Editors</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-46.htm">Opening files for editing</a><br> - <a href="../tasks/tasks-51.xhtml">Associating editors with file - types</a><br> - <a href="../tasks/tasks-52.htm">Editing files outside the - Workbench</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-46.htm">Opening files for editing</a><br> + <a href="../tasks/tasks-51.xhtml">Associating editors with file types</a><br> + <a href="../tasks/tasks-52.htm">Editing files outside the Workbench</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-antexttools.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-antexttools.htm index 4f76dd3..e582a2c 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-antexttools.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-antexttools.htm
@@ -3,68 +3,47 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2009, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> <title>Ant & External tools</title> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> </head> <body> <h1>Ant & External tools</h1> <h2>Ant</h2> - <p><a href="concepts-antsupport.htm">Ant support</a> allows you - to <a href="../gettingStarted/qs-82_create.htm">create</a>, - import, export, configure and <a href= - "../gettingStarted/qs-84_run_ant.htm">run tasks / buildfiles</a> - using the Workbench. Any <a href= - "../gettingStarted/qs-92_project_builders.htm">Ant buildfile</a> - configuration you create can be used as part of the build process - for a project, which will run in the specified order every time - the project is built.</p> - <p>Whether run as a stand-alone Ant task or as a project builder, - each At buildfile can be configured to provide its output in - either (or all of) of:</p> + <p><a href="concepts-antsupport.htm">Ant support</a> allows you to <a href= + "../gettingStarted/qs-82_create.htm">create</a>, import, export, configure and <a href= + "../gettingStarted/qs-84_run_ant.htm">run tasks / buildfiles</a> using the Workbench. Any <a href= + "../gettingStarted/qs-92_project_builders.htm">Ant buildfile</a> configuration you create can be used as part of the + build process for a project, which will run in the specified order every time the project is built.</p> + <p>Whether run as a stand-alone Ant task or as a project builder, each At buildfile can be configured to provide its + output in either (or all of) of:</p> <ul> - <li>The <b><a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a></b></li> + <li>The <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console + view</a></b></li> <li>A file in the local filesystem</li> <li>A custom Ant logger</li> </ul> <h2>External tools</h2> - <p><a href="concepts-exttools.htm">External tools</a> allow you - to configure and run programs, batch files, Ant buildfiles, and - others using the Workbench. Any <a href= - "../gettingStarted/qs-96_non_ant_pjs.htm">external tool</a> - configuration you create can be used as part of the build process - for a project, which will run in the specified order every time - the project is built.</p> - <p>Whether run as a stand-alone tool or as a project builder, - each external tool can be configured to provide its output in - either (or both) of:</p> + <p><a href="concepts-exttools.htm">External tools</a> allow you to configure and run programs, batch files, Ant + buildfiles, and others using the Workbench. Any <a href="../gettingStarted/qs-96_non_ant_pjs.htm">external tool</a> + configuration you create can be used as part of the build process for a project, which will run in the specified + order every time the project is built.</p> + <p>Whether run as a stand-alone tool or as a project builder, each external tool can be configured to provide its + output in either (or both) of:</p> <ul> - <li>The <b><a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a></b></li> + <li>The <b><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console + view</a></b></li> <li>A file in the local filesystem</li> </ul> - <h3 class="related">Related concepts</h3><a href= - "concepts-antsupport.htm">Ant support</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-antsupport.htm">Ant support</a><br> <a href="concepts-exttools.htm">External tools</a><br> <a href="concepts-22.htm">Builds</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-exttools-running.htm">Running external - tools</a><br> - <a href="../tasks/tasks-ant-running.htm">Running Ant - buildfiles</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-exttoolsprefs.htm">External Tools + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-exttools-running.htm">Running external tools</a><br> + <a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-exttoolsprefs.htm">External Tools preferences</a><br> - <a href="../reference/ref-anticons.htm">External Tools and Ant - icons</a><br> - <a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a> + <a href="../reference/ref-anticons.htm">External Tools and Ant icons</a><br> + <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-antsupport.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-antsupport.htm index 46a641b..c044635 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-antsupport.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-antsupport.htm
@@ -3,61 +3,40 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Ant support</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1>Ant support</h1> - <p>Apache Ant is an open source, Java-based build tool. See - <a href="http://ant.apache.org" target= + <p>Apache Ant is an open source, Java-based build tool. See <a href="http://ant.apache.org" target= "_blank">http://ant.apache.org</a> for more details.</p> - <p>Ant support allows you to create and run Ant buildfiles from - the Workbench. These Ant buildfiles can operate on resources in - the file system as well as resources in the workspace.</p> + <p>Ant support allows you to create and run Ant buildfiles from the Workbench. These Ant buildfiles can operate on + resources in the file system as well as resources in the workspace.</p> <p>Output from an Ant buildfile is displayed in the <b><a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a></b> in the same hierarchical format seen when - running Ant from the command line. Ant tasks (for example - <code>[mkdir]</code>) are hyper-linked to the associated Ant - buildfile, and <code>javac</code> error reports are hyper-linked - to the associated Java source file and line number.</p> - <p>You can add classes to the Ant classpath and add Ant tasks and - types from the <a class="command-link" href= + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b> in the same + hierarchical format seen when running Ant from the command line. Ant tasks (for example <code>[mkdir]</code>) are + hyper-linked to the associated Ant buildfile, and <code>javac</code> error reports are hyper-linked to the associated + Java source file and line number.</p> + <p>You can add classes to the Ant classpath and add Ant tasks and types from the <a class="command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ant.ui.AntRuntimePreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Ant > Runtime</b></a> preference page.</p> - <h3 class="related">Related concepts</h3><a href= - "../concepts/concepts-22.htm">Builds</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Ant > Runtime</b></a> preference + page.</p> + <h3 class="related">Related concepts</h3><a href="../concepts/concepts-22.htm">Builds</a><br> <a href="../concepts/concepts-exttools.htm">External tools</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-ant-running.htm">Running Ant buildfiles</a><br> - <a href="../tasks/tasks-ant-classpath.htm">Modifying the Ant - classpath</a><br> - <a href="../tasks/tasks-ant-addtasksandtypes.htm">Adding new Ant - tasks and types</a><br> - <a href="../tasks/tasks-ant-version.htm">Using a different - version of Ant</a><br> - <a href="../tasks/antRunner.htm">antRunner application entry - point</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-antprefs.htm">Ant preference page</a><br> - <a href="../reference/ref-anteditorprefs.htm">Ant editor - preference page</a><br> - <a href="../reference/ref-antruntimeprefs.htm">Ant runtime - preference page</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a><br> + <a href="../tasks/tasks-ant-classpath.htm">Modifying the Ant classpath</a><br> + <a href="../tasks/tasks-ant-addtasksandtypes.htm">Adding new Ant tasks and types</a><br> + <a href="../tasks/tasks-ant-version.htm">Using a different version of Ant</a><br> + <a href="../tasks/antRunner.htm">antRunner application entry point</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-antprefs.htm">Ant preference page</a><br> + <a href="../reference/ref-anteditorprefs.htm">Ant editor preference page</a><br> + <a href="../reference/ref-antruntimeprefs.htm">Ant runtime preference page</a><br> <a href="../reference/ref-antview.htm">Ant view</a><br> <a href="../reference/ref-anteditor.htm">Ant editor</a><br> - <a href="../reference/ref-anticons.htm">External Tools and Ant - icons</a><br> - <a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a> + <a href="../reference/ref-anticons.htm">External Tools and Ant icons</a><br> + <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-cvs-watch.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-cvs-watch.htm index 18aba81..8fef543 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-cvs-watch.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-cvs-watch.htm
@@ -3,40 +3,28 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>CVS Watch/Edit</title> </head> <body style="background-color: rgb(255,255,255);"> <h1 class="Head">Watch/Edit</h1> - <p class="Para">CVS provides a notification scheme which allows a - group of developers to know if somebody is working on a given - file. This facility is known as <em>watches</em>. By setting a - <em>watch</em> on a file, you can have CVS notify you via email - if someone else starts to <em>edit</em> this file. This mechanism - is notification based only; the file is not locked in any way on - the server, and several people are allowed to edit the same file - at the same time.</p> - <p class="Para">In addition to watch list notification, - <em>edit</em> on its own is useful for discovering if others are - also editing that file. This is because when you edit a file, you - will be informed if someone else is already editing it.</p> - <p class="Para">Normally with CVS clients, you would need to - issue an explicit <em>edit</em>. With Team CVS support however, - an <em>edit</em> is automatically issued by the client when you - start to modify a file. In addition, when <em>editing</em> a - file, Team CVS provides you with the list of people already - editing a file. This allows you to find out who is working on a - file before you start to edit it.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-26.htm">Team programming with CVS</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-cvs-watch.htm">Finding out who's working on what: + <p class="Para">CVS provides a notification scheme which allows a group of developers to know if somebody is working + on a given file. This facility is known as <em>watches</em>. By setting a <em>watch</em> on a file, you can have CVS + notify you via email if someone else starts to <em>edit</em> this file. This mechanism is notification based only; + the file is not locked in any way on the server, and several people are allowed to edit the same file at the same + time.</p> + <p class="Para">In addition to watch list notification, <em>edit</em> on its own is useful for discovering if others + are also editing that file. This is because when you edit a file, you will be informed if someone else is already + editing it.</p> + <p class="Para">Normally with CVS clients, you would need to issue an explicit <em>edit</em>. With Team CVS support + however, an <em>edit</em> is automatically issued by the client when you start to modify a file. In addition, when + <em>editing</em> a file, Team CVS provides you with the list of people already editing a file. This allows you to + find out who is working on a file before you start to edit it.</p> + <h3 class="related">Related concepts</h3><a href="concepts-26.htm">Team programming with CVS</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-cvs-watch.htm">Finding out who's working on what: watch/edit</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-47.htm">CVS</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-47.htm">CVS</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm b/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm index d755bdf..f90ff7e 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm
@@ -3,30 +3,22 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> <title>External tools</title> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> </head> <body> <h1>External tools</h1> - <p>External tools allow you to configure and run programs, batch - files, Ant buildfiles, and others using the Workbench. You can - save these external tool configurations and run them at a later - time.</p> + <p>External tools allow you to configure and run programs, batch files, Ant buildfiles, and others using the + Workbench. You can save these external tool configurations and run them at a later time.</p> <p>Output from external tools is displayed in the <b><a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a></b>.</p> - <p>You can add external tools as part of the build process for a - project. These external tools will run in the specified order - every time a project is built.</p> - <p>The following variables are available when you configure an - external tool. These variables are automatically expanded each - time the external tool is run.</p> - <table border="1" width="80%" cellpadding="5" cellspacing="0" - summary="Variables available to external tools"> + "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a></b>.</p> + <p>You can add external tools as part of the build process for a project. These external tools will run in the + specified order every time a project is built.</p> + <p>The following variables are available when you configure an external tool. These variables are automatically + expanded each time the external tool is run.</p> + <table border="1" width="80%" cellpadding="5" cellspacing="0" summary="Variables available to external tools"> <thead> <tr> <th width="25%" colspan="1" rowspan="1"> @@ -40,104 +32,76 @@ <tbody> <tr> <td><b>${workspace_loc}</b></td> - <td>The absolute path on the system's hard drive to - Eclipse's workspace directory</td> + <td>The absolute path on the system's hard drive to Eclipse's workspace directory</td> </tr> <tr> - <td><b>${workspace_loc:<i><resource - path></i>}</b></td> - <td>The absolute path on the system's hard drive to the - specified resource. The <i><resource path></i> is the - full path of the resource relative to the workspace root. - For example ${workspace_loc:/MyProject/MyFile.txt}. Note - that the expanded result of this variable is not the same - as ${workspace_loc}/MyProject/MyFile.txt if the project's - contents directory for MyProject is outside the workspace - directory.</td> + <td><b>${workspace_loc:<i><resource path></i>}</b></td> + <td>The absolute path on the system's hard drive to the specified resource. The <i><resource path></i> is + the full path of the resource relative to the workspace root. For example + ${workspace_loc:/MyProject/MyFile.txt}. Note that the expanded result of this variable is not the same as + ${workspace_loc}/MyProject/MyFile.txt if the project's contents directory for MyProject is outside the + workspace directory.</td> </tr> <tr> <td><b>${project_loc}</b></td> - <td>The absolute path on the system's hard drive to the - currently selected resource's project or to the project - being built if the external tool is run as part of a - build.</td> + <td>The absolute path on the system's hard drive to the currently selected resource's project or to the project + being built if the external tool is run as part of a build.</td> </tr> <tr> <td><b>${project_loc:<i><resource path></i>}</b></td> - <td>The absolute path on the system's hard drive to the - specified resource's project. The <i><resource - path></i> is the full path of the resource relative to - the workspace root. For example - ${workspace_loc:/MyProject/MyFile.txt}. Note that the - expanded result of this variable is not the same as - ${workspace_loc}/MyProject if the project's contents - directory for MyProject is outside the workspace + <td>The absolute path on the system's hard drive to the specified resource's project. The <i><resource + path></i> is the full path of the resource relative to the workspace root. For example + ${workspace_loc:/MyProject/MyFile.txt}. Note that the expanded result of this variable is not the same as + ${workspace_loc}/MyProject if the project's contents directory for MyProject is outside the workspace directory.</td> </tr> <tr> <td><b>${container_loc}</b></td> - <td>The absolute path on the system's hard drive to the - currently selected resource's parent (either a folder or - project).</td> + <td>The absolute path on the system's hard drive to the currently selected resource's parent (either a folder + or project).</td> </tr> <tr> - <td><b>${container_loc:<i><resource - path></i>}</b></td> - <td>The absolute path on the system's hard drive to the - specified resource's parent (either a folder or project). - The <i><resource path></i> is the full path of the - resource relative to the workspace root. For - example:${workspace_loc:/MyProject/MyFolder/MyFile.txt}. - Note that the expanded result of this variable is not the - same as ${workspace_loc}/MyProject/MyFolder if the - project's contents directory for MyProject is outside the - workspace directory.</td> + <td><b>${container_loc:<i><resource path></i>}</b></td> + <td>The absolute path on the system's hard drive to the specified resource's parent (either a folder or + project). The <i><resource path></i> is the full path of the resource relative to the workspace root. For + example:${workspace_loc:/MyProject/MyFolder/MyFile.txt}. Note that the expanded result of this variable is not + the same as ${workspace_loc}/MyProject/MyFolder if the project's contents directory for MyProject is outside + the workspace directory.</td> </tr> <tr> <td><b>${resource_loc}</b></td> - <td>The absolute path on the system's hard drive to the - currently selected resource.</td> + <td>The absolute path on the system's hard drive to the currently selected resource.</td> </tr> <tr> - <td><b>${resource_loc:<i><resource - path></i>}</b></td> - <td>The absolute path on the system's hard drive to the - specified resource. The <i><resource path></i> is the - full path of the resource relative to the workspace root. - For example ${workspace_loc:/MyProject/MyFile.txt}. Note - that the expanded result of this variable is not the same - as ${workspace_loc}/MyProject/MyFile.txt if the project's - contents directory for MyProject is outside the workspace - directory.</td> + <td><b>${resource_loc:<i><resource path></i>}</b></td> + <td>The absolute path on the system's hard drive to the specified resource. The <i><resource path></i> is + the full path of the resource relative to the workspace root. For example + ${workspace_loc:/MyProject/MyFile.txt}. Note that the expanded result of this variable is not the same as + ${workspace_loc}/MyProject/MyFile.txt if the project's contents directory for MyProject is outside the + workspace directory.</td> </tr> <tr> <td><b>${project_path}</b></td> - <td>The full path, relative to the workspace root, of the - currently selected resource's project or of the project - being built if the external tool is run as part of a - build.</td> + <td>The full path, relative to the workspace root, of the currently selected resource's project or of the + project being built if the external tool is run as part of a build.</td> </tr> <tr> <td><b>${container_path}</b></td> - <td>The full path, relative to the workspace root, of the - currently selected resource's parent (either a folder or - project).</td> + <td>The full path, relative to the workspace root, of the currently selected resource's parent (either a folder + or project).</td> </tr> <tr> <td><b>${resource_path}</b></td> - <td>The full path, relative to the workspace root, of the - currently selected resource.</td> + <td>The full path, relative to the workspace root, of the currently selected resource.</td> </tr> <tr> <td><b>${project_name}</b></td> - <td>The name of the currently selected resource's project - or of the project being built if the external tool is run - as part of a build.</td> + <td>The name of the currently selected resource's project or of the project being built if the external tool is + run as part of a build.</td> </tr> <tr> <td><b>${container_name}</b></td> - <td>The name of the currently selected resource's parent - (either a folder or project).</td> + <td>The name of the currently selected resource's parent (either a folder or project).</td> </tr> <tr> <td><b>${resource_name}</b></td> @@ -145,25 +109,17 @@ </tr> <tr> <td><b>${build_type}</b></td> - <td>The kind of build when the external tool is run as part - of a build. The value can be one of "full", "incremental", - or "auto". If the external tool is run outside of a build, - the value is then "none".</td> + <td>The kind of build when the external tool is run as part of a build. The value can be one of "full", + "incremental", or "auto". If the external tool is run outside of a build, the value is then "none".</td> </tr> </tbody> </table> - <p>Lets assume your Eclipse workspace directory is - <code>c:\eclipse\workspace</code> and you have two projects, - <code>MyProject1</code> and <code>MyProject2</code>. The first - project, <code>MyProject1</code>, is located inside the workspace - directory, the second project, <code>MyProject2</code>, is - located outside the workspace directory at - <code>c:\projects\MyProject2</code>. Lets look at how the - variable examples below will be expanded when an external tool is - run, if the resource <code>/MyProject2/MyFolder/MyFile.txt</code> - is selected.</p> - <table border="1" width="50%" cellpadding="5" cellspacing="0" - summary="Variables available to external tools"> + <p>Lets assume your Eclipse workspace directory is <code>c:\eclipse\workspace</code> and you have two projects, + <code>MyProject1</code> and <code>MyProject2</code>. The first project, <code>MyProject1</code>, is located inside + the workspace directory, the second project, <code>MyProject2</code>, is located outside the workspace directory at + <code>c:\projects\MyProject2</code>. Lets look at how the variable examples below will be expanded when an external + tool is run, if the resource <code>/MyProject2/MyFolder/MyFile.txt</code> is selected.</p> + <table border="1" width="50%" cellpadding="5" cellspacing="0" summary="Variables available to external tools"> <thead> <tr> <th width="25%" colspan="1" rowspan="1"> @@ -233,21 +189,13 @@ </tr> </tbody> </table> - <h3 class="related">Related concepts</h3><a href= - "concepts-antsupport.htm">Ant support</a><br> + <h3 class="related">Related concepts</h3><a href="concepts-antsupport.htm">Ant support</a><br> <a href="concepts-22.htm">Builds</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-exttoolsprefs.htm">External Tools + <h3 class="related">Related reference</h3><a href="../reference/ref-exttoolsprefs.htm">External Tools preferences</a><br> - <a href="../reference/ref-anticons.htm">External Tools and Ant - icons</a><br> - <a href= - "PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm"> - Console view</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-exttools-running.htm">Running external - tools</a><br> - <a href="../tasks/tasks-ant-running.htm">Running Ant - buildfiles</a> + <a href="../reference/ref-anticons.htm">External Tools and Ant icons</a><br> + <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/console/ref-console_view.htm">Console view</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-exttools-running.htm">Running external tools</a><br> + <a href="../tasks/tasks-ant-running.htm">Running Ant buildfiles</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/coutline.htm b/bundles/org.eclipse.platform.doc.user/concepts/coutline.htm index e170085..cc0fe17 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/coutline.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/coutline.htm
@@ -3,36 +3,26 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Outline view</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1 class="Head">Outline view</h1> - <p>The Outline view displays an outline of a structured file that - is currently open in the editor area, and lists structural - elements. The contents of the Outline view are editor specific. - In the example below, which is for a Java source file, the - structural elements are classes, fields, and methods. The - contents of the toolbar are also editor specific.</p> - <p>To add the Outline view to the current perspective, click - <a class="command-link" href= + <p>The Outline view displays an outline of a structured file that is currently open in the editor area, and lists + structural elements. The contents of the Outline view are editor specific. In the example below, which is for a Java + source file, the structural elements are classes, fields, and methods. The contents of the toolbar are also editor + specific.</p> + <p>To add the Outline 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.views.ContentOutline)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Window > Show View > Other... > - General > Outline</b></a>.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-5.htm">Views</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Show View > Other... + > General > Outline</b></a>.</p> + <h3 class="related">Related concepts</h3><a href="concepts-5.htm">Views</a><br> <a href="concepts-4.htm">Perspectives</a><br> <a href="concepts-12.htm">Resources</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-3.htm">Opening views</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-3.htm">Opening views</a><br> <a href="../tasks/tasks-3e.htm">Moving and docking views</a><br> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cpathvars.htm b/bundles/org.eclipse.platform.doc.user/concepts/cpathvars.htm index 2e17f44..462aa8d 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/cpathvars.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/cpathvars.htm
@@ -3,67 +3,43 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Path variables</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Path variables</h1> - <p>Path variables specify locations on the file system. The - location of linked resources may be specified relative to these - path variables. They allow you to avoid references to a fixed - location on your file system.</p> - <p>By using a path variable, you can share projects containing - linked resources with team members without requiring the exact - same directory structure as on your file system.</p> - <p>Path variables can be either defined at the project level or - at the workspace level. Creating path variables at the project - level ensures that projects that contain linked resources using - those path variables remain portable across workspace and - computers.</p> - <p>Each project contain a pre-defined set of path variables - available for defining linked resources, including - <b>ECLIPSE_HOME</b>, <b>PARENT_LOC</b>, <b>PROJECT_LOC</b> and - <b>WORKSPACE_LOC</b>.</p> - <p>New path variables can be defined relative to existing path - variables by using the ${VAR} syntax. For example, a path - variable FOO can be defined relative to BAR by defining it to - "${BAR}../foo".</p> - <p>You can load a project that uses path variables even if you do - not currently have all the path variables defined in the project - or workspace. A linked resource that uses a missing path variable - is flagged using a special decorator icon. In addition, the - <b>File > Properties > Resource</b> property page and the - Properties view ( <a class="command-link" href= + <p>Path variables specify locations on the file system. The location of linked resources may be specified relative to + these path variables. They allow you to avoid references to a fixed location on your file system.</p> + <p>By using a path variable, you can share projects containing linked resources with team members without requiring + the exact same directory structure as on your file system.</p> + <p>Path variables can be either defined at the project level or at the workspace level. Creating path variables at + the project level ensures that projects that contain linked resources using those path variables remain portable + across workspace and computers.</p> + <p>Each project contain a pre-defined set of path variables available for defining linked resources, including + <b>ECLIPSE_HOME</b>, <b>PARENT_LOC</b>, <b>PROJECT_LOC</b> and <b>WORKSPACE_LOC</b>.</p> + <p>New path variables can be defined relative to existing path variables by using the ${VAR} syntax. For example, a + path variable FOO can be defined relative to BAR by defining it to "${BAR}../foo".</p> + <p>You can load a project that uses path variables even if you do not currently have all the path variables defined + in the project or workspace. A linked resource that uses a missing path variable is flagged using a special decorator + icon. In addition, the <b>File > Properties > Resource</b> property page and the Properties view ( <a class= + "command-link" href= 'javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.PropertySheet)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Window > Show View > Other... > - General > Properties</b></a>) for a linked resource indicate - the variable and whether it is defined or not. A path variable - can also specify a location that does not currently exist on the - file system. Linked resources that use such a path variable are - indicated using the same decorator icon mentioned above.</p> - <p>You can create new path variables and edit and remove existing - path variables in the <b>File > Properties > Resource > - Linked Resources</b> property page for a project resource and at - the workspace level on the <a class="command-link" href= + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Show View > Other... + > General > Properties</b></a>) for a linked resource indicate the variable and whether it is defined or not. A + path variable can also specify a location that does not currently exist on the file system. Linked resources that use + such a path variable are indicated using the same decorator icon mentioned above.</p> + <p>You can create new path variables and edit and remove existing path variables in the <b>File > Properties > + Resource > Linked Resources</b> property page for a project resource and at the workspace level on the <a class= + "command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.LinkedResources)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>General > Workspace > Linked + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Workspace > Linked Resources</b></a> preference page.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-13.htm">Linked resources</a><br> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-45.htm">Creating linked resources</a><br> - <a href="../tasks/tasks-49.htm">Viewing resource - properties</a><br> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-14b.htm">Linked resources</a> + <h3 class="related">Related concepts</h3><a href="concepts-13.htm">Linked resources</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-45.htm">Creating linked resources</a><br> + <a href="../tasks/tasks-49.htm">Viewing resource properties</a><br> + <h3 class="related">Related reference</h3><a href="../reference/ref-14b.htm">Linked resources</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm b/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm index 1088a1e..ba733e5 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm
@@ -3,61 +3,40 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Problems view (concept)</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1 class="Head">Problems view</h1> - <p class="Para">As you work with resources in the workbench, - various builders may automatically log problems, errors, or - warnings in the Problems view. For example, when you save a Java - source file that contains syntax errors, those will be logged in - the Problems view. When you double-click the icon for a problem, - error, or warning, the editor for the associated resource - automatically opens to the relevant line of code.</p> - <p class="Head">By default the Problems view will group your - problems by severity. You can also group them by type or not at - all. Certain components will add their own grouping. For instance - the Java development tools (JDT) support adds a Java Problem Type - group. The grouping can be selected using the <b>Group By</b> - menu.</p> - <p class="Head">The first column of the Problems view displays an - icon that denotes the type of line item, the category and the - description. Left-click the item to open the file in an editor - and highlight the line containing the problem.</p> - <p class="Head">You can configure the contents of the Problems - view to view only warnings and errors associated with a - particular resource or group of resources. This is done using the - <b>Filters</b> dialog available from the drop down menu. You can - add multiple filters to the Problems view and enable or disable - them as required. Filters can either be additive (any problem - that satisfies at least one of the enables filters will be shown) - or exclusive (only problems that satisfy all of the filters will - be shown) The two most popular filters (All Errors and Warnings - on Selection) are provided by default.</p> - <p>Problems can be fixed by selecting <b>Quick Fix</b> from the - context menu. The list of possible resolutions will be shown in a - dialog.</p> - <p class="Head">To add the Problems view to the current - perspective, click <a class="command-link" href= + <p class="Para">As you work with resources in the workbench, various builders may automatically log problems, errors, + or warnings in the Problems view. For example, when you save a Java source file that contains syntax errors, those + will be logged in the Problems view. When you double-click the icon for a problem, error, or warning, the editor for + the associated resource automatically opens to the relevant line of code.</p> + <p class="Head">By default the Problems view will group your problems by severity. You can also group them by type or + not at all. Certain components will add their own grouping. For instance the Java development tools (JDT) support + adds a Java Problem Type group. The grouping can be selected using the <b>Group By</b> menu.</p> + <p class="Head">The first column of the Problems view displays an icon that denotes the type of line item, the + category and the description. Left-click the item to open the file in an editor and highlight the line containing the + problem.</p> + <p class="Head">You can configure the contents of the Problems view to view only warnings and errors associated with + a particular resource or group of resources. This is done using the <b>Filters</b> dialog available from the drop + down menu. You can add multiple filters to the Problems view and enable or disable them as required. Filters can + either be additive (any problem that satisfies at least one of the enables filters will be shown) or exclusive (only + problems that satisfy all of the filters will be shown) The two most popular filters (All Errors and Warnings on + Selection) are provided by default.</p> + <p>Problems can be fixed by selecting <b>Quick Fix</b> from the context menu. The list of possible resolutions will + be shown in a dialog.</p> + <p class="Head">To add the Problems 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.views.ProblemView)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Window > Show View > Other... > - General > Problems</b></a>.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-11.htm">Markers</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Show View > Other... + > General > Problems</b></a>.</p> + <h3 class="related">Related concepts</h3><a href="concepts-11.htm">Markers</a><br> <a href="cbookmrk.htm">Bookmarks</a><br> <a href="ctskview.htm">Tasks view</a><br> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-3.htm">Opening views</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-3.htm">Opening views</a><br> <a href="../tasks/tasks-3e.htm">Moving and docking views</a><br> - <a href="../tasks/tquickfix.htm">Automatically fixing - problems</a> + <a href="../tasks/tquickfix.htm">Automatically fixing problems</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cpropview.htm b/bundles/org.eclipse.platform.doc.user/concepts/cpropview.htm index e06681f..9fa3a05 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/cpropview.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/cpropview.htm
@@ -3,33 +3,22 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Properties view</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Properties view</h1> - <p class="Para">The properties view displays property names and - values for a selected item such as a resource.</p> - <p class="Para">Toolbar buttons allow you to toggle to display - properties by category or to filter advanced properties. Another - toolbar button allows you to restore the selected property to its - default value.</p> - <p>To see more detailed information about a resource than the - Properties view gives you, right-click the resource name in one - of the navigation views and select Properties from the pop-up - menu.</p> - <p>To add the Properties view to the current perspective, click - <a class="command-link" href= + <p class="Para">The properties view displays property names and values for a selected item such as a resource.</p> + <p class="Para">Toolbar buttons allow you to toggle to display properties by category or to filter advanced + properties. Another toolbar button allows you to restore the selected property to its default value.</p> + <p>To see more detailed information about a resource than the Properties view gives you, right-click the resource + name in one of the navigation views and select Properties from the pop-up menu.</p> + <p>To add the Properties 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.views.PropertySheet)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Window > Show View > Other... > - General > Properties</b></a>.</p> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Show View > Other... + > General > Properties</b></a>.</p> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/csearchview.htm b/bundles/org.eclipse.platform.doc.user/concepts/csearchview.htm index 6df7e7e..2d6ca7f 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/csearchview.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/csearchview.htm
@@ -3,33 +3,27 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2005. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Search view</title> </head> <body> <h1>Search view</h1> <p>This view displays the results of a search.</p> - <p>Text searches will only search for expressions in files with - extensions (file types) specified in the search dialog.</p> + <p>Text searches will only search for expressions in files with extensions (file types) specified in the search + dialog.</p> <h2>Toolbar</h2> - <p>The toolbar in the Search view contains the following - buttons:</p> + <p>The toolbar in the Search view contains the following buttons:</p> <dl> <dt>Show Next Match</dt> - <dd>This command highlights the next match of the search - expression in the editor area, opening the file if + <dd>This command highlights the next match of the search expression in the editor area, opening the file if required.</dd> <dt>Show Previous Match</dt> - <dd>This command highlights the previous match of the search - expression in the editor area, opening the file if + <dd>This command highlights the previous match of the search expression in the editor area, opening the file if required.</dd> <dt>Remove Selected Matches</dt> - <dd>Removes all highlighted matches from the search - results.</dd> + <dd>Removes all highlighted matches from the search results.</dd> <dt>Remove All Matches</dt> <dd>Removes all search result form the search view</dd> <dt>Expand all</dt> @@ -37,28 +31,22 @@ <dt>Collapse all</dt> <dd>Collapses every tree item in the search view</dd> <dt>Run the Current Search Again</dt> - <dd>This command reruns the current search again, so that - removed search results reappear or changes are reflected.</dd> + <dd>This command reruns the current search again, so that removed search results reappear or changes are + reflected.</dd> <dt>Cancel Current Search</dt> <dd>Cancels the current search</dd> <dt>Show Previous Searches</dt> - <dd>This command allows you to browse previously conducted - searches and repeat a previous search. You can select a - previous search from the drop-down menu or clear the search - history.</dd> + <dd>This command allows you to browse previously conducted searches and repeat a previous search. You can select a + previous search from the drop-down menu or clear the search history.</dd> <dt>Pin the Search view</dt> - <dd>Pinning the search view means that subsequent searches will - shown their results in another search view and that the pinned - view remains unchanged.</dd> + <dd>Pinning the search view means that subsequent searches will shown their results in another search view and that + the pinned view remains unchanged.</dd> </dl> - <h3 class="related">Related concepts</h3><a href= - "concepts-12.htm">Resources</a><br> + <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-84.htm">Searching for text within a file</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-84.htm">Searching for text within a file</a><br> <a href="../tasks/tasks-84b.htm">Searching for files</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-26.htm">Search view</a><br> + <h3 class="related">Related reference</h3><a href="../reference/ref-26.htm">Search view</a><br> <a href="../reference/ref-45.htm">File search</a><br> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm b/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm index 0061761..2a786d9 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm
@@ -3,54 +3,36 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Tasks view (concept)</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body> <h1 class="Head">Tasks view</h1> - <p class="Para">You can assign tasks within your project by right - clicking marker bar's context menu and selecting <strong>Add - Task</strong> or you can add items within the Tasks view by - selecting <strong>Add Task</strong> <img src= - "../images/addtsk_tsk.svg" alt= - "Picture of the Tasks view with two dummy tasks added to it." - border="0">. For example, if you would like to record reminders - to follow up on something later, add it to the tasks view. When - you add a task, you have the option of associating it with a - resource so that you can use the Tasks view to quickly open that - resource for editing.</p> - <p class="Head">The first column of the Tasks view displays an - icon that denotes the type of line item. You can sort and filter - line items in the task view, to view only high-priority tasks or - tasks associated with a particular resource or group of - resources.</p> - <p class="Head">By default, the Tasks view is included in the - Resource perspective. To add it to the current perspective, click - <a class="command-link" href= + <p class="Para">You can assign tasks within your project by right clicking marker bar's context menu and selecting + <strong>Add Task</strong> or you can add items within the Tasks view by selecting <strong>Add Task</strong> <img src= + "../images/addtsk_tsk.svg" alt="Picture of the Tasks view with two dummy tasks added to it." border="0">. For + example, if you would like to record reminders to follow up on something later, add it to the tasks view. When you + add a task, you have the option of associating it with a resource so that you can use the Tasks view to quickly open + that resource for editing.</p> + <p class="Head">The first column of the Tasks view displays an icon that denotes the type of line item. You can sort + and filter line items in the task view, to view only high-priority tasks or tasks associated with a particular + resource or group of resources.</p> + <p class="Head">By default, the Tasks view is included in the Resource 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.views.TaskList)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Window > Show View > Other... > - General > Tasks</b></a>.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-11.htm">Markers</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Window > Show View > Other... + > General > Tasks</b></a>.</p> + <h3 class="related">Related concepts</h3><a href="concepts-11.htm">Markers</a><br> <a href="cbookmrk.htm">Bookmarks</a><br> <a href="cprbview.htm">Problems view</a><br> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-3.htm">Opening views</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-3.htm">Opening views</a><br> <a href="../tasks/tasks-3e.htm">Moving and docking views</a><br> - <a href="../tasks/tasks-77.htm">Adding line items in the Tasks - view</a><br> - <a href="../tasks/tasks-77b.htm">Associating a task with a - resource</a><br> + <a href="../tasks/tasks-77.htm">Adding line items in the Tasks view</a><br> + <a href="../tasks/tasks-77b.htm">Associating a task with a resource</a><br> <a href="../tasks/tasks-79.htm">Filtering the Tasks view</a><br> <a href="../tasks/tasks-78.htm">Deleting tasks</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-31.htm">Tasks view</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-31.htm">Tasks view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm b/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm index e434d49..df4ec6c 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/cworkset.htm
@@ -3,60 +3,39 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Working sets</title> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Working sets</h1> - <p>Working sets group elements for display in views or for - operations on a set of elements.</p> - <p>The navigation views use working sets to restrict the set of - resources that are displayed. If a working set is selected in the - navigator, only resources, children of resources, and parents of - resources contained in the working set are shown. The problems - view, tasks view and bookmarks view can all be filtered based on - a working set via the <b>Filters</b> view menu item. When using - the search facility, you can also use working sets to restrict - the set of elements that are searched.</p> - <p>Different views provide different ways to specify a working - set. The views in the Eclipse SDK use the <b>Window Working - Set</b> by default. The Window Working Set is initially empty. In - order to modify the window working set you need to enable the - <b>Window Working Set</b> command group via <b>Window > - Perspective > Customize Perspective...</b>. You can then - modify the window working set via <b>Window > Working Sets</b> - menu or via corresponding toolbar button. Views that support - working sets use a working set selection dialog to manage - existing working sets and to create new working sets:</p> - <p>When you create a new working set you can choose from - different types of working sets. You can create a resource + <p>Working sets group elements for display in views or for operations on a set of elements.</p> + <p>The navigation views use working sets to restrict the set of resources that are displayed. If a working set is + selected in the navigator, only resources, children of resources, and parents of resources contained in the working + set are shown. The problems view, tasks view and bookmarks view can all be filtered based on a working set via the + <b>Filters</b> view menu item. When using the search facility, you can also use working sets to restrict the set of + elements that are searched.</p> + <p>Different views provide different ways to specify a working set. The views in the Eclipse SDK use the <b>Window + Working Set</b> by default. The Window Working Set is initially empty. In order to modify the window working set you + need to enable the <b>Window Working Set</b> command group via <b>Window > Perspective > Customize + Perspective...</b>. You can then modify the window working set via <b>Window > Working Sets</b> menu or via + corresponding toolbar button. Views that support working sets use a working set selection dialog to manage existing + working sets and to create new working sets:</p> + <p>When you create a new working set you can choose from different types of working sets. You can create a resource working set, a Java working set or a help working set.</p> - <p>If you create a new resource working set you will be able to - select the working. The same wizard is used to edit an existing - working set. Different types of working sets provide different - kinds of working set editing wizards.</p> - <p>Working sets may also be a part of a manual build workflow. - With autobuild disabled the <b>Project > Build Working Set</b> - menu becomes enabled. From here you are able to selectively build - working sets of your choosing.</p> + <p>If you create a new resource working set you will be able to select the working. The same wizard is used to edit + an existing working set. Different types of working sets provide different kinds of working set editing wizards.</p> + <p>Working sets may also be a part of a manual build workflow. With autobuild disabled the <b>Project > Build + Working Set</b> menu becomes enabled. From here you are able to selectively build working sets of your choosing.</p> <div class="Note"> - <p><strong>Note:</strong> Newly created resources are not - automatically included in the active working set. They are - implicitly included in a working set if they are children of an - existing working set element. If you want to include other - resources after you have created them you have to explicitly - add them to the working set.</p> + <p><strong>Note:</strong> Newly created resources are not automatically included in the active working set. They + are implicitly included in a working set if they are children of an existing working set element. If you want to + include other resources after you have created them you have to explicitly add them to the working set.</p> </div> - <h3 class="related">Related concepts</h3><a href= - "../reference/ref-27.htm">Project Explorer view</a><br> + <h3 class="related">Related concepts</h3><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><a href= - "../tasks/tasks-84.htm">Searching for text within a file</a><br> - <a href="../tasks/tasks-48b.htm">Showing or hiding resources in - the Project Explorer view</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-84.htm">Searching for text within a file</a><br> + <a href="../tasks/tasks-48b.htm">Showing or hiding resources in the Project Explorer view</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/help.htm b/bundles/org.eclipse.platform.doc.user/concepts/help.htm index 8056aea..0d10301 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/help.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/help.htm
@@ -3,85 +3,52 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2019. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> <title>Help</title> </head> <body> <h1>Help</h1> - <p>The Help system lets you browse, search, bookmark, and print - help documentation. The documentation is organized into sets of - information that are analogous to books. The help system also - supplies a text search capability for finding the information you - need by search phrase or keyword, and context-sensitive help for - finding information to describe the particular function you are - working with.</p> - <p>You can interact with help system in the workbench using the - <strong>Help view</strong> or in the separate <strong>Help - window</strong>. The view and window provide the same information - but in different ways.</p> + <p>The Help system lets you browse, search, bookmark, and print help documentation. The documentation is organized + into sets of information that are analogous to books. The help system also supplies a text search capability for + finding the information you need by search phrase or keyword, and context-sensitive help for finding information to + describe the particular function you are working with.</p> + <p>You can interact with help system in the workbench using the <strong>Help view</strong> or in the separate + <strong>Help window</strong>. The view and window provide the same information but in different ways.</p> <h2>The Help view</h2> - <p>The Help view provides help inside the workbench. You can open - the view from the main menu by selecting <b>Help > Dynamic - Help</b> or <b>Help > Search</b>. The view will open showing - the Related Topics or Search page, respectively. You can use - links at the top of the help view to turn to other pages.</p> - <p>You can <a href="help_view.htm">read more</a> about the Help - view and its various pages.</p> + <p>The Help view provides help inside the workbench. You can open the view from the main menu by selecting <b>Help + > Dynamic Help</b> or <b>Help > Search</b>. The view will open showing the Related Topics or Search page, + respectively. You can use links at the top of the help view to turn to other pages.</p> + <p>You can <a href="help_view.htm">read more</a> about the Help view and its various pages.</p> <h2>The Help window</h2> - <p>The Help window provides the same content as the Help view, - but in a <em>separate</em> window instead of in a view. You can - open the window from the main menu by selecting <b>Help > Help - Contents</b>. The first view shown in the window is called - Contents. This view displays the table of contents for the - product documentation. Click on one of the links to expand the - navigation tree for a set of documentation.</p>Note that if your - browser does not have JavaScript enabled or is an does not - support the features required to display the normal help - application "basic" help which will be displayed - this can - easily be identified because closed books in the table of - contents do not have an expander icon. You can find the user - agent of your browser <a href= - "../../../about.html?show=agent">here.</a> + <p>The Help window provides the same content as the Help view, but in a <em>separate</em> window instead of in a + view. You can open the window from the main menu by selecting <b>Help > Help Contents</b>. The first view shown in + the window is called Contents. This view displays the table of contents for the product documentation. Click on one + of the links to expand the navigation tree for a set of documentation.</p>Note that if your browser does not have + JavaScript enabled or is an does not support the features required to display the normal help application "basic" + help which will be displayed - this can easily be identified because closed books in the table of contents do not + have an expander icon. You can find the user agent of your browser <a href="../../../about.html?show=agent">here.</a> <h2>Context-sensitive help</h2> - <p>If you are working through a task and encounter a part of the - interface that you do not understand, you can summon - context-sensitive help. By default, this will display the Help - view and give you some specific information about the - view/editor/dialog you are using, and possibly some links to - topics for further help.</p> - <p>Context-sensitive help can be accessed by bringing focus to - the interface part in question by clicking on it or using the Tab - key, and then pressing <code>F1</code> (<code>Shift+F1</code> on - GTK+, and <code>Help</code> on the Mac). Alternatively, in - dialogs you can achieve the same result by pressing the <img src= - "../images/help.svg" alt="Help button"> help button in the - dialog's button bar.</p> + <p>If you are working through a task and encounter a part of the interface that you do not understand, you can summon + context-sensitive help. By default, this will display the Help view and give you some specific information about the + view/editor/dialog you are using, and possibly some links to topics for further help.</p> + <p>Context-sensitive help can be accessed by bringing focus to the interface part in question by clicking on it or + using the Tab key, and then pressing <code>F1</code> (<code>Shift+F1</code> on GTK+, and <code>Help</code> on the + Mac). Alternatively, in dialogs you can achieve the same result by pressing the <img src="../images/help.svg" alt= + "Help button"> help button in the dialog's button bar.</p> <h3>Infopops</h3> - <p>An alternative way of presenting context-sensitive information - is using <b>infopops</b>. You can use the <a class="command-link" - href= + <p>An alternative way of presenting context-sensitive information is using <b>infopops</b>. You can use the <a class= + "command-link" href= 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.help.ui.browsersPreferencePage)")'> - <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt= - "command link"> <b>Help</b></a> preference page to configure Help - to use infopops instead of the Help view for displaying - context-sensitive help.</p> - <h3 class="related">Related concepts</h3><a href= - "help_view.htm">Help view</a><br> - <h3 class="related">Related tasks</h3><a href= - "../tasks/help.xhtml">Accessing help</a><br> - <a href="../tasks/help_navigate.htm">Navigating help - topics</a><br> - <a href="../tasks/help_context.htm">Accessing context-sensitive - help</a><br> + <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>Help</b></a> preference page to + configure Help to use infopops instead of the Help view for displaying context-sensitive help.</p> + <h3 class="related">Related concepts</h3><a href="help_view.htm">Help view</a><br> + <h3 class="related">Related tasks</h3><a href="../tasks/help.xhtml">Accessing help</a><br> + <a href="../tasks/help_navigate.htm">Navigating help topics</a><br> + <a href="../tasks/help_context.htm">Accessing context-sensitive help</a><br> <a href="../tasks/help_search.htm">Searching help</a> - <h3 class="related">Related reference</h3><a href= - "../reference/help_preferences.htm">Help preferences</a> + <h3 class="related">Related reference</h3><a href="../reference/help_preferences.htm">Help preferences</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm b/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm index e09965e..dac0b14 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm
@@ -3,87 +3,60 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> <title>Help view</title> </head> <body> <h1>Help view</h1> - <p>The Help view provides user assistance inside the workbench. - The view consists of several pages. Each page presents help in a - different fashion. Hyper links at the bottom of the help view - allow switching among pages, and clicking any topic will display - its contents.</p> + <p>The Help view provides user assistance inside the workbench. The view consists of several pages. Each page + presents help in a different fashion. Hyper links at the bottom of the help view allow switching among pages, and + clicking any topic will display its contents.</p> <h2>Related Topics</h2> - <p>The <strong>Related Topics</strong> page shows description and - help topics related to the current workbench context. The - <b>About</b> section shows context help specific to your current - context, and the <b>Search</b> link allows you to search for more - results based on the name of the view or dialog that has focus. - The Related Topics page tracks changes in the workbench and - continuously updates displayed information.</p> + <p>The <strong>Related Topics</strong> page shows description and help topics related to the current workbench + context. The <b>About</b> section shows context help specific to your current context, and the <b>Search</b> link + allows you to search for more results based on the name of the view or dialog that has focus. The Related Topics page + tracks changes in the workbench and continuously updates displayed information.</p> <h2>Contents</h2> - <p>The <strong>Contents</strong> page shows the table of - contents. It is a hierarchy of all help topics arranged in a - tree. The tree branches can be expanded to browse topics that can - be displayed using a single mouse click.</p> + <p>The <strong>Contents</strong> page shows the table of contents. It is a hierarchy of all help topics arranged in a + tree. The tree branches can be expanded to browse topics that can be displayed using a single mouse click.</p> <h2>Search</h2> - <p>The <strong>Search</strong> page allows locating local topics, - cheat sheets, welcome content, remote documents, and other - documents given a search query. Links to search hits are - displayed along with a summary of topic contents. Search scope - controls a subset of documentation being searched. Multiple - search scopes can be configured, each defining a custom set of - resources from among local documentation, additional local search - engines or remote engines on the web.</p> + <p>The <strong>Search</strong> page allows locating local topics, cheat sheets, welcome content, remote documents, + and other documents given a search query. Links to search hits are displayed along with a summary of topic contents. + Search scope controls a subset of documentation being searched. Multiple search scopes can be configured, each + defining a custom set of resources from among local documentation, additional local search engines or remote engines + on the web.</p> <h2>Index</h2> - <p>The <strong>Index</strong> page provides an index of keywords - that direct the user to specific help topics, similar to indexes - found at the back of a book. As you type in the text field, the - best match will automatically be highlighted in the list of - keywords. Pressing enter or clicking on a keyword will display - the given topic.</p> - <p><i>Note: The index page will only appear when index content is - available in the workbench.</i></p> + <p>The <strong>Index</strong> page provides an index of keywords that direct the user to specific help topics, + similar to indexes found at the back of a book. As you type in the text field, the best match will automatically be + highlighted in the list of keywords. Pressing enter or clicking on a keyword will display the given topic.</p> + <p><i>Note: The index page will only appear when index content is available in the workbench.</i></p> <h2>Bookmarks</h2> - <p>The <strong>Bookmarks</strong> shows topics marked as personal - bookmarks.</p> + <p>The <strong>Bookmarks</strong> shows topics marked as personal bookmarks.</p> <h2>Toolbar</h2> - <p>The toolbar of the Help view contains the following buttons. - The available buttons depends on the currently displayed - page.</p> + <p>The toolbar of the Help view contains the following buttons. The available buttons depends on the currently + displayed page.</p> <dl> <dt>Back</dt> - <dd>Displays the page or the topic that was displayed - immediately prior to the current display.</dd> + <dd>Displays the page or the topic that was displayed immediately prior to the current display.</dd> <dt>Forward</dt> - <dd>Displays the page or the topic was displayed immediately - after the current display.</dd> + <dd>Displays the page or the topic was displayed immediately after the current display.</dd> <dt>Collapse All</dt> - <dd>Collapses the tree expansion state of all topics on the - page.</dd> + <dd>Collapses the tree expansion state of all topics on the page.</dd> <dt>Show All Topics</dt> - <dd>When filtering of workbench elements is enabled, the - buttons enables displaying topics for disabled elements.</dd> + <dd>When filtering of workbench elements is enabled, the buttons enables displaying topics for disabled + elements.</dd> <dt>Show Result Categories</dt> - <dd>Switches between sorting search results by relevance and by - logical containers for example books.</dd> + <dd>Switches between sorting search results by relevance and by logical containers for example books.</dd> <dt>Show Result Descriptions</dt> - <dd>Displays short description of each search hit, when - available.</dd> + <dd>Displays short description of each search hit, when available.</dd> <dt>Menu</dt> - <dd>Provides menu items that allow you switching help view - pages.</dd> + <dd>Provides menu items that allow you switching help view pages.</dd> </dl> <h2>Icons</h2> - <p>The following icons can appear in the various pages of the - Help view.</p> + <p>The following icons can appear in the various pages of the Help view.</p> <table border="1" cellspacing="0"> <thead> <tr> @@ -97,87 +70,60 @@ </thead> <tbody> <tr> - <td rowspan="1" colspan="1" valign="top" align="left"> - <img src="../images/toc_closed.svg" alt="Open project icon" + <td rowspan="1" colspan="1" valign="top" align="left"><img src="../images/toc_closed.svg" alt= + "Open project icon" border="0"></td> + <td rowspan="1" colspan="1" valign="top" align="left">Book (closed)</td> + </tr> + <tr> + <td rowspan="1" colspan="1" valign="top" align="left"><img src="../images/toc_open.svg" alt="Folder icon" border="0"></td> - <td rowspan="1" colspan="1" valign="top" align="left">Book - (closed)</td> + <td rowspan="1" colspan="1" valign="top" align="left">Book (open)</td> </tr> <tr> - <td rowspan="1" colspan="1" valign="top" align="left"> - <img src="../images/toc_open.svg" alt="Folder icon" border= + <td colspan="1" valign="top" align="left"><img src="../images/toc_topic_obj.svg" alt="File icon" border= "0"></td> - <td rowspan="1" colspan="1" valign="top" align="left">Book - (open)</td> + <td colspan="1" valign="top" align="left">Topic (container)</td> </tr> <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/toc_topic_obj.svg" alt="File icon" border= - "0"></td> - <td colspan="1" valign="top" align="left">Topic - (container)</td> - </tr> - <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/topic_small.svg" alt="File icon" border= - "0"></td> + <td colspan="1" valign="top" align="left"><img src="../images/topic_small.svg" alt="File icon" border="0"></td> <td colspan="1" valign="top" align="left">Topic</td> </tr> <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/slocalhelp_obj.svg" alt="File icon" border= + <td colspan="1" valign="top" align="left"><img src="../images/slocalhelp_obj.svg" alt="File icon" border= "0"></td> - <td colspan="1" valign="top" align="left">Search of local - help</td> + <td colspan="1" valign="top" align="left">Search of local help</td> </tr> <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/help_search.svg" alt="File icon" border= + <td colspan="1" valign="top" align="left"><img src="../images/help_search.svg" alt="File icon" border="0"></td> + <td colspan="1" valign="top" align="left">Search of remote info-center</td> + </tr> + <tr> + <td colspan="1" valign="top" align="left"><img src="../images/sweb_obj.svg" alt="File icon" border="0"></td> + <td colspan="1" valign="top" align="left">Search of web engine</td> + </tr> + <tr> + <td colspan="1" valign="top" align="left"><img src="../images/highlight.svg" alt="File icon" border="0"></td> + <td colspan="1" valign="top" align="left">Highlight search terms</td> + </tr> + <tr> + <td colspan="1" valign="top" align="left"><img src="../images/openseparate_co.svg" alt="File icon" border= "0"></td> - <td colspan="1" valign="top" align="left">Search of remote - info-center</td> + <td colspan="1" valign="top" align="left">Open link in a help window</td> </tr> <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/sweb_obj.svg" alt="File icon" border="0"></td> - <td colspan="1" valign="top" align="left">Search of web - engine</td> + <td colspan="1" valign="top" align="left"><img src="../images/addbkmrk_co.svg" alt="File icon" border="0"></td> + <td colspan="1" valign="top" align="left">Bookmark document</td> </tr> <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/highlight.svg" alt="File icon" border="0"></td> - <td colspan="1" valign="top" align="left">Highlight search - terms</td> - </tr> - <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/openseparate_co.svg" alt="File icon" border= + <td colspan="1" valign="top" align="left"><img src="../images/bookmark_obj.svg" alt="File icon" border= "0"></td> - <td colspan="1" valign="top" align="left">Open link in a - help window</td> - </tr> - <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/addbkmrk_co.svg" alt="File icon" border= - "0"></td> - <td colspan="1" valign="top" align="left">Bookmark - document</td> - </tr> - <tr> - <td colspan="1" valign="top" align="left"><img src= - "../images/bookmark_obj.svg" alt="File icon" border= - "0"></td> - <td colspan="1" valign="top" align="left">Bookmarked - document</td> + <td colspan="1" valign="top" align="left">Bookmarked document</td> </tr> </tbody> </table> - <h3 class="related">Related concepts</h3><a href= - "help.htm">Help</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/help.xhtml">Accessing help</a><br> + <h3 class="related">Related concepts</h3><a href="help.htm">Help</a> + <h3 class="related">Related tasks</h3><a href="../tasks/help.xhtml">Accessing help</a><br> <a href="../tasks/help_navigate.htm">Navigating help topics</a> - <h3 class="related">Related reference</h3><a href= - "../reference/help_preferences.htm">Help preferences</a> + <h3 class="related">Related reference</h3><a href="../reference/help_preferences.htm">Help preferences</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/resourcefilters.htm b/bundles/org.eclipse.platform.doc.user/concepts/resourcefilters.htm index 776b82f..55c5f2a 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/resourcefilters.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/resourcefilters.htm
@@ -3,62 +3,42 @@ <head> <meta name="copyright" content= "Copyright (c) Freescale Semiconductor and others 2010, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Resource filters</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Resource filters</h1> - <p>Resource filters allow you to configure which files and - folders are included automatically in a project resource + <p>Resource filters allow you to configure which files and folders are included automatically in a project resource hierarchy when refresh is performed.</p> - <p>By adding resource filters to a project or folder, you can - systematically prevent some file system entries to be displayed - in the resource tree.</p> - <p>A resource filter is either of <b>Include Only</b> or - <b>Exclude All</b> type, and can apply to either files, folders, - or both.</p> - <p>Resource filters only apply to files and/or folders that are - implicitly included in the workspace by the refresh operation. - Link files and folders are not affected by resource filters, - since they need to be created explicitly by the user.</p> - <p>An "Include" resource filter allows only files and/or folders - that match the filter condition to be included in the workspace - during the refresh operation. If multiple "Include" filters - exist, the elements included will be those who match any of the - existing "Include" filters.</p> - <p>An "Exclude" resource filter prevent all files and/or folders - that match the filter condition to be included in the workspace - during the refresh operation. If multiple "Exclude" filters - exist, the elements excluded will be those who match any of the - existing "Exclude" filters.</p> - <p>If both "Exclude" and "Include" resource filters exist in a - given folder or project, only files and/or folders that match any - of the "Include" filters <b>and</b> do not match any of the - "Exclude" filters will be included in the workspace.</p> - <p>A resource filter can apply recursively to all children of the - project or folder it is created on. In such case, the resource - filter will apply to a sub-folder as if it was created in that - sub-folder itself, following the rules mentioned above.</p> - <p>Resource filters can be created, edited and removed in the - <b>File > Properties > Resource > Resources Filters</b> - property page for a project or folder resource.</p> - <p>Resource filters can also be created on a folder before that - folder is created in the workspace by selecting the "Resource - Filters..." button in the "Advanced" section of the <b>New Folder - wizard</b>.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-13.htm">Linked resources</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-97.htm">Creating resource filters</a><br> + <p>By adding resource filters to a project or folder, you can systematically prevent some file system entries to be + displayed in the resource tree.</p> + <p>A resource filter is either of <b>Include Only</b> or <b>Exclude All</b> type, and can apply to either files, + folders, or both.</p> + <p>Resource filters only apply to files and/or folders that are implicitly included in the workspace by the refresh + operation. Link files and folders are not affected by resource filters, since they need to be created explicitly by + the user.</p> + <p>An "Include" resource filter allows only files and/or folders that match the filter condition to be included in + the workspace during the refresh operation. If multiple "Include" filters exist, the elements included will be those + who match any of the existing "Include" filters.</p> + <p>An "Exclude" resource filter prevent all files and/or folders that match the filter condition to be included in + the workspace during the refresh operation. If multiple "Exclude" filters exist, the elements excluded will be those + who match any of the existing "Exclude" filters.</p> + <p>If both "Exclude" and "Include" resource filters exist in a given folder or project, only files and/or folders + that match any of the "Include" filters <b>and</b> do not match any of the "Exclude" filters will be included in the + workspace.</p> + <p>A resource filter can apply recursively to all children of the project or folder it is created on. In such case, + the resource filter will apply to a sub-folder as if it was created in that sub-folder itself, following the rules + mentioned above.</p> + <p>Resource filters can be created, edited and removed in the <b>File > Properties > Resource > Resources + Filters</b> property page for a project or folder resource.</p> + <p>Resource filters can also be created on a folder before that folder is created in the workspace by selecting the + "Resource Filters..." button in the "Advanced" section of the <b>New Folder wizard</b>.</p> + <h3 class="related">Related concepts</h3><a href="concepts-13.htm">Linked resources</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-97.htm">Creating resource filters</a><br> <a href="../tasks/tasks-49.htm">Viewing resource properties</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-14b.htm">Linked resources</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-14b.htm">Linked resources</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/virtualfolders.htm b/bundles/org.eclipse.platform.doc.user/concepts/virtualfolders.htm index e588a54..68e78f0 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/virtualfolders.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/virtualfolders.htm
@@ -3,33 +3,22 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2010, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> <title>Virtual folders</title> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> </head> <body bgcolor="#FFFFFF"> <h1 class="Head">Virtual folders</h1> - <p>Virtual folders are folders that exist only in the Eclipse - workspace tree, and have no file system location.</p> - <p>By using virtual folders, file and folders can be organized in - a project hierarchy independently of the file system location of - those resources.</p> - <p>Regular file and folder resources can not be created under a - virtual folder, since they need a file system location as their - parent in order to exist in the file system. Only other virtual - folders, or linked resources can be created directly under a - virtual folder.</p> - <h3 class="related">Related concepts</h3><a href= - "concepts-13.htm">Linked resources</a> - <h3 class="related">Related tasks</h3><a href= - "../tasks/tasks-45a.htm">Creating virtual folders</a> - <h3 class="related">Related reference</h3><a href= - "../reference/ref-38.htm">New Folder Wizard</a> + <p>Virtual folders are folders that exist only in the Eclipse workspace tree, and have no file system location.</p> + <p>By using virtual folders, file and folders can be organized in a project hierarchy independently of the file + system location of those resources.</p> + <p>Regular file and folder resources can not be created under a virtual folder, since they need a file system + location as their parent in order to exist in the file system. Only other virtual folders, or linked resources can be + created directly under a virtual folder.</p> + <h3 class="related">Related concepts</h3><a href="concepts-13.htm">Linked resources</a> + <h3 class="related">Related tasks</h3><a href="../tasks/tasks-45a.htm">Creating virtual folders</a> + <h3 class="related">Related reference</h3><a href="../reference/ref-38.htm">New Folder Wizard</a> </body> </html>
diff --git a/bundles/org.eclipse.platform.doc.user/concepts/welcome.htm b/bundles/org.eclipse.platform.doc.user/concepts/welcome.htm index 778f721..7e4f673 100644 --- a/bundles/org.eclipse.platform.doc.user/concepts/welcome.htm +++ b/bundles/org.eclipse.platform.doc.user/concepts/welcome.htm
@@ -3,36 +3,23 @@ <head> <meta name="copyright" content= "Copyright (c) IBM Corporation and others 2000, 2011. 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=utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> - <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" - type="text/css"> - <script language="JavaScript" src= - "PLUGINS_ROOT/org.eclipse.help/livehelp.js" type= - "text/javascript"></script> + <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> + <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> <title>Welcome</title> </head> <body> <h1>Welcome</h1> - <p>The welcome page is the first page you see when you first - launch eclipse. Its purpose is to introduce you to the product. - Welcome content will vary from one Eclipse based product to - another, it typically includes an overview of the product and its - features, tutorials to guide you through some basic tasks, - samples to get you started, etc.</p> - <p>There are many possible forms of welcome, ranging from simple - static text to elaborate extendable multi-page presentations. The - Eclipse platform and platform SDK uses a form known as - <strong>Universal Welcome</strong>, which defines a common page - structure, allowing several products to share the welcome space. - If your product is using the Universal Welcome, you can <a href= - "../tasks/welcome.htm">customize</a> its appearance using the - "customize page" button. Products which use universal welcome - will display a welcome page the first time they are restarted - after new features with welcome content are installed and - highlight the new welcome content.</p> - <h3 class="related">Related tasks</h3><a href= - "../tasks/welcome.htm">Customizing welcome</a> + <p>The welcome page is the first page you see when you first launch eclipse. Its purpose is to introduce you to the + product. Welcome content will vary from one Eclipse based product to another, it typically includes an overview of + the product and its features, tutorials to guide you through some basic tasks, samples to get you started, etc.</p> + <p>There are many possible forms of welcome, ranging from simple static text to elaborate extendable multi-page + presentations. The Eclipse platform and platform SDK uses a form known as <strong>Universal Welcome</strong>, which + defines a common page structure, allowing several products to share the welcome space. If your product is using the + Universal Welcome, you can <a href="../tasks/welcome.htm">customize</a> its appearance using the "customize page" + button. Products which use universal welcome will display a welcome page the first time they are restarted after new + features with welcome content are installed and highlight the new welcome content.</p> + <h3 class="related">Related tasks</h3><a href="../tasks/welcome.htm">Customizing welcome</a> </body> </html>