From f200da9342424e55a88d23823092fc626222dbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Fri, 24 Nov 2017 11:34:23 +0100
Subject: [PATCH] Improve documentation of ASCII mode in the man page

Resolves: rhbz#1139409
---
 ...tation-of-ASCII-mode-in-the-man-page.patch | 34 +++++++++++++++++++
 vsftpd.spec                                   |  7 +++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch

diff --git a/0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch b/0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch
new file mode 100644
index 0000000..4b32923
--- /dev/null
+++ b/0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch
@@ -0,0 +1,34 @@
+From 7d4b76abb437184fa692533cb5537318026a30e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
+Date: Fri, 24 Nov 2017 11:26:37 +0100
+Subject: [PATCH 39/39] Improve documentation of ASCII mode in the man page
+
+---
+ vsftpd.conf.5 | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vsftpd.conf.5 b/vsftpd.conf.5
+index d1f0db5..3ca55e4 100644
+--- a/vsftpd.conf.5
++++ b/vsftpd.conf.5
+@@ -113,11 +113,17 @@ Default: YES
+ .TP
+ .B ascii_download_enable
+ When enabled, ASCII mode data transfers will be honoured on downloads.
++When disabled, the server will pretend to allow ASCII mode but in fact
++ignore the request. Turn this option on to have the server actually do
++ASCII mangling on files when in ASCII mode.
+ 
+ Default: NO
+ .TP
+ .B ascii_upload_enable
+ When enabled, ASCII mode data transfers will be honoured on uploads.
++See also
++.BR ascii_download_enable
++for more details.
+ 
+ Default: NO
+ .TP
+-- 
+2.14.3
+
diff --git a/vsftpd.spec b/vsftpd.spec
index abd4948..b75f1c4 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name:    vsftpd
 Version: 3.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group:    System Environment/Daemons
@@ -67,6 +67,7 @@ Patch35: 0035-Modify-DH-enablement-patch-to-build-with-OpenSSL-1.1.patch
 Patch36: 0036-Redefine-VSFTP_COMMAND_FD-to-1.patch
 Patch37: 0037-Document-the-relationship-of-text_userdb_names-and-c.patch
 Patch38: 0038-Document-allow_writeable_chroot-in-the-man-page.patch
+Patch39: 0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -136,6 +137,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
 %{_var}/ftp
 
 %changelog
+* Fri Nov 24 2017 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-11
+- Improve documentation of ASCII mode in the man page
+- Resolves: rhbz#1139409
+
 * Tue Oct 31 2017 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-10
 - Document allow_writeable_chroot in the man page
 - Resolves: rhbz#1507143