Remove duplicate text, fix links.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/1cbd3dc6 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/1cbd3dc6 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/1cbd3dc6 Branch: refs/heads/bootstrap-ui Commit: 1cbd3dc6f1d828b1720ab357daf3342e4657aead Parents: 76d87c2 Author: Dave Johnson <[email protected]> Authored: Fri Jan 2 13:10:17 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Fri Jan 2 13:10:17 2015 -0500 ---------------------------------------------------------------------- README.md | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/1cbd3dc6/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index c113dae..cc850fd 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,14 @@ -README.txt +README.md === -This is my personal and experimental fork of Apache Roller. -There are two experiments here: - -1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use -Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed. - -2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add -a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power -a new JavaScript based web interface for Roller. - -README.txt -=== - -This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller). +This is __Rollarcus__: my experimental fork of [Apache Roller](https://github.com/apache/roller). So far, there are two experiments here: -1) [https://github.com/snoopdave/rollarcus/tree/shiro_not_spring(shiro_not_spring): is a branch of Roller's trunk -that has been modified to use Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been -removed. +1) [shiro_not_spring](https://github.com/snoopdave/rollarcus/tree/shiro_not_spring): is a +branch of Roller's trunk that has been modified to use Apache Shiro for security instead of Spring. +Also, all Spring depdenencies have been removed. -2) [https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts](jaxrs_not_struts): is a branch of Roller's +2) [jaxrs_not_struts](https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts): is a branch of Roller's trunk that has been modified to add a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power a new JavaScript based web interface for Roller.
