Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit d052d6d

Browse files
authoredJun 21, 2019
Merge pull request #506 from jodh-intel/update-doc-reqs-doc-for-spell-checker
docs: Update doc requirements doc for spell checker
2 parents 0ddf25e + 12a8fdd commit d052d6d

File tree

3 files changed

+69
-4
lines changed

3 files changed

+69
-4
lines changed
 

‎.ci/setup.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,10 @@
88
set -e
99

1010
cidir=$(dirname "$0")
11-
bash "${cidir}/static-checks.sh"
11+
source "${cidir}/lib.sh"
12+
13+
clone_tests_repo
14+
15+
pushd "${tests_repo_dir}"
16+
.ci/setup.sh
17+
popd

‎.travis.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
sudo: required
8-
dist: trusty
8+
dist: xenial
99

1010
language: go
1111
os:
@@ -15,8 +15,11 @@ os:
1515
go:
1616
- "1.10.x"
1717

18-
before_script:
18+
before_install:
1919
- ".ci/setup.sh"
2020

21+
before_script:
22+
- ".ci/static-checks.sh"
23+
2124
script:
2225
- ".ci/run.sh"

‎Documentation-Requirements.md

+57-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
* [Files and command names](#files-and-command-names)
77
* [Code blocks](#code-blocks)
88
* [Images](#images)
9+
* [Spelling](#spelling)
10+
* [Names](#names)
11+
* [Version numbers](#version-numbers)
12+
* [The apostrophe](#the-apostrophe)
913

1014
# Introduction
1115

@@ -16,6 +20,7 @@ Containers](https://github.com/kata-containers) project.
1620

1721
All documents must:
1822

23+
- Be written in simple English.
1924
- Be written in [GitHub Flavored Markdown](https://github.github.com/gfm) format.
2025
- Have a `.md` file extension.
2126
- Include a TOC (table of contents) at the top of the document with links to
@@ -139,7 +144,20 @@ utility.
139144
- All lines beginning `# ` should be comment lines, *NOT* commands to run as
140145
the `root` user.
141146

142-
- In the unusual case that you need to display command *output*, use an
147+
- Try to avoid showing the *output* of commands.
148+
149+
The reasons for this:
150+
151+
- Command output can change, leading to confusion when the output the user
152+
sees does not match the output in the documentation.
153+
154+
- There is the risk the user will get confused between what parts of the
155+
block refer to the commands they should type and the output that they
156+
should not.
157+
158+
- It can make the document look overly "busy" or complex.
159+
160+
In the unusual case that you need to display command *output*, use an
143161
unadorned code block (\`\`\`):
144162

145163
<pre>
@@ -177,3 +195,41 @@ source file and re-generating the binary format image file.
177195
Ideally, the format of all image source files is an open standard, non-binary
178196
one such as SVG. Text formats are highly preferable because you can manipulate
179197
and compare them with standard tools (e.g. `diff(1)`).
198+
199+
# Spelling
200+
201+
Since this project uses a number of terms not found in conventional
202+
dictionaries, we have a
203+
[spell checking tool](https://github.com/kata-containers/tests/tree/master/cmd/check-spelling)
204+
that checks both dictionary words and the additional terms we use.
205+
206+
Run the spell checking tool on your document before raising a PR to ensure it
207+
is free of mistakes.
208+
209+
If your document introduces new terms, you need to update the custom
210+
dictionary used by the spell checking tool to incorporate the new words.
211+
212+
# Names
213+
214+
Occasionally documents need to specify the name of people. Write such names in
215+
backticks. The main reason for this is to keep the [spell checker](#spelling) happy (since
216+
it cannot manage all possible names). However, since backticks render in a
217+
fixed-width font, this makes the names clearer:
218+
219+
> Welcome to `Clark Kent`, the newest member of the Kata Containers Architecture Committee.
220+
221+
# Version numbers
222+
223+
Write version number in backticks. This keeps the [spell checker](#spelling)
224+
happy and since backticks render in a fixed-width font, it also makes the
225+
numbers clearer:
226+
227+
> Ensure you are using at least version `1.2.3-alpha3.wibble.1` of the tool.
228+
229+
# The apostrophe
230+
231+
The apostrophe character (`'`) must **only** be used for showing possession
232+
("Peter's book") and for standard contractions (such as "don't").
233+
234+
Use double-quotes ("...") in all other circumstances you use quotes outside of
235+
[code blocks](#code-blocks).

0 commit comments

Comments
 (0)
This repository has been archived.