Merge branch 'DocUpdate' into develop
Conflicts:
src/bin-dist/NOTICE.txt
src/bin-dist/README.txt
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/f6c764e3
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/f6c764e3
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/f6c764e3
Branch: refs/heads/develop
Commit: f6c764e31659b2e05db934ae985285902e3709a0
Parents: 2fb9eb1 72a43f3
Author: Niclas Hedhman <[email protected]>
Authored: Wed Jul 8 12:07:11 2015 +0300
Committer: Niclas Hedhman <[email protected]>
Committed: Wed Jul 8 12:07:11 2015 +0300
----------------------------------------------------------------------
LICENSE.txt | 10 ++---
NOTICE.txt | 2 +-
README.txt | 28 +++++++-------
core/api/src/docs/api.txt | 2 +-
core/api/src/docs/application.txt | 14 +++----
core/api/src/docs/composition.txt | 10 ++---
core/api/src/docs/concern.txt | 6 +--
core/api/src/docs/configuration.txt | 4 +-
core/api/src/docs/entitycomposite.txt | 2 +-
core/api/src/docs/metrics.txt | 4 +-
core/api/src/docs/mixin.txt | 10 ++---
core/api/src/docs/reference/ref-api.txt | 6 +--
core/api/src/docs/servicecomposite.txt | 10 ++---
core/api/src/docs/structure.txt | 20 +++++-----
core/api/src/docs/type-lookup.txt | 2 +-
core/api/src/docs/unitofwork.txt | 4 +-
core/api/src/docs/valuecomposite.txt | 2 +-
core/bootstrap/src/docs/bootstrap.txt | 16 ++++----
core/functional/src/docs/functional.txt | 10 ++---
core/io/src/docs/io.txt | 14 +++----
core/spi/src/docs/spi.txt | 4 +-
core/spi/src/docs/valueserialization.txt | 2 +-
core/testsupport/src/docs/testsupport.txt | 8 ++--
.../src/docs/es-voldemort.txt | 2 +-
.../indexing-solr/src/docs/index-solr.txt | 2 +-
extensions/indexing-sql/instructions.txt | 8 ++--
libraries/alarm/src/docs/alarm.txt | 4 +-
.../circuitbreaker/src/docs/circuitbreaker.txt | 6 +--
libraries/constraints/src/docs/constraints.txt | 2 +-
libraries/fileconfig/src/docs/fileconfig.txt | 2 +-
libraries/http/src/docs/http.txt | 4 +-
libraries/jmx/src/docs/jmx.txt | 2 +-
libraries/lang-beanshell/README.txt | 2 +-
libraries/lang-jruby/README.txt | 2 +-
libraries/logging/src/docs/logging.txt | 4 +-
libraries/osgi/src/docs/osgi.txt | 8 ++--
libraries/rest-client/src/docs/primer.txt | 6 +--
libraries/scheduler/src/docs/scheduler.txt | 2 +-
libraries/servlet/src/docs/servlet.txt | 6 +--
libraries/shiro-core/src/docs/shiro.txt | 14 +++----
libraries/shiro-web/src/docs/shiro-web.txt | 6 +--
libraries/spring/src/docs/spring.txt | 20 +++++-----
libraries/sql/src/docs/sql.txt | 2 +-
.../tutorials/howto-assembly-application.txt | 16 ++++----
.../src/docs/tutorials/howto-build-system.txt | 30 +++++++--------
.../docs/tutorials/howto-configure-service.txt | 6 +--
.../src/docs/tutorials/howto-create-concern.txt | 4 +-
.../src/docs/tutorials/howto-create-entity.txt | 14 +++----
.../docs/tutorials/howto-create-sideeffect.txt | 4 +-
.../src/docs/tutorials/howto-depend-on-qi4j.txt | 34 ++++++++---------
.../tutorials/howto-leverage-properties.txt | 6 +--
manual/src/docs/tutorials/howto-use-io.txt | 6 +--
.../src/docs/tutorials/howto-writing-docs.txt | 2 +-
manual/src/docs/userguide/core.txt | 26 ++++++-------
manual/src/docs/userguide/extensions.txt | 4 +-
manual/src/docs/userguide/faq.txt | 4 +-
manual/src/docs/userguide/glossary.txt | 40 ++++++++++----------
manual/src/docs/userguide/index.txt | 2 +-
manual/src/docs/userguide/libraries.txt | 2 +-
manual/src/docs/userguide/preface.txt | 16 ++++----
manual/src/docs/userguide/tools.txt | 4 +-
manual/src/docs/website/home.txt | 24 +++++++-----
manual/src/docs/website/related.txt | 4 +-
manual/src/docs/website/samples.txt | 12 +++---
manual/src/docs/website/tutorials.txt | 20 +++++-----
samples/dci-cargo/README.txt | 2 +-
src/bin-dist/NOTICE.txt | 2 +-
src/bin-dist/README.txt | 20 +++++-----
tools/envisage/src/docs/envisage.txt | 2 +-
tutorials/composites/src/docs/step1.txt | 4 +-
tutorials/composites/src/docs/step2.txt | 4 +-
tutorials/composites/src/docs/step5.txt | 6 +--
tutorials/composites/src/docs/step7.txt | 8 ++--
tutorials/composites/src/docs/step8.txt | 4 +-
tutorials/composites/src/docs/step9.txt | 4 +-
.../composites/src/docs/tut-composites.txt | 8 ++--
tutorials/introduction/src/docs/background.txt | 14 +++----
tutorials/introduction/src/docs/highlights.txt | 6 +--
tutorials/introduction/src/docs/qi4j-cop.txt | 4 +-
.../introduction/src/docs/state-modeling.txt | 16 ++++----
.../what-is-composite-oriented-programming.txt | 8 ++--
.../introduction/src/docs/whats-an-object.txt | 14 +++----
.../tenminutes/src/docs/ten-minutes.txt | 28 +++++++-------
.../thirtyminutes/src/docs/thirty-minutes.txt | 24 ++++++------
.../twohours/src/docs/two-hours.txt | 8 ++--
.../twominutes/src/docs/two-minutes.txt | 10 ++---
tutorials/services/src/docs/step1.txt | 4 +-
tutorials/services/src/docs/step2.txt | 2 +-
tutorials/services/src/docs/step3.txt | 6 +--
tutorials/services/src/docs/tut-services.txt | 4 +-
90 files changed, 396 insertions(+), 390 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f6c764e3/libraries/lang-jruby/README.txt
----------------------------------------------------------------------
diff --cc libraries/lang-jruby/README.txt
index a78ec2a,1d47320..3b2dcf5
--- a/libraries/lang-jruby/README.txt
+++ b/libraries/lang-jruby/README.txt
@@@ -1,8 -1,8 +1,8 @@@
-BeanShell is licensed under LGPL, and Apache Software Foundation
+JRuby is licensed under LGPL, and Apache Software Foundation
doesn't allow the use of LGPL in Apache projects.
- Therefor, Apache Zest had to drop this library component, but
+ Therefor, Apache Zest� had to drop this library component, but
it is still available for separate download at
https://github.com/Qi4j/qi4j-sdk
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f6c764e3/libraries/sql/src/docs/sql.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/f6c764e3/manual/src/docs/website/tutorials.txt
----------------------------------------------------------------------
