From 87170e2af42336a71f07af6dc20d70b43738e086 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 10 Dec 2016 10:44:43 +0100
Subject: [PATCH] Removed deprecated `--no-wrap` option.

---
 MANUAL.txt | 4 ----
 pandoc.hs  | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/MANUAL.txt b/MANUAL.txt
index 21692c59f..9cfd6026a 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -578,10 +578,6 @@ General writer options
     will be nonsemantic newlines in the output as well).
     Automatic wrapping does not currently work in HTML output.
 
-`--no-wrap`
-
-:   Deprecated synonym for `--wrap=none`.
-
 `--columns=`*NUMBER*
 
 :   Specify length of lines in characters.  This affects text wrapping
diff --git a/pandoc.hs b/pandoc.hs
index b891dbacf..2d5a3af35 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -469,13 +469,6 @@ options =
                   "NUMBER")
                  "" -- "Dpi (default 96)"
 
-    , Option "" ["no-wrap"]
-                 (NoArg
-                  (\opt -> do warn $ "--no-wrap is deprecated. " ++
-                                     "Use --wrap=none or --wrap=preserve instead."
-                              return opt { optWrapText = WrapNone }))
-                 ""
-
     , Option "" ["wrap"]
                  (ReqArg
                   (\arg opt ->