bug 280125 - new and noteworthy for CDT 6.0

10 files changed, 31 insertions, 24 deletions

diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm
index f277cf6992f..d0d800887da 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm
@@ -42,6 +42,23 @@ may contain other information.
 			<p><img src="../images/60/RenameInFile.png" alt="Rename in File">
 			</td>
 		</tr>
+
+		<tr>
+			<td>
+			<p align="right"><b>Refactoring</b></p>
+			</td>
+			<td>"Extract local variable" is added via editor context menu.  
+			Select an expression in the editor and select Refactor > Extract local variable
+			from the context menu.  
+			<p><img src="../images/60/refactor_before.png" alt="refactor"></p>
+			 <p><img src="../images/60/refactorExtractLocalVar.png" alt="refactoring context menu highlighting 'extract local variable'">   
+			<p>Give the new local variable a name</p>
+			<p><p><img src="../images/60/refactor_varname.png" alt="refactor"></p></p>
+			A local variable is created from the expression and its
+			use is inserted in the original expression.
+			<p><img src="../images/60/refactor_after.png" alt="refactor"></p>
+			</td>
+		</tr>
 		<tr>
 			<td>
 			<p align="right"><b>Add Include </b></p>
@@ -58,7 +75,7 @@ may contain other information.
 				</li>
 			</ul>
 
-			<!-- <p><img src="../images/60/image.png" alt="alternate text for image for accessibilty">   -->
+			<!-- <p><img src="../images/60/image.png" alt="alternate text for image for accessibility">   -->
 			</td>
 		</tr>
 		<tr>
@@ -113,7 +130,7 @@ may contain other information.
 			<p align="right"><b>C style block commenting</b></p>
 			</td>
 			<td>C style block commenting (Ctrl-Shift-/) improved
-			<!--  <p><img src="../images/60/image.png" alt="alternate text for image for accessibilty">     -->
+			<!--  <p><img src="../images/60/image.png" alt="alternate text for image for accessibility">     -->
 			</td>
 		</tr>
 
@@ -189,20 +206,7 @@ may contain other information.
 			<p><img src="../images/60/CDT6.0_open_declaration.png" alt="Improved open declaration for unresolved symbols">
 			</td>
 		</tr>
-		<!-- ******************** Refactoring ********************** -->
-		<tr>
-			<td colspan="2"><a name="refactoring"></a>
-			<div style="font-size: 20px; font-weight: bold;">Refactoring</div>
-			</td>
-		</tr>
-		<tr>
-			<td>
-			<p align="right"><b>Extract local variable</b></p>
-			</td>
-			<td>Extract local variable
-			<!-- <p><img src="../images/60/image.png" alt="alternate text for image for accessibilty">  -->
-			</td>
-		</tr>
+
 		<!-- ******************** Project and Build ********************** -->
 		<tr>
 			<td colspan="2"><a name="projAndBuild"></a>
@@ -357,7 +361,7 @@ may contain other information.
 			<p align="right"><b>texthere</b></p>
 			</td>
 			<td>text here.
-			<p><img src="../images/image.png" alt="alternate text for image for accessibilty">
+			<p><img src="../images/image.png" alt="alternate text for image for accessibility">
 			</td>
 		</tr>
 		 -->
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm
index 7914bc4981a..c5d157fcc98 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm
@@ -74,6 +74,7 @@ With CDT 4.0, you now select a project type, and that determines what build syst
 <h3>Step 2: Reviewing the code and building the project</h3>
 <ol>
 	<li>From the Project Explorer in the C++ Projects View, double-click the .cpp file that was created for your project, for example, <tt>Hello World.cpp</tt>. 
+	<p>Note that the file may be within a folder inside the project, e.g. the "src" folder.</p>
 	<p>This file opens in a default editor. It contains C++ template code for the Hello World example project you selected earlier.</p>
 	<br>
 	<p><b>Note:</b> You can specify a different editor, and add or modify existing code templates in <b>Window &gt; Preferences</b>.</p><p>In addition, the <b>Outline</b> view has also been populated
@@ -97,8 +98,8 @@ corresponding text in the editor is highlighted.</p><br>
 
 <p>To run your application:</p>
 <ol>
