From cab1e2cd50c8d48e21f38bd34264726c42f6b019 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 2 May 2015 12:25:02 +0530
Subject: [PATCH] Remove experimental flag for DOCX Output

Still needs some work, but it is in a releasable state.
---
 src/calibre/customize/builtins.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 138e0d90fd..b38ddf8c26 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -590,9 +590,7 @@ from calibre.ebooks.conversion.plugins.txt_output import TXTOutput, TXTZOutput
 from calibre.ebooks.conversion.plugins.html_output import HTMLOutput
 from calibre.ebooks.conversion.plugins.htmlz_output import HTMLZOutput
 from calibre.ebooks.conversion.plugins.snb_output import SNBOutput
-if 'CALIBRE_ENABLE_EXPERIMENTAL_DOCX_OUTPUT' in os.environ:
-    from calibre.ebooks.conversion.plugins.docx_output import DOCXOutput
-    plugins.append(DOCXOutput)
+from calibre.ebooks.conversion.plugins.docx_output import DOCXOutput
 
 plugins += [
     ComicInput,
@@ -620,6 +618,7 @@ plugins += [
 ]
 plugins += [
     EPUBOutput,
+    DOCXOutput,
     FB2Output,
     LITOutput,
     LRFOutput,