Repository: isis
Updated Branches:
  refs/heads/master 4c856ab78 -> 9998c7507


Removed some unrendered chars from docs


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cb493c62
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cb493c62
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cb493c62

Branch: refs/heads/master
Commit: cb493c629b2937be3120c11ed7fc7fb06fda8bf0
Parents: 3b2c552
Author: bibryam <red2KIDS>
Authored: Thu Oct 27 10:01:35 2016 +0100
Committer: bibryam <red2KIDS>
Committed: Thu Oct 27 10:01:35 2016 +0100

----------------------------------------------------------------------
 README.adoc                                                    | 6 +++---
 .../asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/cb493c62/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 8e5bfbb..b2e1862 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,6 @@
 = Apache Isis
 
-_http://isis.apache.org[Apache Isis]� software is a framework for rapidly 
developing domain-driven apps in Java. Write your business logic in entities, 
domain services and repositories, and the framework dynamically generates a 
representation of that domain model as a webapp or a RESTful API._
+_http://isis.apache.org[Apache Isis] software is a framework for rapidly 
developing domain-driven apps in Java. Write your business logic in entities, 
domain services and repositories, and the framework dynamically generates a 
representation of that domain model as a webapp or a RESTful API._
 
 Get started using our "simpleapp" 
https://isis.apache.org/guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype[Maven
 archetype].
 
@@ -17,7 +17,7 @@ The todoapp also integrates with a number of other 
http://www.isisaddons.org[Isi
 
 === Sign-in
 
-Apache Isis integrates with http://shiro.apache.org[Apache Shiro]�. The core 
framework supports file-based realms, while the Isis Addons 
http://github.com/isisaddons/isis-module-security[security module] provides a 
well-features subdomain of users, roles and permissions against features 
derived from the Isis metamodel. The example todoapp integrates with the 
security module.
+Apache Isis integrates with http://shiro.apache.org[Apache Shiro]. The core 
framework supports file-based realms, while the Isis Addons 
http://github.com/isisaddons/isis-module-security[security module] provides a 
well-features subdomain of users, roles and permissions against features 
derived from the Isis metamodel. The example todoapp integrates with the 
security module.
 
 
image::https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/010-login.png[link="https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/010-login.png";]
 
@@ -80,7 +80,7 @@ 
image::https://raw.github.com/apache/isis/master/adocs/documentation/src/main/as
 
 == Extensible Views
 
-The Apache Isis viewer is implemented using http://wicket.apache.org[Apache 
Wicket]�, and has been architected to be extensible. For example, when a 
collection of objects is rendered, this is just one several views, as shown in 
the selector drop-down:
+The Apache Isis viewer is implemented using http://wicket.apache.org[Apache 
Wicket], and has been architected to be extensible. For example, when a 
collection of objects is rendered, this is just one several views, as shown in 
the selector drop-down:
 
 
image::https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/070-pluggable-views.png[link="https://raw.github.com/apache/isis/master/adocs/documentation/src/main/asciidoc/images/isis-in-pictures/070-pluggable-views.png";]
 

http://git-wip-us.apache.org/repos/asf/isis/blob/cb493c62/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
----------------------------------------------------------------------
diff --git 
a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
 
b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
index 9f74cf9..d0f6a3f 100644
--- 
a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
+++ 
b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
@@ -253,7 +253,7 @@ Fixture scripts are used to setup the app into a known 
state. They are great for
 
 == Actions
 
-Most business functionality is implemented using actions� basically a 
`public` method accepting domain classes and primitives as its parameter types. 
The action can return a domain entity, or a collection of entities, or a 
primitive/String/value, or void. If a domain entity is returned then that 
object is rendered immediately; if a collection is returned then the Wicket 
viewer renders a table. Such collections are sometimes called "standalone" 
collections.
+Most business functionality is implemented using actions basically a `public` 
method accepting domain classes and primitives as its parameter types. The 
action can return a domain entity, or a collection of entities, or a 
primitive/String/value, or void. If a domain entity is returned then that 
object is rendered immediately; if a collection is returned then the Wicket 
viewer renders a table. Such collections are sometimes called "standalone" 
collections.
 
 * write an action to update the domain property (originally called 
`SimpleObject#name`, though renamed by now)
 * use the 
xref:rgant.adoc#_rgant-ParameterLayout_named[`@ParameterLayout(named=...)`] 
annotation to specify the name of action parameters
@@ -346,7 +346,7 @@ Quick detour: often we want to set up defaults to go with 
choices. Sensible defa
 
 == Collections
 
-Returning back to references, Isis also supports vector (multi-valued) 
references to another object instances� in other words collections. We 
sometimes called these "parented" collections (to distinguish from a 
"standalone" collection as returned from an action)
+Returning back to references, Isis also supports vector (multi-valued) 
references to another object instances in other words collections. We sometimes 
called these "parented" collections (to distinguish from a "standalone" 
collection as returned from an action)
 
 * Ensure that all domain classes implement `java.lang.Comparable`
 ** use the 
xref:rgcms.adoc#_rgcms_classes_utility_ObjectContracts[`ObjectContracts`] 
utility class to help implement `Comparable`
@@ -530,7 +530,7 @@ Thus:
 * Inject the 
xref:rgsvc.adoc#_rgsvc_api_ActionInvocationContext[`ActionInteractionContext`] 
(request-scoped) service
 * Use the `ActionInteractionContext` service to determine whether the action 
was invoked in bulk or as a regular action.
 * return null if invoked on a collection; the Wicket viewer will go back to 
the original collection
-** (if return non-null, then Wicket viewer will navigate to the object of the 
last invocation� generally not what is required)
+** (if return non-null, then Wicket viewer will navigate to the object of the 
last invocation generally not what is required)
 
 The similar xref:rgsvc.adoc#_rgsvc_api_Scratchpad[`Scratchpad`] 
(request-scoped) domain service is a good way to share information between bulk 
action invocations:
 

Reply via email to