jenkins-bot has submitted this change and it was merged.

Change subject: Fix wgFlowContentFormat docs and note that wikitext may be 
deprecated
......................................................................


Fix wgFlowContentFormat docs and note that wikitext may be deprecated

Change-Id: I2a2bf6e387b1cd08f22b16fb43274256627cece0
---
M Flow.php
1 file changed, 3 insertions(+), 7 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Flow.php b/Flow.php
index 54a6990..aca2ce8 100644
--- a/Flow.php
+++ b/Flow.php
@@ -203,17 +203,13 @@
 //     $wgFlowExternalStore = array( 'DB://cluster24', 'DB://cluster25' );
 $wgFlowExternalStore = false;
 
-// By default, Flow will store data in wikitext format. It's also the format 
supported
-// by the most basic "editor": none; in which case no conversion (Parsoid) 
will be needed.
-// the only conversion needed it wikitext -> HTML for outputting the content, 
which will
-// then be handled by the parser.
-// On high-volume wikis, it's beneficial to save HTML to the database (to 
avoid having to
-// parse it every time for output), but then you'll have to make sure Parsoid 
is up and
-// running, as it'll be necessary to convert HTML to wikitext for the basic 
editor.
+// By default, Flow will store content in HTML.  However, this requires having 
Parsoid up
+// and running, as it'll be necessary to convert HTML to wikitext for the 
basic editor.
 // (n.b. to use VisualEditor, you'll definitely need Parsoid, so if you do 
support VE,
 // might as well set this to HTML right away)
 // If $wgFlowParsoidURL is null, $wgFlowContentFormat will be forced to 
wikitext.
 //
+// The 'wikitext' format is likely to be deprecated in the future.
 $wgFlowContentFormat = 'html'; // possible values: html|wikitext XXX bug 70148 
with wikitext
 
 // Flow Parsoid config

-- 
To view, visit https://gerrit.wikimedia.org/r/199817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a2bf6e387b1cd08f22b16fb43274256627cece0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to