From 63412262e54b4814fe115502bebded9c9993b6f7 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 29 Jan 2015 12:21:44 -0500
Subject: [PATCH] Fixed #24175 -- Updated docstring convention.

---
 .../contributing/writing-code/coding-style.txt       | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt
index c87e28cda8..dd0d334072 100644
--- a/docs/internals/contributing/writing-code/coding-style.txt
+++ b/docs/internals/contributing/writing-code/coding-style.txt
@@ -40,21 +40,13 @@ Python style
 
       from django.views.generic.base import View
 
-* In docstrings, use "action words" such as::
-
-      def foo():
-          """
-          Calculates something and returns the result.
-          """
-          pass
-
-  Here's an example of what not to do::
+* In docstrings, follow :pep:`257`. For example::
 
       def foo():
           """
           Calculate something and return the result.
           """
-          pass
+          ...
 
 Template style
 --------------