Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/50744bfd Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/50744bfd Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/50744bfd Branch: refs/heads/develop Commit: 50744bfdc608c2395b7af281a587d241356e699c Parents: 97aa53d 4ac6dfd Author: Mark Payne <[email protected]> Authored: Wed Feb 25 14:35:45 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Wed Feb 25 14:35:45 2015 -0500 ---------------------------------------------------------------------- .../src/main/asciidoc/administration-guide.adoc | 43 ++++++++++++++------ nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 +- .../nifi-docs/src/main/asciidoc/user-guide.adoc | 11 +++++ 3 files changed, 44 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