-	<li>Within the C/C++ Perspective, click <b>Run &gt; Run</b>.<p><br></p></li>
-	<li>Select <b>C/C++ Local Application</b>.<p><br></p></li>
+	<li>Within the C/C++ Perspective, click <b>Run &gt; Run Configurations...</b>.<p><br></p></li>
+	<li>Select <b>C/C++ Application</b>.<p><br></p></li>
     <li>Click <b>New</b>.<p><br></p></li>
 
 	<p>A new Run Configuration is created. Its name and path to the executable are provided by the project ('Hello World' in our case). 
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm
index 6961d0e91fb..8584641ac21 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm
@@ -17,13 +17,14 @@ breakpoints, suspending executed programs, stepping through your code, and
 examining the contents of variables.</p>
 <p>To debug a project:</p>
 <ol>
-  <li>Click <b>Run  &gt; Debug</b>.<p>The Debug window opens.</li>
-  <li>Double-click <b>C++ Local Application</b>.</li>
+  <li>Click <b>Run  &gt; Debug Configurations...</b>.<p>The Debug Configurations dialog opens.</li>
+  <li>Double-click <b>C++  Application</b>.</li>
   <li>In the <b>Name</b> field, type <b>Hello World</b>.</li>
   <p>You can now select this debug launch configuration by name the next time 
   that you debug this project.</p>
-  <li>In the <b>Project</b> box, type <b>hello.exe</b>.</li>
+  <li>In the <b>Project</b> box, type <b>hello.exe</b>.  [???????]</li>
   <li>Click <b>Debug</b>.</li>
+  <p>You will be prompted to switch to the Debug Perspective.  Click <b>Yes</b></p>
   <p>You will now see the debug perspective with the hello.exe application window open. 
   The C/C++ editor repositions in the perspective.</p>
   <li>In the left margin of the main.cpp window, double-click to set a 
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm
index 9a21a53ddd9..24c3dbda0d6 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm
@@ -61,6 +61,7 @@ There can be several toolchains available, depending on the compilers installed
 <li>Click <b>Advanced Settings</b>.
 <li>Click the <b>Binary Parser</b> tab.
 <p><br><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_binparser01.png')">Click here to see an illustration.</a></p><br>
+</p>
 </li>
 <li>In the <b>Binary Parser</b> list, select <b>PE Windows Parser</b>.</li>
 <p>To ensure the accuracy of the C/C++  Projects view and the ability to successfully
diff --git a/doc/org.eclipse.cdt.doc.user/images/60/refactorExtractLocalVar.png b/doc/org.eclipse.cdt.doc.user/images/60/refactorExtractLocalVar.png
new file mode 100644
index 00000000000..cabb23f2507
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/60/refactorExtractLocalVar.png
diff --git a/doc/org.eclipse.cdt.doc.user/images/60/refactor_after.png b/doc/org.eclipse.cdt.doc.user/images/60/refactor_after.png
new file mode 100644
index 00000000000..22941e29e70
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/60/refactor_after.png
diff --git a/doc/org.eclipse.cdt.doc.user/images/60/refactor_before.png b/doc/org.eclipse.cdt.doc.user/images/60/refactor_before.png
new file mode 100644
index 00000000000..365c137bdea
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/60/refactor_before.png
diff --git a/doc/org.eclipse.cdt.doc.user/images/60/refactor_varname.png b/doc/org.eclipse.cdt.doc.user/images/60/refactor_varname.png
new file mode 100644
index 00000000000..e9400017ecb
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/60/refactor_varname.png
diff --git a/doc/org.eclipse.cdt.doc.user/intro/cdtWhatsnew.xml b/doc/org.eclipse.cdt.doc.user/intro/cdtWhatsnew.xml
index 343f003e636..90a708a4145 100644
--- a/doc/org.eclipse.cdt.doc.user/intro/cdtWhatsnew.xml
+++ b/doc/org.eclipse.cdt.doc.user/intro/cdtWhatsnew.xml
@@ -7,7 +7,7 @@
        		<link label="C/C++ Development" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm" 
        		id="orgeclipsecdtdocuserwelcome-introLink" style-id="content-link">
-          		<text>Learn about what's new in CDT 5.0</text>
+          		<text>Learn about what's new in CDT 6.0</text>
        		</link>
        	</group>
   	</extensionContent>
diff --git a/doc/org.eclipse.cdt.doc.user/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index 3ce619184ba..4387cf410b9 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -22,7 +22,7 @@
 		<link toc="topics_Reference.xml" />
 	</topic>
 	
-	<topic label="What's new in CDT 5.0"  href="concepts/cdt_c_whatsnew.htm"/>
+	<topic label="What's new in CDT 6.0"  href="concepts/cdt_c_whatsnew.htm"/>
 	
 	<topic label="Legal" href="notices.html"/>