From af72f2128e7c4ebd12a9fef7e7381ef42a52ed0c Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Thu, 6 Nov 2014 12:03:13 -0800
Subject: [PATCH 1/3] Remove DCO small patch exception

As we move forward on automating our pull request review process and
tooling these exceptions hurt more than they help.  For consistency we
should not allow small patch exceptions for anything.  The source of
truth going forward for DCO and builds are the official drone status on
each pull request.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 CONTRIBUTING.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd81695dec..e4941cfa56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -272,18 +272,6 @@ Note that the old-style `Docker-DCO-1.1-Signed-off-by: ...` format is still
 accepted, so there is no need to update outstanding pull requests to the new
 format right away, but please do adjust your processes for future contributions.
 
-#### Small patch exception
-
-There are several exceptions to the signing requirement. Currently these are:
-
-* Your patch fixes spelling or grammar errors.
-* Your patch is a single line change to documentation contained in the
-  `docs` directory.
-* Your patch fixes Markdown formatting or syntax errors in the
-  documentation contained in the `docs` directory.
-
-If you have any questions, please refer to the FAQ in the [docs](http://docs.docker.com)
-
 ### How can I become a maintainer?
 
 * Step 1: Learn the component inside out

From 3d8f40b35b7f035bbcd7b7f99064838b24afa1f6 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Thu, 6 Nov 2014 13:26:16 -0700
Subject: [PATCH 2/3] Remove small patch exception checking in
 hack/make/validate-dco

Signed-off-by: Andrew Page <admwiggin@gmail.com>
---
 project/make/validate-dco | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/project/make/validate-dco b/project/make/validate-dco
index 1c75d91bfa..84c47f526d 100644
--- a/project/make/validate-dco
+++ b/project/make/validate-dco
@@ -4,7 +4,7 @@ source "$(dirname "$BASH_SOURCE")/.validate"
 
 adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }')
 dels=$(validate_diff --numstat | awk '{ s += $2 } END { print s }')
-notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"
+#notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"
 
 : ${adds:=0}
 : ${dels:=0}
@@ -22,8 +22,6 @@ check_dco() {
 
 if [ $adds -eq 0 -a $dels -eq 0 ]; then
 	echo '0 adds, 0 deletions; nothing to validate! :)'
-elif [ -z "$notDocs" -a $adds -le 1 -a $dels -le 1 ]; then
-	echo 'Congratulations!  DCO small-patch-exception material!'
 else
 	commits=( $(validate_log --format='format:%H%n') )
 	badCommits=()

From 56e3f49d1900f86b429a5a69839cc4f95af4dedc Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Tue, 11 Nov 2014 16:15:17 +1000
Subject: [PATCH 3/3] Give maintainers the power to add contributor's DCO to a
 commit message, or to use their own if its a trvial change

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 project/MAINTAINERS.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/project/MAINTAINERS.md b/project/MAINTAINERS.md
index 0a4cd14405..1a27c9224c 100644
--- a/project/MAINTAINERS.md
+++ b/project/MAINTAINERS.md
@@ -121,6 +121,23 @@ request that comments out your `MAINTAINERS` file entry using a `#`.
 Yes. Nobody should ever push to master directly. All changes should be
 made through a pull request.
 
+### Helping contributors with the DCO
+
+The [DCO or `Sign your work`](
+https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work)
+requirement is not intended as a roadblock or speed bump.
+
+Some Docker contributors are not as familiar with `git`, or have used a web based
+editor, and thus asking them to `git commit --amend -s` is not the best way forward.
+
+In this case, maintainers can update the commits based on clause (c) of the DCO. The
+most trivial way for a contributor to allow the maintainer to do this, is to add
+a DCO signature in a Pull Requests's comment, or a maintainer can simply note that
+the change is sufficiently trivial that it does not substantivly change the existing
+contribution - i.e., a spelling change.
+
+When you add someone's DCO, please also add your own to keep a log.
+
 ### Who assigns maintainers?
 
 Solomon has final `LGTM` approval for all pull requests to `MAINTAINERS` files.