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 998b070f848..4697ba53684 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
@@ -104,7 +104,7 @@ examining the contents of variables.</p>
         <br>
     </li>
     <li>Click <strong>Run  &gt; Resume</strong>.
-    <p>The output in the <span class="typewriter">helloworld.exe</span> application window is: &nbsp;&quot;<span class="typewriter">You just entered m, you need to enter m to exit.</span>&quot;
+    <p>The output in the <span class="typewriter">helloworld.exe</span> application window is: &nbsp;&quot;<span class="typewriter">Thank you. Exiting.</span>&quot;
     </p></li>
     <li>The application terminates and the debug session ends. The <strong>Debug</strong>  perspective remains open.</li>
 </ol>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm
index 0f980701660..3acbf561753 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm
@@ -46,17 +46,19 @@ bar, displays icons for items such  as bookmarks, breakpoints, and compiler erro
 using namespace std;
 
 int main () {
-    // Say Hello five times
+    // Say HelloWorld five times
     for (int index = 0; index &lt; 5; ++index)
-      cout &lt;&lt; <q>HelloWorld!</q> &lt;&lt; endl;
+      cout &lt;&lt; &quot;HelloWorld!&quot; &lt;&lt; endl;
     char input = 'i';
-    cout &lt;&lt; <q>To exit, press 'm'</q> &lt;&lt; endl;
+    cout &lt;&lt; &quot;To exit, press 'm' then the 'Enter' key.&quot; &lt;&lt; endl;
+    cin  >> input;
     while(input != 'm') {
+        cout &lt;&lt; &quot;You just entered '&quot; &lt;&lt; input &lt;&lt; &quot;'. &quot;
+             &lt;&lt; &quot;You need to enter 'm' to exit.&quot; &lt;&lt; endl;
         cin  >> input;
-        cout &lt;&lt; <q>You just entered </q> &lt;&lt; input
-             &lt;&lt; <q> you need to enter m to exit.</q> &lt;&lt; endl;
     }
-    exit(0);
+    cout << "Thank you. Exiting." << endl;
+    return 0;
 }
 </pre>
 </li>