diff --git a/core/src/main/java/hudson/markup/MarkupFormatter.java b/core/src/main/java/hudson/markup/MarkupFormatter.java index e3b1180ae9..4b9e6364c2 100644 --- a/core/src/main/java/hudson/markup/MarkupFormatter.java +++ b/core/src/main/java/hudson/markup/MarkupFormatter.java @@ -45,6 +45,8 @@ import java.io.Writer; *

* This extension point must have a valid config.jelly that feeds the constructor. * + * TODO: allow {@link MarkupFormatter} to control the UI that the user uses to edit. + * * @author Kohsuke Kawaguchi * @since 1.391 * @see Hudson#getMarkupFormatter() @@ -52,6 +54,12 @@ import java.io.Writer; public abstract class MarkupFormatter extends AbstractDescribableImpl implements ExtensionPoint { /** * Given the text, converts that to HTML according to whatever markup rules implicit in the implementation class. + * + *

+ * Multiple threads can call this method concurrently with different inputs. + * + * @param output + * Formatted HTML should be sent to this output. */ public abstract void translate(String markup, Writer output) throws IOException; diff --git a/core/src/main/resources/lib/hudson/editableDescription.jelly b/core/src/main/resources/lib/hudson/editableDescription.jelly index 415959711d..4a37aae59a 100644 --- a/core/src/main/resources/lib/hudson/editableDescription.jelly +++ b/core/src/main/resources/lib/hudson/editableDescription.jelly @@ -35,7 +35,7 @@ THE SOFTWARE.

- ${it.description} +