Attachment 204871 Details for Bug 357336 – Changes in doc

[patch] Changes in doc

patch_357336_4.txt (text/plain), 3.24 KB, created by Malgorzata Janczarska

on 2011-10-10 07:53:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2011-10-10 07:53:56 EDT

Size: 3.24 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.platform.doc.user
>Index: gettingStarted/qs-52e.htm
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.user/gettingStarted/qs-52e.htm,v
>retrieving revision 1.26
>diff -u -r1.26 qs-52e.htm
>--- gettingStarted/qs-52e.htm	27 May 2009 12:41:08 -0000	1.26
>+++ gettingStarted/qs-52e.htm	10 Oct 2011 11:48:50 -0000
>@@ -18,28 +18,55 @@
> differences between the two files.
> 
> <img src="../images/Image80_compare_editor.png" alt="Compare editor" border="0" >
>-There are two parts to the compare editor's local toolbar. Move to the next 
>- or previous change using the right group of local toolbar buttons.
>+There are two parts to the compare editor's local toolbar. Move between changes 
>+and differences using the right group of local toolbar buttons.
> <blockquote>
> 
>-<img src="../images/Image80_compare_editor3.png" alt="Compare buttons" border="0" >
>+<img src="../images/Image80_compare_editor4.png" alt="Compare buttons" border="0" >
> </blockquote>
> <ol>
> 	<li>
>-	Click the Select Next Change button <img
>-		src="../images/next_change_nav.gif" alt="Compare editor next button"
>-		border="0">. Observe how it selects the next difference.
>-	</li>
>+	Click the Select Next Difference button <img
>+		src="../images/next_diff_nav.gif" alt="Compare editor next difference button"
>+		border="0">. Observe how it selects the next difference.
>+			</li>
>+		<li>
>+			
>+				Click the Select Next Change button <img
>+					src="../images/next_change_nav.gif"
>+					alt="Compare editor next difference button" border="0">.
>+				Observe how it selects the first change in this difference.
>+			</li>
> 	<li>
>-	Click the Select Next Change button a second time to go
>-	to the next change.
>+	Click the Select Next Change button again <img
>+					src="../images/next_change_nav.gif"
>+					alt="Compare editor next change button" border="0">. Observe
>+				how it selects the next difference.
>+			
> 	</li>
> 	<li>
>-	Click the Select Previous Change button.
>-	</li>
>+	Click the Select Previous Change button <img
>+					src="../images/prev_change_nav.gif"
>+					alt="Compare editor next change button" border="0">. Observe
>+				how it selects the last change in a previous difference.
>+			</li>
>+		<li>
>+			
>+				Click the Select Previous Difference button <img
>+					src="../images/prev_diff_nav.gif"
>+					alt="Compare editor next difference button" border="0">.
>+				Observe how it selects the previous difference.
>+			</li>
> </ol>
> To merge changes from the left file to the right file and vice versa use the 
>- left group of local toolbar buttons. There are four types of merges that can 
>+ left group of local toolbar buttons.
>+	<blockquote>
>+		
>+			<img src="../images/Image80_compare_editor3.png"
>+				alt="Compare buttons" border="0">
>+		
>+	</blockquote>
>+	There are four types of merges that can 
> be performed:
> <ul>
> <li>Copy whole document from left to right.</li>

Actions: View | Diff

Attachments on bug 357336: 204022 | 204023 | 204164 | 204362 | 204501 | 204761 | 204871