[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Help text - more of a structure, quite a lot of text

From: Jesper Steen M°ller <jesper_at_selskabet.org>
Date: 2004-12-09 02:42:55 CET

Hi Dev @ Subclipse

Here's another batch of patches for the help system for Subclipse, one
is a patch file, the other is a ZIP file with new images.
Status: The context help and the structure is getting there (if I can
keep up with features!), but the reference pages not all done, and I'm
beginning to think I've been too elaborate in the identification of
topics (one per view, perspective and menu item). Somebody please review.
Also, the images in general need to be updated to the new icon set (nice!).

Log message:
/src/org/tigris/subversion/subclipse/ui/svnproperties/SvnPropertiesView.java
/src/org/tigris/subversion/subclipse/ui/pending/PendingOperationsView.java
/src/org/tigris/subversion/subclipse/ui/annotations/AnnotateView.java
/src/org/tigris/subversion/subclipse/ui/dialogs/SwitchDialog.java
/src/org/tigris/subversion/subclipse/ui/dialogs/BranchTagDialog.java
 * Fixed F1 context help identifier.

/src/org/tigris/subversion/subclipse/ui/IHelpContextIds.java
 * Added new dialog IDs

/plugin.xml
/toc_platformGettingstarted.xml
 * Added TOC file to hook into Eclipse workbench Team section.

/tocreference.xml
/dailywork.xml
 * Reflect the new pages and structure

/help_contexts.xml
 * F1 "infopop" help for the most important dialogs, wizards and views.

/html/*
 * Many text changes and additions.

Index: E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/svnproperties/SvnPropertiesView.java
===================================================================
--- E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/svnproperties/SvnPropertiesView.java (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/svnproperties/SvnPropertiesView.java (working copy)
@@ -51,12 +51,14 @@
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.part.ViewPart;
 import org.tigris.subversion.subclipse.core.IResourceStateChangeListener;
 import org.tigris.subversion.subclipse.core.ISVNLocalResource;
 import org.tigris.subversion.subclipse.core.SVNException;
 import org.tigris.subversion.subclipse.core.SVNProviderPlugin;
 import org.tigris.subversion.subclipse.core.resources.LocalResourceStatus;
+import org.tigris.subversion.subclipse.ui.IHelpContextIds;
 import org.tigris.subversion.subclipse.ui.ISVNUIConstants;
 import org.tigris.subversion.subclipse.ui.Policy;
 import org.tigris.subversion.subclipse.ui.SVNUIPlugin;
@@ -394,7 +396,7 @@
                 tbm.update(false);
         
                 // set F1 help
-// WorkbenchHelp.setHelp(tableViewer.getControl(), IHelpContextIds.CVS_EDITORS_VIEW);
+ WorkbenchHelp.setHelp(tableViewer.getControl(), IHelpContextIds.PROPERTIES_VIEW);
 
                 tableViewer.addDoubleClickListener(new IDoubleClickListener() {
                         public void doubleClick(DoubleClickEvent e) {
Index: E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/pending/PendingOperationsView.java
===================================================================
--- E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/pending/PendingOperationsView.java (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/pending/PendingOperationsView.java (working copy)
@@ -53,6 +53,7 @@
 import org.eclipse.team.internal.ui.Utils;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.part.ResourceTransfer;
 import org.eclipse.ui.part.ViewPart;
 import org.tigris.subversion.subclipse.core.IResourceStateChangeListener;
@@ -62,6 +63,7 @@
 import org.tigris.subversion.subclipse.core.commands.GetStatusCommand;
 import org.tigris.subversion.subclipse.core.resources.LocalResourceStatus;
 import org.tigris.subversion.subclipse.core.resources.SVNWorkspaceRoot;
+import org.tigris.subversion.subclipse.ui.IHelpContextIds;
 import org.tigris.subversion.subclipse.ui.ISVNUIConstants;
 import org.tigris.subversion.subclipse.ui.Policy;
 import org.tigris.subversion.subclipse.ui.SVNUIPlugin;
@@ -392,7 +394,7 @@
         actionBarsMenu.add(toggleModifiedAction);
         
                 // set F1 help
-// WorkbenchHelp.setHelp(tableViewer.getControl(), IHelpContextIds.CVS_EDITORS_VIEW);
+ WorkbenchHelp.setHelp(tableViewer.getControl(), IHelpContextIds.PENDING_OPERATIONS_VIEW);
 
         tableViewer.addDoubleClickListener(new IDoubleClickListener() {
             public void doubleClick(DoubleClickEvent e) {
Index: E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/IHelpContextIds.java
===================================================================
--- E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/IHelpContextIds.java (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/IHelpContextIds.java (working copy)
@@ -26,6 +26,7 @@
         public static final String ADD_TO_SVNIGNORE = PREFIX + "add_to_svnignore_dialog_context"; //$NON-NLS-1$
         public static final String SWITCH_DIALOG = PREFIX + "switch_dialog_context"; //$NON-NLS-1$
         public static final String MERGE_DIALOG = PREFIX + "merge_dialog_context"; //$NON-NLS-1$
+ public static final String BRANCH_TAG_DIALOG = PREFIX + "branch_tag_dialog_context"; //$NON-NLS-1$
         public static final String REVERT_DIALOG = PREFIX + "revert_dialog_context"; //$NON-NLS-1$
                 
         // Wizard Pages
@@ -48,6 +49,9 @@
         public static final String REPOSITORIES_VIEW = PREFIX + "repositories_view_context"; //$NON-NLS-1$
         public static final String RESOURCE_HISTORY_VIEW = PREFIX + "resource_history_view_context"; //$NON-NLS-1$
         public static final String COMPARE_REVISIONS_VIEW = PREFIX + "compare_revision_view_context"; //$NON-NLS-1$
+ public static final String ANNOTATIONS_VIEW = PREFIX + "annotations_view_context"; //$NON-NLS-1$
+ public static final String PROPERTIES_VIEW = PREFIX + "properties_view_context"; //$NON-NLS-1$
+ public static final String PENDING_OPERATIONS_VIEW = PREFIX + "pending_operations_view_context"; //$NON-NLS-1$
 
         // Actions
         public static final String GET_FILE_REVISION_ACTION = PREFIX + "get_file_revision_action_context"; //$NON-NLS-1$
Index: E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/annotations/AnnotateView.java
===================================================================
--- E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/annotations/AnnotateView.java (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/annotations/AnnotateView.java (working copy)
@@ -43,12 +43,14 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.eclipse.ui.internal.registry.EditorDescriptor;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.tigris.subversion.subclipse.core.ISVNRemoteFile;
+import org.tigris.subversion.subclipse.ui.IHelpContextIds;
 import org.tigris.subversion.subclipse.ui.Policy;
 import org.tigris.subversion.subclipse.ui.SVNUIPlugin;
 import org.tigris.subversion.subclipse.ui.history.HistoryView;
@@ -148,7 +150,7 @@
                 viewer.addSelectionChangedListener(this);
                 viewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 
-// WorkbenchHelp.setHelp(viewer.getControl(), IHelpContextIds.ANNOTATE_VIEW);
+ WorkbenchHelp.setHelp(viewer.getControl(), IHelpContextIds.ANNOTATIONS_VIEW);
 
                 top.layout();
                 
Index: E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/dialogs/SwitchDialog.java
===================================================================
--- E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/dialogs/SwitchDialog.java (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/dialogs/SwitchDialog.java (working copy)
@@ -143,6 +143,7 @@
                 headButton.addSelectionListener(listener);
                 revisionButton.addSelectionListener(listener);
 
+ // Add F1 help
                 WorkbenchHelp.setHelp(composite, IHelpContextIds.SWITCH_DIALOG);
                 
                 return composite;
Index: E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/dialogs/BranchTagDialog.java
===================================================================
--- E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/dialogs/BranchTagDialog.java (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/src/org/tigris/subversion/subclipse/ui/dialogs/BranchTagDialog.java (working copy)
@@ -19,9 +19,11 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.help.WorkbenchHelp;
 import org.tigris.subversion.subclipse.core.ISVNLocalResource;
 import org.tigris.subversion.subclipse.core.SVNException;
 import org.tigris.subversion.subclipse.core.resources.SVNWorkspaceRoot;
+import org.tigris.subversion.subclipse.ui.IHelpContextIds;
 import org.tigris.subversion.subclipse.ui.Policy;
 import org.tigris.subversion.subclipse.ui.comments.CommitCommentArea;
 import org.tigris.subversion.svnclientadapter.SVNUrl;
@@ -133,6 +135,9 @@
                 });
                 
                 toUrlText.setFocus();
+
+ // set F1 help
+ WorkbenchHelp.setHelp(composite, IHelpContextIds.BRANCH_TAG_DIALOG);
                 
                 return composite;
         }
Index: E:/JESPER/eclipse30workspace/ui/plugin.xml
===================================================================
--- E:/JESPER/eclipse30workspace/ui/plugin.xml (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/plugin.xml (working copy)
@@ -654,6 +654,8 @@
       </toc>
       <toc
             file="dailywork.xml"/>
+ <toc
+ file="toc_platformGettingstarted.xml"/>
    </extension>
    <extension
          point="org.eclipse.team.ui.synchronizeParticipants">
Index: E:/JESPER/eclipse30workspace/ui/toc_platformGettingstarted.xml
===================================================================
--- E:/JESPER/eclipse30workspace/ui/toc_platformGettingstarted.xml (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/toc_platformGettingstarted.xml (revision 0)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<!--
+ Convention is: Omit prefixes for "SVN" (as in "SVN Resource History View") and don't use
+ menu qualifiers (such as "Team -> Foo". Just put "Foo".) We have enough context.
+
+ This TOC is included with the main content for the Eclipse platform.
+-->
+
+<toc label="Team Subversion tutorial" link_to="../org.eclipse.platform.doc.user/topics_GettingStarted.xml#gs_afterteam">
+ <topic label="Team Subversion tutorial">
+ <topic label="Connecting to a Subversion Repository" href="html/gettingstarted/connecting.html">
+ <topic label="Setting up a Repository" href="html/gettingstarted/settingup.html" />
+ <topic label="Creating a New Repository Location" href="html/gettingstarted/new-location.html" />
+ </topic>
+ <topic label="Importing a Project" href="html/gettingstarted/importing.html"/>
+ <topic label="Checking out a Project" href="html/gettingstarted/checkout.html" />
+ </topic>
+</toc>
Index: E:/JESPER/eclipse30workspace/ui/tocreference.xml
===================================================================
--- E:/JESPER/eclipse30workspace/ui/tocreference.xml (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/tocreference.xml (working copy)
@@ -18,25 +18,34 @@
                 <topic label="Repository View" href="html/reference/svn-repository-view.html" />
         </topic>
         <topic label="Team Menu">
+ <topic label="Synchronize with repository" href="html/reference/team-synchronize.html" />
+ <topic label="Update" href="html/reference/update.html" />
+ <topic label="Commit" href="html/reference/commit.html" />
+ <topic label="Create Patch" href="html/reference/create-patch.html" />
+ <topic label="Apply Patch" href="html/reference/apply-patch.html" />
+ <topic label="Show in Resource History" href="html/reference/show-in-history.html" />
+ <topic label="Show Annotation" href="html/reference/show-annotation.html" />
+ <topic label="Show Properties" href="html/reference/show-properties.html" />
+ <topic label="Set Property" href="html/reference/set-property.html" />
+ <topic label="Add keywords" href="html/reference/add-keywords.html" />
+ <topic label="Add to Version Control" href="html/reference/add.html" />
                 <topic label="Add to svn:ignore" href="html/reference/svn-ignore.html" />
- <topic label="Add to Version Control" href="html/reference/add.html" />
- <topic label="Commit" href="html/reference/commit.html" />
+ <topic label="Branch/Tag" href="html/reference/branch-tag.html" />
+ <topic label="Switch" href="html/reference/switch.html" />
+ <topic label="Merge" href="html/reference/merge.html" />
+ <topic label="Show pending operations" href="html/reference/show-pending-operations.html" />
                 <topic label="Edit conflicts" href="html/reference/edit-conflicts.html" />
+ <topic label="Revert" href="html/reference/revert.html" />
                 <topic label="Mark Resolved" href="html/reference/mark-resolved.html" />
- <topic label="Revert" href="html/reference/revert.html" />
                 <topic label="Share" href="html/reference/share.html" />
- <topic label="Switch" href="html/reference/switch.html" />
- <topic label="Update" href="html/reference/update.html" />
+ <topic label="Disconnect" href="html/reference/disconnect.html" />
         </topic>
         <topic label="Compare Menu" href="html/reference/compare.html" />
         <topic label="Replace Menu" href="html/reference/replace.html" />
         <topic label="Other Actions">
                 <topic label="Check out" href="html/reference/checkout.html" />
- <topic label="Branching" href="html/reference/branching.html" />
                 <topic label="Importing" href="html/reference/import.html" />
- <topic label="Merging" href="html/reference/merging.html" />
                 <topic label="Preferences Pages" href="html/reference/preferences.html" />
- <topic label="Subversion Properties Page" href="html/reference/properties.html" />
- <topic label="Tagging" href="html/reference/tagging.html" />
+ <topic label="Subversion Properties Tab" href="html/reference/properties.html" />
         </topic>
 </toc>
Index: E:/JESPER/eclipse30workspace/ui/dailywork.xml
===================================================================
--- E:/JESPER/eclipse30workspace/ui/dailywork.xml (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/dailywork.xml (working copy)
@@ -11,4 +11,5 @@
         <topic label="Using the Synchronize View" href="html/dailywork/synchronize.html" />
         <topic label="Comparing, QuickDiff and Restoring" href="html/dailywork/diffing.html" />
         <topic label="Creating and Applying Patches" href="html/dailywork/patches.html" />
+ <topic label="Maintaining branches" href="html/dailywork/branches.html" />
 </toc>
Index: E:/JESPER/eclipse30workspace/ui/html/dailywork/workcycle.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/dailywork/workcycle.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/dailywork/workcycle.html (working copy)
@@ -35,7 +35,7 @@
         you do in the working copy. Subclipse does this for you.
 
         <p>One exception from this is adding resources: The new file(s) or folder(s) you create
- must be added to your working copy, using the command "Add to Source Control" found in the
+ must be added to your working copy, using the command Add to Source Control found in the
         "Team" menu available in the context menu for the added resource(s).
         If you do not do this, Subclipse will display a question mark (?) next to the resource,
         meaning that an unknown file is present in your working copy.
@@ -50,11 +50,32 @@
         to do so, e.g. when your changes are stable. You should also always update immediately
         before your commit your work.
         
+ <p>Should an update concern one of the resources that you had modified, Subversion will try to
+ merge those changes. This will work if your changes do not overlap the changes made in the
+ repository, but in case of a conflicting change, the affected resources in your working copy
+ are marked as being conflicted, and some text markings are placed, citing the differences between the
+ repository and your changes. These conflicts can be mended manually, or by using the
+ Edit conflicts command found in the Team menu.
+ If you resolve the changes by editing the text, you need
+ to mark the conflict as resolved.
+ <p>In extreme cases it may be simpler to revert your own changes and start over.
+
         <h2>Committing your changes to the repository</h2>
         
- <p>Once you are pleased with all your changes, it is time to commit them to the repository.
+ <p>Once you are pleased with all your changes, it is time to commit them to the repository.
         Subversion will never let you commit changes that are out-of-sync, and will force you to
- update in the event of a collision (TODO: get new image of this).
+ update in the event of a collision (TODO: get new image of this), but this only covers the cases when the affected
+ resources require updating. However, if a dependent resource (for instance, a program file which is required by your change) is updated,
+ this will not be detected when committing. This is why you need to update first and review your change.
 
+ <hr>
+ <h3>Reference:</h3>
+ <p>Team > Update</p>
+ <p>Team > Commit</p>
+ <p>Team > Add to Version Control</p>
+ <p>Team > Edit conflicts</p>
+ <p>Team > Edit conflicts</p>
+ <p>Team > Mark Resolved</p>
+
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/dailywork/branches.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/dailywork/branches.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/dailywork/branches.html (revision 0)
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+ <title>Maintaining branches</title>
+</head>
+
+<body>
+ <h1>Maintaining branches with Subclipse</h1>
+
+ <p>Like many other SCM systems, Subversion has the notion of working with separate
+ branches of the same project, meaning that different lines of development are isolated
+ in different parts of the repository, but that it is possible to work with sets of changes,
+ including comparing whole branches and copying changes between branches.
+ <p>Typically, the 'main' line of development in a project using the Subversion SCM system is
+ called the <em>trunk</em>, but this is not a technical requirement, it is a convention.
+ <p>In Subversion, tagging and branching is a quite efficient mechanism, which may help you in
+ your day-to-day work.
+
+ <h2>Tagging</h2>
+ <p>Assuming that most of the work in a project is done in the 'trunk' of the repository,
+ you may want to "save the state" of the repository, for instance whenever you release a version
+ of the ensuing product or otherwise reach a milestone. Obviously, you could just write down which
+ revision number was the current one and then you could always use that information to restore
+ the contents of the project, use it for comparison, etc. However, you can also give the tag an
+ explicit name so that it is easier to refer to.
+
+ <p>To compare: In the Subversion command line, this is done simply by copying the repository location
+ (like <tt>http://svn-server/bigproj/trunk/</tt>) on to a new, different location which could
+ (like <tt>http://svn-server/bigproj/tags/client-release-0.99/</tt>) using <tt>svn cp</tt>.
+ <p>By convention, you never commit anything to a tag repository locations, they merely exist pinpoint
+ a specific repository content. There is nothing which stops you from doing this (although Subclipse
+ will warn you), it's just a convention. If you need to make a copy and work in a different direction,
+ use a branch.
+
+ <h2>Branching</h2>
+ <p>TODO - How to make a branch. Hint: it's the same as making a tag.
+
+ <h2>Merging changes</h2>
+ <p>TODO - How to copy the changes from one or more revisions from the trunk to a branch.
+
+ <h2>Backporting</h2>
+ <p>TODO - How to copy the changes from a branch back to the main trunk (hint: It's the same as above)
+
+ <hr>
+ <h3>Reference:</h3>
+ <p>Team > Branch/Tag</p>
+ <p>Team > Switch</p>
+ <p>Team > Merge</p>
+ <p>Team > Commit</p>
+ <p>Team > Edit conflicts</p>
+ <p>Team > Mark Resolved</p>
+
+</body>
+</html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/dailywork/patches.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/dailywork/patches.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/dailywork/patches.html (working copy)
@@ -6,11 +6,32 @@
         <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
         <title>Creating and applying patches</title>
 </head>
-
+<body>
         <h1>Creating and applying patches</h1>
-<body>
+
+ Often, when work on a project is shared between many developers, you need to work with,
+ review and mabye transfer changes that haven't been committed yet. For this, Subclipse
+ offers the functionality to create a patch,
+ which works with Eclipse's build-in apply patch.
+ <p>Patches are representations of changes to a given version of the repository state, and
+ can easily be transferred to other developers, for instance in one developer (who doesn't have
+ commit access) needs to submit a change to someone who can then review and commit it.
+
+ <h2>Creating a patch</h2>
+
+ Select the resource and activate the funciton. TODO: Step by step - or put that in the reference part?
+
+ <h2>Applying a patch</h2>
+
+ Select the activate the funciton and find the patch file.
+ TODO: Step by step - or put that in the reference part?
 
+ <h3>Reference:</h3>
+ <p>Team > Create patch...</p>
+ <p>Team > Apply patch...</p>
 
+ <h3>See also:</h3>
+ <p>From the Eclipse CVS documentation: Working with patches</p>
 
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/dailywork/synchronize.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/dailywork/synchronize.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/dailywork/synchronize.html (working copy)
@@ -20,6 +20,9 @@
         <p>In short, the synchronize view offers a different way of updating and commiting
         your work, and does so in a manner which <em>may</em> be more familar to you
         as an Eclipse user.
-
+ <hr>
+ <h3>Reference:</h3>
+ <p>Team > Synchronize</p>
+
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/images/resolve-conflicts.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: E:/JESPER/eclipse30workspace/ui/html/images/resolve-conflicts.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: E:/JESPER/eclipse30workspace/ui/html/images/create-remote-folder.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: E:/JESPER/eclipse30workspace/ui/html/images/create-remote-folder.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: E:/JESPER/eclipse30workspace/ui/html/images/move-or-rename-resource.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: E:/JESPER/eclipse30workspace/ui/html/images/move-or-rename-resource.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: E:/JESPER/eclipse30workspace/ui/html/faq/glossary.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/faq/glossary.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/faq/glossary.html (revision 0)
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+ <title>Subclipse - Glossary</title>
+</head>
+
+<body>
+<h1>Glossary</h1>
+
+<table border="0">
+<thead>
+ <tr><th>Term</th><th>Definition</th></tr>
+</thead>
+<tbody>
+ <tr> Working copy (or Workspace)<td></td><td> TODO - DEFINITION </td></tr>
+ <tr> Eclipse Team Support<td></td><td> TODO - DEFINITION </td></tr>
+ <tr> 'svn' command line <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> Repository <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> trunk <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> branch <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> tag <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> SVN <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> CVS <td></td><td> TODO - DEFINITION </td></tr>
+ <tr> change set <td></td><td> TODO - DEFINITION </td></tr>
+</tbody>
+</table>
+</body>
+</html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/faq/faq.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/faq/faq.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/faq/faq.html (working copy)
@@ -10,81 +10,7 @@
 <body>
 <h3>FAQ</h3>
 
-
- <p><strong>What version of Eclipse does Subclipse support
- ?</strong></p>
-
- <p>The current version of Subclipse supports both Eclipse 2.1.x
- and Eclipse 3.0 Line</p>
-
- <p><strong>Why is Subclipse so particular about what version of
- Subclipse and Berkeley DB is used?</strong></p>
-
- <p>Subclipse uses a JNI interface ( <a href=
- "http://svn.collab.net/repos/svn/trunk/subversion/bindings/java/javahl/">
- javahl</a>) to Subversion. The binaries that come with Subclipse
- are linked with particular versions when compiled. We have also
- been developing a way to interface with the command line client
- (Windows-&gt;Preferences-&gt;Team-&gt;SVN)</p>
-
- <p>Keep in mind, you'll have best results with a libsvnjavahl
- built with your own system.</p>
-
- <p><strong>So if Subclipse is tied to a Subversion version, will
- it be updated when a new version of Subversion comes
- out?</strong></p>
-
- <p>Yes, we will try to update Subclipse when a new version of
- Subversion comes out</p>
-
- <p><strong>Why does Subclipse only support Windows?</strong></p>
-
- <p>Subclipse supports Windows, Linux, and OSX currently. If your
- favorite platform is missing, build us a libsvnjavahl library for
- it, and we'll add it.</p>
-
- <p><strong>Will the plugin work with WSAD?</strong></p>
-
- <p>Only WSAD 5.1 and above as this is based on Eclipse 2.1 which is a minimum requirement for Subclipse</p>
-
- <p><strong>Do I need Subversion installed to use
- Subclipse?</strong></p>
-
- <p>Not if you use Windows. If you don't use Windows, you
- <em>do</em> need Subversion and its dependencies installed.
- Currently, the jni bits (libsvnjavahl) link dynamically to the
- Subversion sources, so you may have problems if your installation
- of Subversion is out of date, or compiled agains something other
- than what we compiled against. As mentioned above, if you are
- having problems with Subclipse, we recommend rolling your own
- libsvnjavl. This is particularly true on OSX, if your Subversion
- isn't built with fink.</p>
-
- <p>To do this, just</p>
- <pre>
-make javahl &amp;&amp; make install-javahl
-</pre>
- <p>when you are making your Subversion build, and replace the
- libsvnjavahl we ship.</p>
-
- <p><strong>What access methods does Subclipse
- support?</strong></p>
-
- <p>Since Subclipse just calls out to Subversion, Subclipse can
- use any access method your command-line Subversion client can
- understand.</p>
-
- <p><strong>How do I get Subversion to accept my self-signed
- certificate?</strong><?p>
- </p>
-
- <p>There is currently no interface for this in Subclipse, but you
- can just</p>
- <pre>
-svn list https://your/repo
-</pre>
- <p>and opt to accept the certificate permanently. From then on,
- subclipse will also accept the certificate.</p>
-
+ TODO - sync with the FAQ on subclipse.tigris.org which needs updating, anyway.
+
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/faq/subversion-mapping.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/faq/subversion-mapping.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/faq/subversion-mapping.html (working copy)
@@ -10,7 +10,7 @@
 <p>In the following, we'll examine how Subclipse compares with the
 "original" Subversion command-line client.</p>
 <p>
-<table border="1" cellspacing="0" cellpadding="2">
+<table border="0" cellspacing="0" cellpadding="2">
   <thead> <tr>
     <th><tt>svn</tt> command</th>
     <th>Subclipse Feature</th>
@@ -19,9 +19,9 @@
   </thead> <tbody>
     <tr>
       <td><tt>add</tt></td>
- <td>Team -> Add</td>
+ <td>Team > Add to Version Control</td>
       <td>Just like with the command line, you need to add a resource
-to Subversion when you create it.</td>
+to Subversion after you create it.</td>
     </tr>
     <tr>
       <td><tt>blame (praise, annotate, ann)</tt></td>
@@ -36,24 +36,23 @@
     </tr>
     <tr>
       <td><tt>checkout (co)</tt></td>
- <td> Check out and <a
+ <td>Team > Check out and <a
  href="../reference/svn-repository-view.html">SVN Repository View</a> </td>
       <td></td>
     </tr>
     <tr>
       <td><tt>cleanup</tt></td>
- <td>N/A</td>
- <td>This is hopefully not required in Subclipse. </td>
+ <td>Team > Cleanup</td>
+ <td></td>
     </tr>
     <tr>
       <td><tt>commit (ci)</tt></td>
- <td>Commit</td>
+ <td>Team > Commit</td>
       <td></td>
     </tr>
     <tr>
       <td><tt>copy (cp)</tt></td>
- <td>Tagging and <a
- href="../reference/branching.html">Branching</a></td>
+ <td>Team > Branch/Tag</td>
       <td></td>
     </tr>
     <tr>
@@ -66,7 +65,7 @@
     <tr>
       <td><tt>diff (di)</tt></td>
       <td>Compare menu, and <a
- href="../reference/generate-patch.html">Team -&gt; Generate Patch</a>.</td>
+ href="../reference/generate-patch.html">Team > Generate Patch</a>.</td>
       <td></td>
     </tr>
     <tr>
@@ -76,7 +75,7 @@
     </tr>
     <tr>
       <td><tt>import</tt></td>
- <td>Team -> Share...,
+ <td>Team > Share...,
       <a href="../gettingstarted/importing.html">Importing a project
       </a></td>
       <td>This doesn't work quite like with the command line, as you
@@ -101,14 +100,14 @@
     </tr>
     <tr>
       <td><tt>merge</tt></td>
- <td>Merging</td>
- <td>This is not implemented yet.</td>
+ <td>Merge</td>
+ <td></td>
     </tr>
     <tr>
       <td><tt>mkdir</tt></td>
       <td><a href="../reference/svn-repository-view.html">SVN
 Repository View</a></td>
- <td>From a repository node, you can right-click and choose New -> New Remote Folder</td>
+ <td>From a repository node, you can right-click and choose New > New Remote Folder</td>
     </tr>
     <tr>
       <td><tt>move (mv, rename, ren)</tt></td>
@@ -123,18 +122,18 @@
       <td><tt>propdel</tt>, <tt>propedit</tt>, <tt>propget</tt>, <tt>proplist</tt>,
 and <tt>propset</tt></td>
       <td>SVN Properties View, <a href="../reference/svn-ignore.html">Team
--&gt; Add to svn:ignore</a>, and Team -> Add Keywords.</td>
+> Add to svn:ignore</a>, and Team > Add Keywords.</td>
       <td></td>
     </tr>
     <tr>
       <td><tt>resolved</tt></td>
- <td>Team -> Mark Resolved</td>
- <td>Use this after you resolve merge conflicts, mabye using Eclipse's Merge Confict editor</td>
+ <td>Team > Mark Resolved</td>
+ <td>Use this after you resolve merge conflicts, mabye using Team > Edit Conflicts</td>
     </tr>
     <tr>
       <td><tt>revert</tt></td>
- <td> Team -> Revert</td>
- <td>This also works on several resources. But be careful, as it will work recursively on folders.</td>
+ <td> Team > Revert</td>
+ <td>This also works if you select several resources. But be careful, as it will work recursively on folders.</td>
     </tr>
     <tr>
       <td><tt>status (stat, st)</tt></td>
@@ -144,12 +143,12 @@
     </tr>
     <tr>
       <td><tt>switch (sw)</tt></td>
- <td>Team -> Switch </td>
+ <td>Team > Switch </td>
       <td></td>
     </tr>
     <tr>
       <td><tt>update (up)</tt></td>
- <td> Team -> Update, <a
+ <td> Team > Update, <a
  href="../dailywork/workcycle.html">Tasks: Edit, Update, Commit</a></td>
       <td></td>
     </tr>
@@ -164,148 +163,3 @@
 </p>
 </body>
 </html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
- <title>Subclipse for Subversion Users</title>
-</head>
-
-<body>
-<h2>For Subversion users</h2>
-<p>In the following, we'll examine how Subclipse compares with the "original"
-Subversion command-line client.
-<p>TODO: These links are mostly dead/not written yet.
-
-<table border='0'>
-<tr>
- <th><tt>svn</tt> command</th> <th>Subclipse Feature</th>
-</tr>
-<tr>
- <td><tt>svn add</tt></td> <td>Add</td>
-</tr>
-
-<tr>
- <td><tt>blame (praise, annotate, ann)</tt></td><td>
- SVN Annotations View</td>
-</tr>
-
-<tr>
- <td><tt>cat</tt></td> <td>
- SVN Repository View</td>
-</tr>
-
-<tr>
- <td><tt>checkout (co)</tt></td>
- <td>
- Check out and
- SVN Repository View</td>
-</tr>
-
-<tr>
- <td><tt>cleanup</tt></td><td>N/A</td>
-</tr>
-
-<tr>
- <td><tt>commit (ci)</tt></td> <td>
- Commit</td>
-</tr>
-
-<tr>
- <td><tt>copy (cp)</tt></td> <td>
- Tagging and
- Branching</td>
-</tr>
-
-<tr>
- <td><tt>delete (del, remove, rm)</td> <td>
- Eclipse Refactoring hook.</td></tr>
-</tr>
-
-<tr>
- <td><tt>diff (di)</tt></td>
- <td>
- Compare, and also Generate Patch.</td>
-</tr>
-
-<tr>
- <td><tt>export</tt></td> <td>
- Not applicable, I guess.</td>
-</tr>
-
-<tr>
- <td><tt>import</tt></td> <td>
- Importing</td>
-</tr>
-
-<tr>
- <td><tt>info</tt></td> <td>
- Found on the resource's property page.</td>
-</tr>
-
-<tr>
- <td><tt>list (ls)</tt></td> <td>
- SVN Repository View</td>
-</tr>
-
-<tr>
- <td><tt>log</tt></td> <td>
- Resource History</td>
-</tr>
-
-<tr>
- <td><tt>merge</tt></td> <td>
- Merging</td>
-</tr>
-
-<tr>
- <td><tt>mkdir</tt></td> <td>
- SVN Repository View</td>
-</tr>
-
-<tr>
- <td><tt>move (mv, rename, ren)</tt></td> <td>
- Eclipse Refactoring hook.</td>
-</tr>
-
-<tr>
- <td><tt>propdel, propedit, propget, proplist, and propset</tt></td> <td>
- SVN Properties View and SVN Ignore</td>
-</tr>
-
-<tr>
- <td><tt>resolved</tt></td> <td>
- Revert</td>
-</tr>
-
-<tr>
- <td><tt>revert</tt></td> <td>
- Mark Resolved</td>
-</tr>
-
-<tr>
- <td><tt>status (stat, st)</tt></td> <td>
- Pending Operations
- Preferences</td>
-</tr>
-
-<tr>
- <td><tt>switch (sw)</tt></td> <td>
- Not implemented yet.</td>
-</tr>
-
-<tr>
- <td><tt>update (up)</tt></td> <td>
- Update
- Merging</td>
-</tr>
-
-</table>
-
-<h3>Stuff not mentioned anywhere</h3>
- SVN Console
-
-</body>
-</html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/gettingstarted/new-location.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/gettingstarted/new-location.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/gettingstarted/new-location.html (working copy)
@@ -10,7 +10,7 @@
 <body>
 <h1>Creating a new Repository Location</h1>
 To be able to work with a repository you will need to create a new repository location in the SVN Repository View.
-Invoke the wizard by right clicking inside the view and select <b>New->Repository Location...</b>
+Invoke the wizard by right clicking inside the view and select <b>New>Repository Location...</b>
 <p align="center"><img src="../images/new-location.jpg"/></p>
 <p>
 This will bring up a dialog that will prompt you for a repository location URL, username and password.
Index: E:/JESPER/eclipse30workspace/ui/html/gettingstarted/checkout.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/gettingstarted/checkout.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/gettingstarted/checkout.html (working copy)
@@ -19,6 +19,7 @@
 <p>Once the project is checked out, you can switch to a different perspective and start working.
 The Team menu will automatically use the Subversion repository location for comparisons, updates, etc.
 </p>
+<hr>
 <h3>Reference:</h3>
 <p>SVN Repository Exploring Perspective</p>
 </body>
Index: E:/JESPER/eclipse30workspace/ui/html/gettingstarted/connecting.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/gettingstarted/connecting.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/gettingstarted/connecting.html (working copy)
@@ -23,7 +23,7 @@
 <p>If you are already working with a working copy, you still need to Eclipse know that
 the Subversion working-copy housekeeping is already in place. You can do this by
 select the project you want to import and right click to select
-<b>Team->Share Project...</b>.</p>
+<b>Team > Share Project...</b>.</p>
 <h3>Reference:</h3>
 <p>SVN Repository Exploring Perspective</p>
 </body>
Index: E:/JESPER/eclipse30workspace/ui/html/gettingstarted/importing.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/gettingstarted/importing.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/gettingstarted/importing.html (working copy)
@@ -11,20 +11,20 @@
 <h1>Import a Project into a Subversion Repository</h1>
 <p>
 Create a simple project that contains a few files so they can be stored in the Subversion Repository.
-A good test is to create a sample plug-in project by selecting <b>File->New->Project..</b> and <b>Plug-in Development->Plug-in Project</b>
+A good test is to create a sample plug-in project by selecting <b>File>New>Project..</b> and <b>Plug-in Development>Plug-in Project</b>
 Give the project a name and click through to finish on the wizard.
 </p>
 <p>
-Next select the project you want to import and right click to select <b>Team->Share Project...</b>.
+Next select the project you want to import and right click to select <b>Team > Share Project...</b>.
 This will bring the share project wizard dialog. Select <b>SVN</b> as the repository type and click <b>next</b>.
 Then use the <b>existing repository location</b> and click <b>next</b> again. Select <b>Use project name as module name</b> and click <b>finish</b>
 This will make a remote directory in the repository and checkout that into the project to create all the .svn metadata directories
 </p>
 <p>
 You should now see the project decorated with the repository URL
-Then select the lop level files and directories to be added and <b>Right Click->Team->Add to Version Control</b>.
+Then select the lop level files and directories to be added and <b>Right Click>Team > Add to Version Control</b>.
 You should see the <b>*</b> decoration to indicate an added but not commited resource.
-With the same resources still selected <b>Right click->Team->Commit..</b>.
+With the same resources still selected <b>Right click>Team > Commit..</b>.
 You will prompted with a dialog that you can enter a commit comment (eg initial commit) and click <b>OK</b>
 The project has now been imported into the Subversion repository!
 </p>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/tagging.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/tagging.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/tagging.html (working copy)
@@ -1,19 +0,0 @@
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Tagging</title>
-</head>
-
-<body>
-
-<h1>Tagging</h1>
-
-<p>Text for Tagging is missing</p>
-
-</body>
-</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/update.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/update.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/update.html (working copy)
@@ -6,14 +6,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Update</title>
+<title>Team > Update</title>
 </head>
 
 <body>
 
-<h1>Team -> Update</h1>
+<h1>Team > Update</h1>
 
-<p>Text for Team -> Update is missing</p>
-
+<p>This actions contacts the remote repository to check for new versions of the resource (recursively, if a folder is selected).</p>
+<p>In case a conflict is found, you'll have to revert your changes or
+edit and resolve the conflict. You may use Eclipse's build in conflict editor
+to sort things out.</p>
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/show-in-history.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/show-in-history.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/show-in-history.html (revision 0)
@@ -0,0 +1,19 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Show Annotation (Team Menu)</title>
+</head>
+
+<body>
+
+<h1>Show in Resource History (Team Menu)</h1>
+
+<p>This actions open the SVN Resource History View (if not already open) and displays the history of the currently selected resource.</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/svn-ignore.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/svn-ignore.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/svn-ignore.html (working copy)
@@ -6,14 +6,25 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Add to svn:ignore</title>
+<title>Team > Add to svn:ignore</title>
 </head>
 
 <body>
 
-<h1>Team -> Add to svn:ignore</h1>
+<h1>Team > Add to svn:ignore</h1>
 
-<p>Text for Team -> Add to svn:ignore is missing</p>
-
+<p>You can choose to let Subversion ignore certain resources (files or folders) in your working copy, such
+as derived files (e.g. .class files compiled from Java source) and other files that do not belong
+under version control. By ignoring them, Subclipse doesn't mark them as "unknown", and they no longer appear in
+the Synchronize view.
+<p>To ignore specific resources, select the file(s) and/or folder(s) you wish to ignore, and choose <b>Add to svn:ignore</b>
+in the Team menu. This will bring up a selection where you may choose how to ignore the file:
+<ul>
+<li>By name (only the selected resource)</li>
+<li>By wildcard extension (based on the selected resources)</li>
+<li>By a custom pattern that you enter (e.g. <tt>log*.txt</tt>)</li>
+</ul>
+<p>When in doubt, choose the first option ("By resource name"), since that will never ignore a resource that wasn't explicitly selected and ignored.
+<p>TODO: Add a nice pivture.</p>
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/generate-patch.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/generate-patch.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/generate-patch.html (working copy)
@@ -6,14 +6,14 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Generate Patch</title>
+<title>Team > Generate Patch</title>
 </head>
 
 <body>
 
-<h1>Team -> Generate Patch</h1>
+<h1>Team > Generate Patch</h1>
 
-<p>Text for Team -> Generate Patch is missing</p>
+<p>Text for Team > Generate Patch is missing</p>
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/merging.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/merging.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/merging.html (working copy)
@@ -1,19 +0,0 @@
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Merging</title>
-</head>
-
-<body>
-
-<h1>Merging</h1>
-
-<p>Text for Merging is missing</p>
-
-</body>
-</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/commit.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/commit.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/commit.html (working copy)
@@ -6,14 +6,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Commit</title>
+<title>Team > Commit</title>
 </head>
 
 <body>
 
-<h1>Team -> Commit</h1>
+<h1>Team > Commit</h1>
 
-<p>Text for Team -> Commit is missing</p>
+<p>Text for Team > Commit is missing</p>
 
+<p>TODO: Evaluate if this is covered in the "Edit, Update, Commit"-cycle</p>
+
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/add.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/add.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/add.html (working copy)
@@ -6,14 +6,30 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Add To Version Control</title>
+<title>Team > Add To Version Control</title>
 </head>
 
 <body>
 
-<h1>Team -> Add To Version Control</h1>
+<h1>Team > Add To Version Control</h1>
 
-<p>Text for Team -> Add To Version Control is missing</p>
+<p>When you share a project for the first time, or when you add or import new
+resources to a project, you need to tell Subversion to keep it under version control.
+To do this, use this command.</p>
 
+<h2>Using this command</h2>
+<p>First, find and select the resource(s) that you want to add. These will typically be decorated by a little question mark (TODO: image)
+in the Navigator view.
+You should only select resources currently not under Subversion's control, or this command will not be available.
+Then, select "Add To Version Control" from the Team menu. The decoration will change to a tidy blue plus (TODO: show it).
+<p>Note: If the resources parent folder is not under version control either, it will be added as well (all the way up to the
+project root, as needed).
+<p>Now your resource is scheduled for addition to the repository, and committing it will make it accessible to the other Team members.
+<h2>If something goes wrong...</h2>
+If you add something you didn't want to add anyway, don't panic. You can always undo (revert) your changes, by
+selecting Revert in the Team menu. This is often prefferred over deleting the resource, since
+if is only the 'added'-state that you revert, not the creation of the file itself. In other words, the file isn't deleted.
+<p>TODO: Review if this should be moved to the tasks, since it does not contain any visible user interface. </p>
+
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/disconnect.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/disconnect.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/disconnect.html (revision 0)
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Disconnect...</title>
+</head>
+
+<body>
+
+<h1>Team > Disconnect...</h1>
+
+<p>If you want to work completely independent of version control, you may disconnect your local copy of the project
+from the repository. You can only disconnect entire projects, not individual folders or files.</p>
+
+<p>When disconnecting, you can choose to keep the SVN working copy information around (<tt>.svn.</tt> folders).
+If you do this, you can reconnect to the remote repository at a later timer, using Team > Share....
+
+<p>If you choose to delete the <tt>.svn</tt> folders, your project will be completely disconnected from Subversion.
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/add-keywords.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/add-keywords.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/add-keywords.html (working copy)
@@ -4,14 +4,19 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Add Keywords</title>
+<title>Team > Add Keywords</title>
 </head>
 
 <body>
 
-<h1>Team -> Add Keywords</h1>
+<h1>Team > Add Keywords</h1>
 
 <p>Keywords in Subversion are used to embed versioning information into text files under version
-control.</p>
+control. These keywords like (for instance, 'Id'), are expanded for resources that are marked as
+using them, and this is what the "Add keywords" action does.</p>
+<p>First, the user selects the resources that need keywords added - this may be a folder in which case
+all the contained (child) resources are also affected. Second, activate "Add Keywords" and choose
+which keywords to use.
+<p>To use the keyword in a (text) file, enclose it in $-signs, as in <tt>$Id</tt>.
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/checkout.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/checkout.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/checkout.html (working copy)
@@ -13,7 +13,7 @@
 
 <h1>Check out</h1>
 
-<p>Text for Check out is missing</p>
+<p>Review if this is sufficiently coveres in the "Getting started" steps.</p>
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/revert.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/revert.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/revert.html (working copy)
@@ -6,14 +6,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Revert</title>
+<title>Team > Revert</title>
 </head>
 
 <body>
 
-<h1>Team -> Revert</h1>
+<h1>Team > Revert</h1>
 
-<p>Text for Team -> Revert is missing</p>
+<p>Whenever you have something that you wish you hadn't, consider choosing Revert from the Team menu.
+In will revert the chosen resources to the pristine state, i.e. without your changes.</p>
+<p>Note: Reverting changes can cause data loss, since it inself cannot be reverted unless you took some kind of backup copy yourself.
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/svn-properties-view.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/svn-properties-view.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/svn-properties-view.html (working copy)
@@ -13,7 +13,10 @@
 
 <h1>SVN Properties View</h1>
 
-<p>Text for SVN Properties View is missing</p>
+<p>In the SVN Properties View, you can create, edit, add, remove Subversion properties for the selected resource.
+</p>
+<p>The properties are versioned data themselved - if you change a property, you need to commit it before other
+developers can see it.
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/show-properties.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/show-properties.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/show-properties.html (revision 0)
@@ -0,0 +1,19 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Show properties</title>
+</head>
+
+<body>
+
+<h1>Team > Show properties</h1>
+
+<p>Text for Team > Show properties is missing</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/replace.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/replace.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/replace.html (revision 0)
@@ -0,0 +1,19 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Replace menu</title>
+</head>
+
+<body>
+
+<h1>Replace menu</h1>
+
+<p>Text for Replace menu is missing</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/set-property.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/set-property.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/set-property.html (revision 0)
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Set property...</title>
+</head>
+
+<body>
+
+<h1>Team > Set property...</h1>
+
+<p>Sets a Subversion property on selected resource(s). A property must be named, and its value can be entered directly into the
+dialog box, or read from a file.
+
+<p>When setting properties on folders, you can apply the resource recursively.</p>
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/apply-patch.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/apply-patch.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/apply-patch.html (revision 0)
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Apply Patch...</title>
+</head>
+<body>
+
+<h1>Team > Apply Patch...</h1>
+
+<p>This command (supplied by Eclipse, not part of Subclipse) applies a patch from a file in the local file system.
+The expected file format is compatible with that of Subversion (and therefore Subclipse), or rather, the format
+generated by the <tt>svn diff</tt> command is "unidiff" (by default) which is accepted by this command.</p>
+
+<h3>See also:</h3>
+<p>From the Eclipse CVS documentation: Working with patches</p>
+
+
+<p>TODO: Review if this should be removed altogether, since it is more or less covered in "patches.html" in the "Tasks"-section.</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/svn-repository.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/svn-repository.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/svn-repository.html (working copy)
@@ -4,19 +4,19 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
         <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
- <title>The SVN Repository Exploring Perspective</title>
+ <title>SVN Repository Exploring Perspective</title>
 </head>
 
 <body>
 <h1>SVN Repository Exploring Perspective</h1>
 Subclipse extends Eclipse with a perspective for working with Subversion repositories.
-To activate this perspective, choose <em>Windwow</em> -> <em>Open Perspective...</em>
--> <em>Other...</em>, and select "SVN Repository Exploring". This will open the
+To activate this perspective, choose <em>Windwow</em> > <em>Open Perspective...</em>
+> <em>Other...</em>, and select "SVN Repository Exploring". This will open the
 perspective:
 <br>
 <p align="center"><img src="../images/svn-explorer-perspective.jpg"/></p>
 
 <h2>Views and actions</h2>
-
+<p>TODO: More to write here.
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/reference/show-pending-operations.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/show-pending-operations.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/show-pending-operations.html (revision 0)
@@ -0,0 +1,19 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Show pending operations</title>
+</head>
+
+<body>
+
+<h1>Team > Show pending operations</h1>
+
+<p>Text for Team > Show pending operations is missing</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/compare.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/compare.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/compare.html (working copy)
@@ -6,14 +6,27 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Compare menu</title>
+<title>Compare With menu</title>
 </head>
 
 <body>
 
-<h1>Compare menu</h1>
+<h1>Compare With menu</h1>
 
-<p>Text for Compare menu is missing</p>
+<p>The compare menu normally allows you to compare with local history (Eclipse's own version of saved files during a session),
+or to compare two selected resources.
+<p>However, once a project is connected to a Subversion repository, a few new entries are present in the Compare menu:</p>
+<ul>
+ <li><b>Compare With > Base Revision</b> - this will compare the selected resource with the "pristine" version hidden away in the
+ project's working copy. This happens without contacting the repository.</li>
+ <li><b>Compare With > Latest From Repository</b> - this will compare the selected resource with the latest version
+ of this resource at the same location in the repository. This requires a lookup to see what the latest version is.
+ </li>
+ <li><b>Compare With > Previous From Repository</b> - TODO. this will compare the selected resource with the latest version
+ of this resource at the same location in the repository. This requires a lookup to see what the latest version is.
+ </li>
+</ul>
+<p>These comparisons are very useful for reviewing the contents of you changes before you commit them.
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/cleanup.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/cleanup.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/cleanup.html (revision 0)
@@ -0,0 +1,23 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Cleanup</title>
+</head>
+
+<body>
+
+<h1>Team > Cleanup</h1>
+
+<p>This command is used when a working copy is locked because of an operation which could not be finished. By choosing Cleanup on
+the folder in question, the operation in question is finalized, and leaves the working copy in a useful state.</p>
+
+<p>TODO: This is hard to explain for normal usage.</p>
+
+</body>
+</html>
+
Index: E:/JESPER/eclipse30workspace/ui/html/reference/show-annotation.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/show-annotation.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/show-annotation.html (revision 0)
@@ -0,0 +1,20 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Show Annotation (Team Menu)</title>
+</head>
+
+<body>
+
+<h1>Show Annotation (Team Menu)</h1>
+
+<p>This actions switches to the Subversion Repository Browsing perspective and
+shows the pristine version of the selected resource in the annotation view.</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/branching.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/branching.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/branching.html (working copy)
@@ -1,19 +0,0 @@
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Branching</title>
-</head>
-
-<body>
-
-<h1>Branching</h1>
-
-<p>Text for Branching is missing</p>
-
-</body>
-</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/svn-repository-view.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/svn-repository-view.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/svn-repository-view.html (working copy)
@@ -13,7 +13,8 @@
 
 <h1>SVN Repository View</h1>
 
-<p>Text for SVN Repository View is missing</p>
+<p>This view shows the repository locations that Subclipse knows about. You can perform a number of actions on the repositories
+directly, such as moving and renaming resources, creating directories, checking out a project, etc./p>
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/create-patch.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/create-patch.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/create-patch.html (revision 0)
@@ -0,0 +1,24 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+<title>Team > Create Patch...</title>
+</head>
+
+<body>
+
+<h1>Team > Create Patch...</h1>
+
+<p>This wizard lets you create a patch in Subversion's default "unidiff" format.
+You get to choose which of the affected resources should go into the patch.
+<p>Note that binary changes are never shown in the patch.
+
+<h3>See also:</h3>
+<p>From the Eclipse CVS documentation: Working with patches</p>
+
+</body>
+</html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/switch.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/switch.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/switch.html (working copy)
@@ -6,14 +6,14 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Switch</title>
+<title>Team > Switch</title>
 </head>
 
 <body>
 
-<h1>Team -> Switch</h1>
+<h1>Team > Switch</h1>
 
-<p>Text for Team -> Switch is missing</p>
+<p>Text for Team > Switch is missing</p>
 
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/html/reference/share.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/share.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/share.html (working copy)
@@ -4,16 +4,18 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
         <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
- <title>SVN Resource History View</title>
+ <title>Team > Share</title>
 </head>
 
 <body>
 
-<h1>SVN Resource History View</h1>
+<h1>Team > Share</h1>
 
-<p>This view shows the history of a resource, as it exists in the Subversion repository.
-In Subversion, both files and directories are versioned and have a history, this is in
-contrast to for instance
+<p>Sharing a project in a Subversion repository works by connecting to an existing repository
+(by using a new or existing location from the SVN Repository View).
+The project is then imported into the repository at that location.
+<p>Note: If the project was already a Subversion working copy then the repository information is
+read, then no further action need happen - the Share operation marks the project as under version control.
 
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/reference/branch-tag.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/branch-tag.html (revision 1136)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/branch-tag.html (working copy)
@@ -13,7 +13,8 @@
 
 <h1>Branching</h1>
 
-<p>Text for Branching is missing</p>
-
+<p>TODO: Review if this should be moved to the tasks ("branches.html"), which is the natural place to put it.</p>
 </body>
 </html>
+
+
Index: E:/JESPER/eclipse30workspace/ui/html/reference/edit-conflicts.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/edit-conflicts.html (revision 0)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/edit-conflicts.html (revision 0)
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+ <title>Edit Conflicts (Team menu)</title>
+</head>
+
+<body>
+
+<h1>Edit Conflicts (Team menu)</h1>
+
+<p>Uses the graphical editor build into Eclipse to resolve the conflicts between your working copy and the remote repository contents.
+</body>
+</html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/reference/history-view.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/history-view.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/history-view.html (working copy)
@@ -12,8 +12,19 @@
 <h1>SVN Resource History View</h1>
 
 <p>This view shows the history of a resource, as it exists in the Subversion repository.
-In Subversion, both files and directories are versioned and have a history, this is in
-contrast to for instance
-
+In Subversion, both files and directories are versioned and have a history.
+<p>If the resource selected is in a working copy, the revision currently checked out is highlighted (in boldface).
+<p>The view itself consists of three areas:
+<ul>
+<li>The revision table - showing revision numbers, date/time of revision, the name of the committer, as well as the first line of the commit message. You can click on any revision to show its details.</li>
+<li>The commit message for the selected revision.</li>
+<li>The list of resources affected by this revision (that is: modified, added, deleted or changed properties)</li>
+</ul>
+<p>The SVN Resource History View can be linked with the current editor or not. If linked, the contents changes when you switch
+which resource is being edited. If not linked, you must manually ask to show the selected resource.
+<p>
+<em>Note</em>: Showing the history may be a longer running operation since it must retrieve the history from the repository.
+If working with a remote repository on a WAN or on the internet, you might want to turn off the "Link with editor" button, or
+explicitly close or hide the view when switching between resources in the editor.
 </body>
 </html>
\ No newline at end of file
Index: E:/JESPER/eclipse30workspace/ui/html/reference/mark-resolved.html
===================================================================
--- E:/JESPER/eclipse30workspace/ui/html/reference/mark-resolved.html (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/html/reference/mark-resolved.html (working copy)
@@ -6,14 +6,14 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>Team -> Mark Resolved</title>
+<title>Team > Mark Resolved</title>
 </head>
 
 <body>
 
-<h1>Team -> Mark Resolved</h1>
+<h1>Team > Mark Resolved</h1>
 
-<p>Text for Team -> Mark Resolved is missing</p>
-
+<p>Text for Team > Mark Resolved is missing</p>
+<p>TODO: Is this already covered in "Workcycle"</p>
 </body>
 </html>
Index: E:/JESPER/eclipse30workspace/ui/help_contexts.xml
===================================================================
--- E:/JESPER/eclipse30workspace/ui/help_contexts.xml (revision 1150)
+++ E:/JESPER/eclipse30workspace/ui/help_contexts.xml (working copy)
@@ -12,67 +12,130 @@
 -->
 
 <contexts>
+
+ <!-- Views -->
+
         <context id="resource_history_view_context">
- <description>This view shows you the different versions of the selected
-file or folder as they are found in the Subversion repository.</description>
- <topic href="html/dailywork/diffing.html"
- label="Tasks: Comparing, QuickDiff and Restoring" />
- <topic href="html/reference/history-view.html"
- label="Reference: SVN Resource History View" />
+ <description>This view shows you the different versions of the selected file or folder as they are found in the Subversion repository.</description>
+ <topic href="html/dailywork/diffing.html" label="Tasks: Comparing, QuickDiff and Restoring" />
+ <topic href="html/reference/history-view.html" label="Reference: SVN Resource History View" />
+ <topic href="html/reference/show-in-history.html" label="Reference: Team -> Show in Resource History"/>
         </context>
 
+ <context id="console_view_context">
+ <description>The Subclipse console view lists the command line equivalents of the actions you perform using the command line client. You can turn the console off in the Preference page (found in Window -> Preferences -> Team -> SVN -> Console -> Show SVN output in the Console view), and control whether or not the SVN console tab is brought to the front on every SVN event.</description>
+ <topic href="html/reference/svn-console.html" label="Reference: SVN Console View"/>
+ <topic href="html/reference/preferences.html" label="Reference: SVN Preferences Pages"/>
+ </context>
+
+ <context id="repositories_view_context">
+ <description>This view contains the Subversion repository locations known in this workspace. Using the context menu, you can add and remove locations, browse repository contents and check out projects to work with them, as well as viewing resource histories (log), creating new folders, moving and renaming resources.</description>
+ <topic href="html/gettingstarted/connecting.html" label="Getting Started: Connecting to a Subversion Repository"/>
+ <topic href="html/reference/svn-repository-view.html" label="Reference: SVN Repository View"/>
+ </context>
+
+ <context id="compare_revision_view_context">
+ <description>TODO - compare_revision_view_context - how did you make this text appear?</description>
+ <topic href="html/reference/compare.html" label="Reference: Compare Menu"/>
+ </context>
+
+ <context id="annotations_view_context">
+ <description>This shows the revision and committer of the different sections of the selected text file and works together with the resource history view to show which revisions contributed which lines of text in the file (you can select each section and the history view will be updated). Using this information, you can see which revision is to 'blame' for a specific line of the text file examined (or where praise is due.)</description>
+ <topic href="html/reference/svn-annotations.html" label="Reference: Team -> SVN Annotation View"/>
+ <topic href="html/reference/show-annotation.html" label="Reference: Team -> Show Annotation"/>
+ <topic href="html/reference/history-view.html" label="Reference: SVN Resource History View" />
+ </context>
+
+ <context id="properties_view_context">
+ <description>The active Subversion properties for the resource currently shown in the editor (if it is managed by Subversion, that is). You can even see special Subversion properties (prefixed by 'svn:')</description>
+ <topic href="html/reference/svn-properties-view.html" label="Reference: SVN Properties View"/>
+ <topic href="html/reference/svn-ignore.html" label="Refernce: Team -> Add to svn:ignore" />
+ <topic href="html/reference/add-keywords.html" label="Reference: Team -> Add keywords" />
+ </context>
+
+ <context id="pending_operations_view_context">
+ <description>This view contains the selected projects' pending operations against the known state of the remote repository, i.e. the outgoing changes. You may also use the 'Team Synchronization' to see both incoming and outgoing changes.</description>
+ <topic href="html/dailywork/workcycle.html" label="Tasks: Edit, Update, Commit"/>
+ <topic href="html/reference/pending-operations-view.html" label="Reference: Pending Operations View"/>
+ </context>
+
+ <!-- Dialogs -->
+
         <context id="release_comment_dialog_context">
- <description>This dialog box is used for entering the "commit message" or
-"log message", the text associated with the revision number
-that you are comitting. This is the text that will also be
-shown in SVN History view for the changed resource(s).</description>
+ <description>This dialog box is used for entering the "commit message" or "log message", the text associated with the revision number that you are comitting. This is the text that will also be shown in SVN History view for the changed resource(s).</description>
                 <topic href="html/dailywork/workcycle.html" label="Tasks: Edit, Update, Commit" />
                 <topic href="html/reference/history-view.html" label="Reference: SVN Resource History View" />
                 <topic href="html/reference/svn-repository.html" label="Reference: SVN Repository Exploring Perspective" />
         </context>
 
+ <context id="switch_dialog_context">
+ <description>You can enter the URL of the repository location that you wish to switch to directly, or use the "Choose..." button to bring up a repository browser enabling you to choose the location by point-and-click. Usually, you want the HEAD revision of the selected location, but if you specify a specific revision number, ensure that the chosen repository location did indeed exist at that revision.</description>
+ <topic href="html/reference/switch.html" label="Reference: Team -> Switch"/>
+ </context>
+
+ <context id="branch_tag_dialog_context">
+ <description>Branching and tagging copies the current repository state (e.g. under 'trunk' to a new location under e.g. 'tags' or 'branches'.</description>
+ <topic href="html/reference/branch-tag.html" label="Reference: Team -> Branch/Tag"/>
+ </context>
+
+ <context id="merge_dialog_context">
+ <description>Using this dialog, you can merge a set of differences between two different revisions of a repository location, OR merge the difference between two separate repository locations.</description>
+ <topic href="html/reference/merge.html" label="Reference: Team -> Merge"/>
+ <topic href="html/reference/merge.html" label="Reference: Team -> Merge"/>
+ </context>
+
+ <context id="revert_dialog_context">
+ <description>You may chose which changes you wish to revert to the pristine state (this may differ from the state currently found in the Subversion repository). Reverting doesn't connect to the repository, all the pristine data are stored within your working copy.</description>
+ <topic href="html/reference/revert.html" label="Reference: Team -> Revert"/>
+ </context>
+
+ <!-- Wizards -->
+
         <context id="sharing_autoconnect_page_context">
- <description>Subclipse has detected that this project is already a part of a Subversion
-"working copy". Perhaps you already checked the project out a different Subversion client, such as the command line client 'svn'.
-Once you finish this dialog, you can use the Subversion features that are part of Subclipse.</description>
+ <description>Subclipse has detected that this project is already a part of a Subversion workspace (a.k.a. "working copy"). Perhaps you already checked the project out a different Subversion client, such as the command line client 'svn'. Once you finish this dialog, you can use the Subversion features that are part of Subclipse.</description>
                 <topic href="html/reference/share.html" label="Reference: Team -> Share" />
                 <topic href="html/faq/subversion-mapping.html" label="Subclipse for Subversion Users" />
                 <topic href="html/faq/glossary.html" label="Subversion Glossary" />
         </context>
 
         <context id="sharing_select_repository_page_context">
- <description>In this dialog you should choose the relevant repository location
-for the project you wish to share, or choose a new one.</description>
+ <description>In this dialog you should choose the relevant repository location for the project you wish to share, or choose a new one.</description>
                 <topic href="html/gettingstarted/connecting.html" label="Getting Started: Connecting to a Subversion Repository" />
                 <topic href="html/faq/subversion-mapping.html" label="Subclipse for Subversion Users" />
                 <topic href="html/faq/glossary.html" label="Subversion Glossary" />
                 <topic href="html/reference/share.html" label="Reference: Team -> Share" />
         </context>
 
- <context id="console_view_context">
- <description>The Subclipse console view lists the command line equivalents of the actions
-you perform using the command line client. You can turn the console off in the Preference page
-(found in Window -> Preferences -> Team -> SVN -> Console -> Show SVN output in the Console view)</description>
+ <!-- Preference Pages -->
+
+ <context id="console_preference_page_context">
+ <description>These controls determine whether or not the Subversion Console output is generated, as well as how.</description>
                 <topic href="html/reference/svn-console.html" label="Reference: SVN Console View"/>
                 <topic href="html/reference/preferences.html" label="Reference: SVN Preferences Pages"/>
         </context>
 
- <context id="console_view_context">
- <description>The Subclipse console view lists the command line equivalents of the actions
-you perform using the command line client. You can turn the console off in the Preference page
-(found in Window -> Preferences -> Team -> SVN -> Console -> Show SVN output in the Console view),
-and controol whether or not the SVN console tab is brought to the front on every SVN event.</description>
- <topic href="html/reference/svn-console.html" label="Reference: SVN Console View"/>
- <topic href="html/reference/preferences.html" label="Reference: SVN Preferences Pages"/>
+ <context id="disconnect_action_context">
+ <description>You can choose between erasing the Subversion "housekeeping" information or to keep them. Should you choose to keep the Subversion directories, you may reconnect by choosing "Share" in the Team menu and selecting the "SVN" repository type. If you are in doubt, keep the '.svn' directories so you can continue tracking the contents against the repository.</description>
+ <topic href="html/reference/disconnect.html" label="Reference: Team -> Disconnect"/>
         </context>
 
- <context id="console_preference_page_context">
- <description>These controls determine whether or not the Subversion Console output is
-generated, as well as how.</description>
- <topic href="html/reference/svn-console.html" label="Reference: SVN Console View"/>
- <topic href="html/reference/preferences.html" label="Reference: SVN Preferences Pages"/>
+ <context id="add_to_svnignore_dialog_context">
+ <description>You can choose between three ways of choosing which resources to ignore. If you are in doubt, leave the setting as it is, this will only ignore the files you specifically selected.</description>
+ <topic href="html/reference/add-to-svn-ignore.html" label="Reference: Team -> Add to svn:ignore..."/>
         </context>
 
+ <context id="add_keywords_dialog_context">
+ <description>Choose one or more keywords to activate for the selected resource(s). When keywords are used the text contents (enclosed in $-signs), Subversion will replace the keyword with its expansion text on every update of the resource.</description>
+ <topic href="html/reference/add-keywords.html" label="Reference: Team -> Add keywords..."/>
+ </context>
+
+ <!-- Property page -->
+ <context id="svn_resource_properties_page_context">
+ <description>This resource is under Subversion's version control. This page lists the information currently available about the resource in the current version of your working copy.</description>
+ <topic href="html/reference/properties.html" label="Reference: Properties"/>
+ </context>
+
+
         <!--
                 Here's a typical example of the text you need.
                 
@@ -82,27 +145,20 @@
                 <topic href="html/reference/.html" label=""/>
                 </context>
                 
- Remaining ID's to take care of
-
- "switch_dialog_context"
- "merge_dialog_context"
- "revert_dialog_context"
+ TODO: Remaining ID's to take care of, or to eliminate
+
                 "sharing_new_repository_page_context"
                 "sharing_module_page_context"
                 "sharing_finish_page_context"
                 "patch_selection_page_context"
                 "patch_options_page_context"
- "repositories_view_context"
- "compare_revision_view_context"
- "add_to_svnignore_dialog_context"
- "add_keywords_dialog_context"
+
                 "get_file_revision_action_context"
                 "get_file_contents_action_context"
                 "new_repository_location_action_context"
                 "remove_root_action_context"
- "disconnect_action_context"
+
                 "svn_preference_page_context"
- "svn_resource_properties_page_context"
                 "decorators_preference_page_context"
                 "diff_merge_preferences_page_context"
 

Received on Thu Dec 9 12:42:55 2004

This is an archived mail posted to the Subclipse Dev mailing list.