Repository: incubator-nifi Updated Branches: refs/heads/NIFI-353 ecbccae73 -> 0ebb54a50
NIFI-280 rewording column headers and warning message Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/220fcac1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/220fcac1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/220fcac1 Branch: refs/heads/NIFI-353 Commit: 220fcac169ce180ef0ad34a3d0080a1b03e337a7 Parents: d7cf25b Author: danbress <[email protected]> Authored: Sat Jan 31 12:29:07 2015 -0500 Committer: danbress <[email protected]> Committed: Sat Feb 7 10:47:06 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/documentation/DocGenerator.java | 2 +- .../apache/nifi/documentation/html/HtmlDocumentationWriter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/220fcac1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java index 9a37356..157d95e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java @@ -111,7 +111,7 @@ public class DocGenerator { final File baseDocumenationFile = new File(directory, "index.html"); if (baseDocumenationFile.exists()) { - logger.warn(baseDocumenationFile + " already exists! Overwriting!"); + logger.warn(baseDocumenationFile + " already exists, overwriting!"); } try (final OutputStream output = new BufferedOutputStream(new FileOutputStream(baseDocumenationFile))) { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/220fcac1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java index bf9bd13..f2ce158 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java @@ -274,8 +274,8 @@ public class HtmlDocumentationWriter implements DocumentationWriter { xmlStreamWriter.writeStartElement("tr"); writeSimpleElement(xmlStreamWriter, "th", "Name"); writeSimpleElement(xmlStreamWriter, "th", "Description"); - writeSimpleElement(xmlStreamWriter, "th", "Default Value"); - writeSimpleElement(xmlStreamWriter, "th", "Valid Values"); + writeSimpleElement(xmlStreamWriter, "th", "Default"); + writeSimpleElement(xmlStreamWriter, "th", "Values"); xmlStreamWriter.writeStartElement("th"); writeLink(xmlStreamWriter, "EL", "../../html/expression-language-guide.html"); xmlStreamWriter.writeEndElement();
