[master] 960fcc1 Fix tyops

[Federico G. Schwindt]

commit 960fcc1794818b8a37dc196b0ccb6fff67b7eedc
Author: Daniel Gustafsson <dgustafsson at pivotal.io>
Date:   Tue Jan 17 13:01:41 2017 +0100

    Fix tyops

diff --git a/doc/sphinx/phk/trialerror.rst b/doc/sphinx/phk/trialerror.rst
index 86009b3..d36688e 100644
--- a/doc/sphinx/phk/trialerror.rst
+++ b/doc/sphinx/phk/trialerror.rst
@@ -21,7 +21,7 @@ and Management of Systems Prototyping"* etc.  etc.
 The grey-beard at my workplace laconically said *"We already do that,
 only we call it Trial&Error."*
 
-Programming as always been Trial&Error, and probably always will.
+Programming has always been Trial&Error, and probably always will.
 
 All the early pioneers, like Wheeler, complained about how
 batch-scheduling of machine resources removed the "intimate" contact
@@ -103,8 +103,8 @@ So it is only fair to dedicate VTEST to the friend I chatted with:
 
 `Bjarne <http://www.stroustrup.com/>`_ tried to model how to best
 distribute operating system kernels across a network, wrote a
-adequate programming language tool for the job, which wass also
-an adeqaute tool for a lot of other programming jobs.
+adequate programming language tool for the job, which was also
+an adequate tool for a lot of other programming jobs.
 
 Thanks Bjarne!