Merge lp:~jeffmarcom/opencompute/update-intro-message into lp:opencompute/checkbox

[Jeff Marcom]

updates intro message for Checkbox OCP

This simply updates the intro message for Checkbox OCP.

[Jeff Lane  (bladernr)]

Looks reasonable...

review: Approve

[Jeff Lane  (bladernr)]

Missing a commit message. Set one and reset to approve...

[Jeff Marcom (jeffmarcom)]

Attempt to merge into lp:opencompute/checkbox failed due to conflicts:

text conflict in debian/changelog

[lp:~jeffmarcom/opencompute/update-intro-message]

2150. By Jeff Marcom on 2013-09-25

Updated intro prompt

Signed-off-by: Jeff Marcom <email address hidden>

2151. By Jeff Marcom on 2013-09-25

Updated changelog

Signed-off-by: Jeff Marcom <email address hidden>

[Jeff Marcom (jeffmarcom)]

rebase on lp:opencompute/checkbox trunk.

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-25 14:13:41 +0000
+++ debian/changelog	2013-09-25 14:53:24 +0000
@@ -3,6 +3,7 @@
   [ Jeff Marcom ]
   * Added googlestress app memory tests
   * Updated plainbox based on version 0.4.dev in lp:checkbox (16.12)
+  * Updated checkbox OCP intro prompt
 
   [ Jeff Lane ]
   * Updated OCP Checkbox to latest checkbox trunk, 0.16.11 revno 2353

=== modified file 'plugins/intro_prompt.py'
--- plugins/intro_prompt.py	2012-06-22 16:43:00 +0000
+++ plugins/intro_prompt.py	2013-09-25 14:53:24 +0000
@@ -26,11 +26,19 @@
 class IntroPrompt(Plugin):
 
     welcome_text = String(default=_("""\
-Welcome to System Testing!
-
-Checkbox provides tests to confirm that your system is working \
-properly. Once you are finished running the tests, you can view \
-a summary report for your system.""") + _("""
+Welcome to the official test suite for the Open Compute project.
+
+Checkbox OCP provides numerous tests to validate your hardware operates 
+within guidelines defined by opencompute-ready and/or opencompute-certified
+compliance and interoperability scope. 
+
+Once you are finished running the test suite, you can view a summary 
+report for your system in the following location:
+
+/home/<user>/.cache/checkbox/submission.xml.
+
+*Checkbox-OCP is a product developed by Canonical with the 
+help of members of Facebook, AVL, and the Open Compute project*""") + _("""
 
 Warning: Some tests could cause your system to freeze \
 or become unresponsive. Please save all your work \