From: Simon J Mudd <sjmudd@users.noreply.github.com>
Date: Sat, 13 Dec 2014 17:56:07 +0000 (+0100)
Subject: Merge pull request #2 from ericherman/master
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=aadac1e88fdf91a4fe061c097236a9b3496feb1b;hp=724089cf7925d3e7f54f4b9cf7be341d6fdbe8bf;p=pstop.git

Merge pull request #2 from ericherman/master

Add "Contributing" section to README. Thanks Eric.
---

diff --git a/main.go b/main.go
index 545170c..ddefcf0 100644
--- a/main.go
+++ b/main.go
@@ -197,7 +197,7 @@ func main() {
 					}
 				case '+': // increase interval by creating a new ticker
 					wi.SetWaitInterval(wi.WaitInterval() + time.Second)
-				case 'h': // help
+				case 'h', '?': // help
 					state.SetHelp(!state.Help())
 				case 'q': // quit
 					finished = true
diff --git a/screen/screen.go b/screen/screen.go
index 338583a..9266ad8 100644
--- a/screen/screen.go
+++ b/screen/screen.go
@@ -87,7 +87,7 @@ func (s *TermboxScreen) DisplayHelp() {
 	s.PrintAt(0, 5, "Keys:")
 	s.PrintAt(0, 6, "- - reduce the poll interval by 1 second (minimum 1 second)")
 	s.PrintAt(0, 7, "+ - increase the poll interval by 1 second")
-	s.PrintAt(0, 8, "h - this help screen")
+	s.PrintAt(0, 8, "h/? - this help screen")
 	s.PrintAt(0, 9, "q - quit")
 	s.PrintAt(0, 10, "t - toggle between showing time since resetting statistics or since P_S data was collected")
 	s.PrintAt(0, 11, "z - reset statistics")