From 29bde02d615aa17354f409bcda7eff84b791df63 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Mar 2015 18:24:45 +0530 Subject: [PATCH] Remove the experimental flag for DOCX output since we now generate working DOCX files --- manual/faq.rst | 2 +- src/calibre/customize/builtins.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/manual/faq.rst b/manual/faq.rst index 715609d1f2..b737a3ddea 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -20,7 +20,7 @@ It can convert every input format in the following list, to every output format. *Input Formats:* AZW, AZW3, AZW4, CBZ, CBR, CBC, CHM, DJVU, DOCX, EPUB, FB2, HTML, HTMLZ, LIT, LRF, MOBI, ODT, PDF, PRC, PDB, PML, RB, RTF, SNB, TCR, TXT, TXTZ -*Output Formats:* AZW3, EPUB, FB2, OEB, LIT, LRF, MOBI, HTMLZ, PDB, PMLZ, RB, PDF, RTF, SNB, TCR, TXT, TXTZ, ZIP +*Output Formats:* AZW3, EPUB, DOCX, FB2, HTMLZ, OEB, LIT, LRF, MOBI, PDB, PMLZ, RB, PDF, RTF, SNB, TCR, TXT, TXTZ, ZIP .. note :: diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 2e77337eb3..dccab5a202 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -590,10 +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 -enable_docx_output = 'CALIBRE_ENABLE_EXPERIMENTAL_DOCX_OUTPUT' in os.environ -if enable_docx_output: - from calibre.ebooks.conversion.plugins.docx_output import DOCXOutput - plugins.append(DOCXOutput) +from calibre.ebooks.conversion.plugins.docx_output import DOCXOutput plugins += [ ComicInput, @@ -637,6 +634,7 @@ plugins += [ HTMLOutput, HTMLZOutput, SNBOutput, + DOCXOutput, ] # }}}