From 5f0327f852a48fc676cdab59accb61078bc87fdb Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Sun, 10 Jun 2018 16:05:06 +0200 Subject: Assorted spelling and language adjustments. Signed-off-by: Thomas Hochstein --- conflict.mdwn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'conflict.mdwn') diff --git a/conflict.mdwn b/conflict.mdwn index be0993c..ccf21ec 100644 --- a/conflict.mdwn +++ b/conflict.mdwn @@ -19,7 +19,7 @@ the middle of something, finish that, I can start on my own." In a minute, I hear Robin's combat boots stomping towards my office. She throws open my door, not bothering to knock. Oh good, I've upset her. Robin steps into my office and stands in front of my desk. In -addition to black, leather boots, she's wearing cargo trousers, and a +addition to black leather boots, she's wearing cargo trousers, and a photographer's multi-pocketed vest over a thin, green, army sweater and a uniform dress shirt. It's one of her favourite outfits, on days when she doesn't expect to have to deal with customers in person. @@ -226,9 +226,9 @@ chic. Andy is likewise dressed in a suit, though without a tie. The SmartHome engineers are slowly dripping into the room, in ones and twos. They are talking with each other, about other things they're in -middle of in their own jobs. Among the final ones, a couple of +the middle of in their own jobs. Among the final ones, a couple of 20-somethings, dressed in loud Hawaii shirts and ripped jeans, enter -the the room, stop, and look at Robin. +the room, stop, and look at Robin. One of them pokes the other in the arm, and speaks, not loudly, but loud enough to be heard over the quiet discussion of the others. "See, @@ -250,7 +250,7 @@ do?" Anders looks surprised. "I merely said she looks lesbian. You know, woman in a suit and tie and so on. Also, she's always so aggressive, -telling us to what to do." Robin keeps her face as stony as she can, +telling us what to do." Robin keeps her face as stony as she can, but it's clear she's fuming. Sam shakes his head. "I'm afraid I'm going to have to ask you to leave @@ -347,13 +347,13 @@ tell him to sit out of the meeting." I nod, and look Robin right in the eyes. "Andy's right, you didn't do anything wrong. It was Sam's job to handle the situation. He handled -it badly, that's not our fault. That said, and please don't take this is +it badly, that's not our fault. That said, and please don't take this as any kind of attack or complaint against yourself, I wish it would've been possible to handle this in entirely privately. It might have resulted in less confrontation." After an impressive grimace, Robin agrees. "Maybe I should've done -that. But I wasn't feeling like giving the buy a break. However, even +that. But I wasn't feeling like giving the boy a break. However, even so, I'm not out for his neck. Would it be possible for you to let Sam know that I'm OK if Anders isn't fired?" @@ -405,7 +405,7 @@ harassment to pass. Not even as a joke." spend the night getting angrier, and do something stupid." We hang up. It's getting late, but I have one more chore to do, and -I'd better to it while I still have things clearly in my mind. I write +I'd better get to it while I still have things clearly in my mind. I write a description of the incident in our company internal blog, which acts as an internal knowledge base. This will let everyone in the Team know what has happened. It also means we won't forget it, and we can use @@ -456,7 +456,7 @@ would've been fine to postpone the presentation by a day or two, to let everyone calm down, but sounds like Robin and you did it well." Andy finally goes home. Even he shows signs of it having been a long, -stressful day. Nobody like confrontations like that. Except maybe the +stressful day. Nobody likes confrontations like that. Except maybe the kind of macho brogrammer jerk that Anders seems to be like. I do a final round around the office, and find everywhere to be dark. I get -- cgit v1.2.1