From f5f4b5101a63eca6857d139f2653cf3d1e71a4ca Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev
Date: Tue, 29 Apr 2014 11:02:32 -0400
Subject: [PATCH] bug 433472: Sample code is untidy
---
.../getting_started/cdt_w_debug.htm | 2 +-
.../getting_started/cdt_w_newcpp.htm | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
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.
Click Run > Resume.
- The output in the helloworld.exe application window is: "You just entered m, you need to enter m to exit."
+
The output in the helloworld.exe application window is: "Thank you. Exiting."
The application terminates and the debug session ends. The Debug perspective remains open.
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 < 5; ++index)
- cout << HelloWorld!
<< endl;
+ cout << "HelloWorld!" << endl;
char input = 'i';
- cout << To exit, press 'm'
<< endl;
+ cout << "To exit, press 'm' then the 'Enter' key." << endl;
+ cin >> input;
while(input != 'm') {
+ cout << "You just entered '" << input << "'. "
+ << "You need to enter 'm' to exit." << endl;
cin >> input;
- cout << You just entered
<< input
- << you need to enter m to exit.
<< endl;
}
- exit(0);
+ cout << "Thank you. Exiting." << endl;
+ return 0;
}