...
System-level and overview documentation is located in '<code checkout location>/nifi/nifi-docs/src/main/asciidoc'.
Tools available to facilitate documentation generation are available at Editing AsciiDoc with Live Preview.
...
$ git status
On branch nifi-359
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: nifi/nifi-docs/src/main/asciidoc/contributor-guide.adoc...
Stage the file(s) to be committed with git add
$ git add nifi/nifi-docs/src/main/asciidoc/contributor-guide.adoc...
$ git merge upstream/master
Updating a49a03d..8d745c2
Fast-forward
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/StandardDataFlow.java | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
...