Skip to content

Commit b08e978

Browse files
authored
Merge pull request #220 from actionjack/fix_errors_2
Fix snippet merge errors
2 parents 028b852 + 74c3fa1 commit b08e978

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

‎README.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ environment:
4343
4444
## Making it easy to get work done from day one
4545

46-
```{=html}
46+
```
4747
<summary>
4848
```
4949
Simplify, simplify and after that simplify some more
50-
```{=html}
50+
```
5151
</summary>
5252
```
5353
> "Everything should be made as simple as possible, but no simpler."
@@ -64,11 +64,11 @@ and keep the people working on them happy.
6464

6565
## The Basics
6666

67-
```{=html}
67+
```
6868
<summary>
6969
```
7070
The raw basics
71-
```{=html}
71+
```
7272
</summary>
7373
```
7474
> "Without a solid foundation of raw basics, any structure built upon it
@@ -103,11 +103,11 @@ The raw basics
103103

104104
## Culture
105105

106-
```{=html}
106+
```
107107
<summary>
108108
```
109109
Aim to create a culture of empathy and psychological safety
110-
```{=html}
110+
```
111111
</summary>
112112
```
113113
> "It's possible for good people, in perversely designed systems, to
@@ -169,11 +169,11 @@ Aim to create a culture of empathy and psychological safety
169169

170170
## Documentation
171171

172-
```{=html}
172+
```
173173
<summary>
174174
```
175175
Make it easy to understand and do the things
176-
```{=html}
176+
```
177177
</summary>
178178
```
179179
> "Stale documentation is not only misleading, it is positively
@@ -274,11 +274,11 @@ It's important to either have or do the following:
274274
275275
## Operations
276276
277-
```{=html}
277+
```
278278
<summary>
279279
```
280280
Make it easy to get stuff done
281-
```{=html}
281+
```
282282
</summary>
283283
```
284284
> ["Complexity exacts a staggering tax on your humans. Good Ops
@@ -351,11 +351,11 @@ Make it easy to get stuff done
351351
352352
## Processes
353353
354-
```{=html}
354+
```
355355
<summary>
356356
```
357357
How should we be doing the stuff
358-
```{=html}
358+
```
359359
</summary>
360360
```
361361
> "If you can't describe what you are doing as a process, you don't know
@@ -480,11 +480,11 @@ How should we be doing the stuff
480480
481481
> > George Santayana
482482
483-
```{=html}
483+
```
484484
<summary>
485485
```
486486
How do we safely change the things
487-
```{=html}
487+
```
488488
</summary>
489489
```
490490
- Document your coding standards and strategies in the open e.g.
@@ -544,11 +544,11 @@ How do we safely change the things
544544

545545
## Development environments
546546

547-
```{=html}
547+
```
548548
<summary>
549549
```
550550
How do we safely change things
551-
```{=html}
551+
```
552552
</summary>
553553
```
554554
> "Measure twice, cut once"
@@ -589,14 +589,14 @@ How do we safely change things
589589

590590
## Useful links
591591

592-
```{=html}
592+
```
593593
<details>
594594
```
595-
```{=html}
595+
```
596596
<summary>
597597
```
598598
Would you like to know more?
599-
```{=html}
599+
```
600600
</summary>
601601
```
602602
-[Onboarding and Mentoring Apprentices with DevOps
@@ -653,7 +653,7 @@ Would you like to know more?
653653
Commits](https://blog.mocoso.co.uk/talks/2015/01/12/telling-stories-through-your-commits/)
654654
by [Joel Chippindale](https://twitter.com/joelchippindale)
655655

656-
```{=html}
656+
```
657657
</details>
658658
```
659659
## See a problem here

‎build.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@ generate_toc (){
1515
peterdavehello/npm-doctoc doctoc /app/${guide}
1616
}
1717

18+
cleanup (){
19+
gsed -i 's/```{=html}/```/g'${guide}
20+
}
21+
1822
main (){
1923
build_guide
2024
generate_toc
25+
cleanup
2126
}
2227

2328

0 commit comments

Comments
(0)