Documentation: RobotLocomotion/drake@3583515

Author: drake-jenkins-bot

code_style_guide.html

@@ -203,7 +203,9 @@ <h2 id="clarifications">Clarifications</h2>
 <h2 id="exceptions">Exceptions</h2>
 
 <ul>
-  <li>Lines containing a long URL may be longer than 80 columns if necessary to
+  <li>Drake uses an 80-character limit, instead of PEP 8’s limit of 79. Docstrings
+may also use all 80 characters (ignoring the limit of 72 from PEP 8).</li>
+  <li>Lines containing a long URL may be longer than 80 characters if necessary to
 avoid splitting the URL.</li>
 </ul>
 

styleguide/pyguide.html

@@ -2190,10 +2190,7 @@ <h4 id="383-functions-and-methods">3.8.3 Functions and Methods</h4>
   <dt><a href="#doc-function-args"><em>Args:</em></a></dt>
   <dd>List each parameter by name. A description should follow the name, and be
 separated by a colon followed by either a space or newline. If the
-description is too long to fit on a single
-<span class="nondrake">80-character</span>
-<span class="drake">79-character*</span>
-line, use a hanging
+description is too long to fit on a single 80-character line, use a hanging
 indent of 2 or 4 spaces more than the parameter name (be consistent with the
 rest of the docstrings in the file). The description should include required
 type(s) if the code does not contain a corresponding type annotation. If a