From: Bill Wendling <isanbard@gmail.com>
Date: Wed, 20 Jun 2012 11:56:24 +0000 (+0000)
Subject: Move coding standards reference from development_process.rst to programming.rst.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eef31a5031dfb7770ec1fc3cf207f797005a2f78;p=oota-llvm.git

Move coding standards reference from development_process.rst to programming.rst.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158818 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/docs/development_process.rst b/docs/development_process.rst
index 5053ca891a5..4fc20b34129 100644
--- a/docs/development_process.rst
+++ b/docs/development_process.rst
@@ -6,7 +6,6 @@ Development Process Documentation
 .. toctree::
    :hidden:
 
-   CodingStandards
    MakefileGuide
    Projects
 
@@ -17,12 +16,6 @@ Development Process Documentation
   tree) allow the project code to be located outside (or inside) the ``llvm/``
   tree, while using LLVM header files and libraries.
 
-* :ref:`coding_standards`
-
-  Describes a few coding standards that are used in the LLVM source tree. All
-  code submissions must follow the coding standards before being allowed into
-  the source tree.
-
 * `LLVMBuild Documentation <LLVMBuild.html>`_
 
   Describes the LLVMBuild organization and files used by LLVM to specify
diff --git a/docs/programming.rst b/docs/programming.rst
index a23402276dd..add923f8995 100644
--- a/docs/programming.rst
+++ b/docs/programming.rst
@@ -3,6 +3,11 @@
 Programming Documentation
 =========================
 
+.. toctree::
+   :hidden:
+
+   CodingStandards
+
 * `LLVM Language Reference Manual <LangRef.html>`_
 
   Defines the LLVM intermediate representation and the assembly form of the
@@ -17,7 +22,7 @@ Programming Documentation
 
   Provides information on using the command line parsing library.
 
-* `LLVM Coding standards <CodingStandards.html>`_
+* :ref:`coding_standards`
 
   Details the LLVM coding standards and provides useful information on writing
   efficient C++ code.