Merged revisions 371962 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r371962 | mjordan | 2012-08-30 07:48:07 -0500 (Thu, 30 Aug 2012) | 17 lines

  Restore CODING-GUIDELINES to doc folder

  In r294740, the CODING-GUIDELINES was removed from the doc folder in favor
  of the content on the Asterisk wiki.  Some folks still look in the doc folder
  initially for coding guideline suggestions; as such, this patch adds a
  CODING-GUIDELINES file back into the doc folder.  The content of the file
  merely points to the correct page on the Asterisk wiki where the coding
  guidelines currently live.

  (closes issue ASTERISK-20279)
  Reported by: Andrew Latham
  Patches:
    CODING-GUIDELINES.diff uploaded by Andrew Latham (license 5985)
  ........

  Merged revisions 371961 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@371988 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/doc/CODING-GUIDELINES b/doc/CODING-GUIDELINES
new file mode 100644 (file)
index 0000000..8029d4d
--- /dev/null
+++ b/doc/CODING-GUIDELINES
@@ -0,0 +1,2 @@
+Coding guidelines are available on the Asterisk wiki at:
+https://wiki.asterisk.org/wiki/display/AST/Coding+Guidelines