From 8aab535ade6b947fb13c984b32b7e7bb577e10f0 Mon Sep 17 00:00:00 2001 From: Kathy Walrath Date: Thu, 22 Jun 2017 11:26:59 -0700 Subject: [PATCH 1/3] Add Dart style guide * Added Go while I was in there. (@rakyll or @adg might have feedback on the link I used) * Rewrote things a bit to make the new links fit. * Copy edited a bit because I couldn't help myself. --- README.md | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a0d348b79..c1df80a36 100644 --- a/README.md +++ b/README.md @@ -7,27 +7,31 @@ easier to understand a large codebase when all the code in it is in a consistent style. “Style” covers a lot of ground, from “use camelCase for variable names” to -“never use global variables” to “never use exceptions.” This project holds the +“never use global variables” to “never use exceptions.” This project +([google/styleguide](https://github.com/google/styleguide)) links to the style guidelines we use for Google code. If you are modifying a project that originated at Google, you may be pointed to this page to see the style guides that apply to that project. -Our [C++ Style Guide][cpp], [Objective-C Style Guide][objc], [Java Style -Guide][java], [Python Style Guide][py], [R Style Guide][r], [Shell Style -Guide][sh], [HTML/CSS Style Guide][htmlcss], [JavaScript Style Guide][js], -[AngularJS Style Guide][angular], [Common Lisp Style Guide][cl], and [Vimscript -Style Guide][vim] are now available. We have also released [cpplint][cpplint], -a tool to assist with style guide compliance, and [google-c-style.el][emacs], -an Emacs settings file for Google style. +This project holds the [C++ Style Guide][cpp], [Objective-C Style Guide][objc], +[Java Style Guide][java], [Python Style Guide][py], [R Style Guide][r], +[Shell Style Guide][sh], [HTML/CSS Style Guide][htmlcss], +[JavaScript Style Guide][js], [AngularJS Style Guide][angular], +[Common Lisp Style Guide][cl], and [Vimscript Style Guide][vim]. This project +also contains [cpplint][cpplint], a tool to assist with style guide compliance, +and [google-c-style.el][emacs], an Emacs settings file for Google style. -If your project requires that you create a new XML document format, our [XML +If your project requires that you create a new XML document format, the [XML Document Format Style Guide][xml] may be helpful. In addition to actual style rules, it also contains advice on designing your own vs. adapting an existing format, on XML instance document formatting, and on elements vs. attributes. -These style guides are licensed under the CC-By 3.0 License, which encourages -you to share these documents. See [https://creativecommons.org/licenses/by/3.0/](https://creativecommons.org/licenses/by/3.0/) -for more details. +The style guides in this project are licensed under the CC-By 3.0 License, +which encourages you to share these documents. +See [https://creativecommons.org/licenses/by/3.0/][ccl] for more details. + +The following Google style guides live outside of this project: +[Go Style][go] and [Effective Dart][dart]. Creative Commons License @@ -45,3 +49,6 @@ for more details. [cpplint]: https://github.com/google/styleguide/tree/gh-pages/cpplint [emacs]: https://raw.githubusercontent.com/google/styleguide/gh-pages/google-c-style.el [xml]: https://google.github.io/styleguide/xmlstyle.html +[dart]: https://www.dartlang.org/guides/language/effective-dart +[go]: https://github.com/golang/go/wiki/Style +[ccl]: https://creativecommons.org/licenses/by/3.0/ From bb56ab50269b4e4e961b9b5fa798aca6a6480876 Mon Sep 17 00:00:00 2001 From: Kathy Walrath Date: Thu, 22 Jun 2017 12:30:50 -0700 Subject: [PATCH 2/3] Change link to Go style guide --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c1df80a36..c9edb2500 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ which encourages you to share these documents. See [https://creativecommons.org/licenses/by/3.0/][ccl] for more details. The following Google style guides live outside of this project: -[Go Style][go] and [Effective Dart][dart]. +[Go Code Review Comments][go] and [Effective Dart][dart]. Creative Commons License @@ -50,5 +50,5 @@ The following Google style guides live outside of this project: [emacs]: https://raw.githubusercontent.com/google/styleguide/gh-pages/google-c-style.el [xml]: https://google.github.io/styleguide/xmlstyle.html [dart]: https://www.dartlang.org/guides/language/effective-dart -[go]: https://github.com/golang/go/wiki/Style +[go]: https://github.com/golang/go/wiki/CodeReviewComments [ccl]: https://creativecommons.org/licenses/by/3.0/ From 470a53f383857955ef49e8b19a8cc2e2f64d3e6a Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Thu, 22 Jun 2017 16:39:56 -0400 Subject: [PATCH 3/3] Reverse order of [dart] and [go] to match prose --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9edb2500..fc2d7142b 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,6 @@ The following Google style guides live outside of this project: [cpplint]: https://github.com/google/styleguide/tree/gh-pages/cpplint [emacs]: https://raw.githubusercontent.com/google/styleguide/gh-pages/google-c-style.el [xml]: https://google.github.io/styleguide/xmlstyle.html -[dart]: https://www.dartlang.org/guides/language/effective-dart [go]: https://github.com/golang/go/wiki/CodeReviewComments +[dart]: https://www.dartlang.org/guides/language/effective-dart [ccl]: https://creativecommons.org/licenses/by/3.0/