From 19d0cbdb651165b9bd2cac2be87d74951fd6be6a Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 9 Mar 2016 00:12:53 +0100 Subject: [PATCH 1/2] README: link to contributing guide on master Fixes https://github.com/awesomeWM/awesome/issues/739. Closes https://github.com/awesomeWM/awesome/pull/750. Closes https://github.com/awesomeWM/awesome/pull/752. --- docs/01-readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/01-readme.md b/docs/01-readme.md index acfd34cf..52674389 100644 --- a/docs/01-readme.md +++ b/docs/01-readme.md @@ -51,7 +51,8 @@ problem. Please report any issues you may find on [our bugtracker](https://github.com/awesomeWM/awesome/issues). You can submit pull requests on the [github repository](https://github.com/awesomeWM/awesome). -Please read the @{02-contributing.md} guide for any coding, documentation or patch guidelines. +Please read the [contributing guide](https://github.com/awesomeWM/awesome/blob/master/docs/02-contributing.md) +for any coding, documentation or patch guidelines. ## Status [![Build Status](https://travis-ci.org/awesomeWM/awesome.svg?branch=master)](https://travis-ci.org/awesomeWM/awesome) From d4218da053dafcb80a3677978ca3150223928015 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 13 Mar 2016 17:17:34 +0100 Subject: [PATCH 2/2] Fix indenting for code in list Markdown requires 8 spaces for code in lists. Ref: https://github.com/awesomeWM/awesome/pull/752#issuecomment-194182994 --- docs/02-contributing.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/02-contributing.md b/docs/02-contributing.md index 2013ae69..8d887e10 100644 --- a/docs/02-contributing.md +++ b/docs/02-contributing.md @@ -16,14 +16,14 @@ Imitate the existing code style. For concrete rules: - Place braces alone on new lines, and do not place braces for single line statement where it is not needed, i.e.: - if(foo) - x = 1; + if(foo) + x = 1; - if(foo) - { - x = 1; - bar(); - } + if(foo) + { + x = 1; + bar(); + } - Do not put a space after if, for, while or function call statements;