Merge branch 'docs-new-fe-guide-style' into 'master'

Rename style to style guide in new frontend guide See merge request gitlab-org/gitlab-ce!17725

Merge branch 'docs-new-fe-guide-style' into 'master'
618b6dd4 · Jacob Schatz · 770ba383 · 4161e1f1 · 618b6dd4 · 618b6dd4
Commit 618b6dd4 authored Mar 15, 2018 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

index.md doc/development/new_fe_guide/index.md +1 -1

index.md doc/development/new_fe_guide/style/index.md +1 -1

No files found.
--- a/doc/development/new_fe_guide/index.md
+++ b/doc/development/new_fe_guide/index.md
@@ -19,7 +19,7 @@ Guidance on topics related to development.

 Learn about all the dependencies that make up our frontend, including some of our own custom built libraries.

-## [Style](style/index.md)
+## [Style guides](style/index.md)

 Style guides to keep our code consistent.


--- a/doc/development/new_fe_guide/style/index.md
+++ b/doc/development/new_fe_guide/style/index.md
-# Style
+# Style guides

 ## [HTML style guide](html.md)