Merge "[contributor] move fille naming into RST conventions"

2016-07-18 09:49:57 +00:00 · 2016-07-18 09:49:57 +00:00 · d5b51dd00c
commit d5b51dd00c
parent f9b9c9def1 18d4e76ef5
3 changed files with 5 additions and 7 deletions
--- a/doc/contributor-guide/source/index.rst
+++ b/doc/contributor-guide/source/index.rst
@ -21,7 +21,6 @@ Contents
   doc-bugs.rst
   docs-review.rst
   team-structure.rst
-   docs-structure.rst
   blueprints-and-specs.rst
   api-guides.rst
   project-install-guide
--- a/doc/contributor-guide/source/rst-conv.rst
+++ b/doc/contributor-guide/source/rst-conv.rst
@ -27,6 +27,7 @@ use simpler formatting.
   :maxdepth: 2

   rst-conv/general-guidelines.rst
+   rst-conv/file-naming.rst
   rst-conv/titles.rst
   rst-conv/inline-markups.rst
   rst-conv/lists.rst
--- a/doc/contributor-guide/source/rst-conv/file-naming.rst
+++ b/doc/contributor-guide/source/rst-conv/file-naming.rst
@ -1,11 +1,9 @@
-.. _docs-structure:
-
-=======================
-Documentation structure
-=======================
-
 .. _filename-conv:

+=========================
+File naming and structure
+=========================
+
 File naming conventions
 ~~~~~~~~~~~~~~~~~~~~~~~