summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2015-12-18 10:34:44 -0800
committerk8s-merge-robot <k8s.production.user@gmail.com>2015-12-18 10:34:44 -0800
commitc6c72552598da903e417bcf5207981c0ffc4cf31 (patch)
tree30391c26034268ed71085c1ab672034fb690c3fd
parent3fe09ccf4765238e57adbed266b2426f5aa0338b (diff)
parent12e5ddcbac266b547c34e85e9a09f6e0acf30580 (diff)
Merge pull request #18184 from amygdala/docs
Auto commit by PR queue bot
-rw-r--r--coding-conventions.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/coding-conventions.md b/coding-conventions.md
index df9f63e7..d51278be 100644
--- a/coding-conventions.md
+++ b/coding-conventions.md
@@ -72,7 +72,8 @@ Directory and file conventions
- Package directories should generally avoid using separators as much as possible (when packages are multiple words, they usually should be in nested subdirectories).
- Document directories and filenames should use dashes rather than underscores
- Contrived examples that illustrate system features belong in /docs/user-guide or /docs/admin, depending on whether it is a feature primarily intended for users that deploy applications or cluster administrators, respectively. Actual application examples belong in /examples.
- - Examples should also illustrate [best practices for using the system](../user-guide/config-best-practices.md)
+ - Examples should also illustrate
+ [best practices for configuration and using the system](../user-guide/config-best-practices.md)
- Third-party code
- Third-party Go code is managed using Godeps
- Other third-party code belongs in /third_party