whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix description about contribute style guide (#7592)

Browse Source
This commit is contained in:
CaoShuFeng
2018-03-02 12:27:50 +08:00
committed by zacharysarah
parent 1c2b212f72
commit 62754424e0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/home/contribute/style-guide.md
+10
View File
@@ -178,11 +178,21 @@ kind: Pod
A list of Kubernetes-specific terms and words to be used consistently across the site. A list of Kubernetes-specific terms and words to be used consistently across the site.
<table> <table>
<<<<<<< HEAD
<tr><th>Term</th><th>Usage</th></tr> <tr><th>Term</th><th>Usage</th></tr>
<tr><td>Kubernetes</td><td>Kubernetes should always be capitalized.</td></tr> <tr><td>Kubernetes</td><td>Kubernetes should always be capitalized.</td></tr>
<tr><td>Docker</td><td>Docker should always be capitalized.</td></tr> <tr><td>Docker</td><td>Docker should always be capitalized.</td></tr>
<tr><td>SIG Docs</td><td>SIG Docs rather than SIG-DOCS or other variations.</td></tr> <tr><td>SIG Docs</td><td>SIG Docs rather than SIG-DOCS or other variations.</td></tr>
</table> </table>
||||||| merged common ancestors
<tr><th>Term</th><th>Useage</th></tr>
<tr><td>TBD</td><td>TBD</td></tr>
</table>{% endcomment %}
=======
<tr><th>Term</th><th>Usage</th></tr>
<tr><td>TBD</td><td>TBD</td></tr>
</table>{% endcomment %}
>>>>>>> fix description about contribute style guide (#7592)
## Callout Formatting ## Callout Formatting
Callouts help create different rhetorical appeal levels. Our documentation supports three different callouts: **Note:** {: .note}, **Caution:** {: .caution}, and **Warning:** {: .warning}. Callouts help create different rhetorical appeal levels. Our documentation supports three different callouts: **Note:** {: .note}, **Caution:** {: .caution}, and **Warning:** {: .warning}.