Resolve all documentation conflicts
Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/a2d07fc8 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/a2d07fc8 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/a2d07fc8 Branch: refs/heads/master Commit: a2d07fc857623561b808e96d00378ffd748cb47c Parents: 1b0c5ff d67bdff Author: Lewis John McGibbney <[email protected]> Authored: Wed Mar 1 18:03:09 2017 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Wed Mar 1 18:03:09 2017 -0800 ---------------------------------------------------------------------- src/site/apt/build-src.apt | 22 +-- src/site/apt/configuration.apt | 6 +- src/site/apt/dev-data-conversion.apt | 2 +- src/site/apt/getting-started.apt | 214 +++++++++++++++++------------- src/site/apt/index.apt | 9 +- src/site/apt/install.apt | 2 +- src/site/apt/supported-formats.apt | 2 + src/site/xdoc/download.xml.vm | 130 +++++++++--------- 8 files changed, 213 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/a2d07fc8/src/site/apt/configuration.apt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/a2d07fc8/src/site/apt/dev-data-conversion.apt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/a2d07fc8/src/site/apt/getting-started.apt ----------------------------------------------------------------------
