[Python-checkins] cpython (merge 3.6 -> default): Issue #28319: Merge from 3.6

[berker.peksag]

https://hg.python.org/cpython/rev/40bcf4a8b57d
changeset:   104201:40bcf4a8b57d
parent:      104198:824ac24de93e
parent:      104200:a1e7c9d249ed
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Oct 01 01:19:57 2016 +0300
summary:
  Issue #28319: Merge from 3.6

files:
  Doc/library/lzma.rst |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Doc/library/lzma.rst b/Doc/library/lzma.rst
--- a/Doc/library/lzma.rst
+++ b/Doc/library/lzma.rst
@@ -362,10 +362,9 @@
      select automatically based on other filter options.
 
 The delta filter stores the differences between bytes, producing more repetitive
-input for the compressor in certain circumstances. It only supports a single
-The delta filter supports only one option, ``dist``. This indicates the distance
-between bytes to be subtracted. The default is 1, i.e. take the differences
-between adjacent bytes.
+input for the compressor in certain circumstances. It supports one option,
+``dist``. This indicates the distance between bytes to be subtracted. The
+default is 1, i.e. take the differences between adjacent bytes.
 
 The BCJ filters are intended to be applied to machine code. They convert
 relative branches, calls and jumps in the code to use absolute addressing, with

-- 
Repository URL: https://hg.python.org/cpython