From b397264c7bf2d5a965c3677ccf0e8ced57d1efd2 Mon Sep 17 00:00:00 2001 From: William Drai Date: Wed, 10 Dec 2014 14:24:14 +0100 Subject: [PATCH] Typo in the doc --- .../src/asciidoc/graniteds-datamanagement-flex.adoc | 4 ++-- .../src/asciidoc/graniteds-datamanagement-javafx.adoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reference-docs/src/asciidoc/graniteds-datamanagement-flex.adoc b/reference-docs/src/asciidoc/graniteds-datamanagement-flex.adoc index 1f7d62a9..e01ccb3b 100644 --- a/reference-docs/src/asciidoc/graniteds-datamanagement-flex.adoc +++ b/reference-docs/src/asciidoc/graniteds-datamanagement-flex.adoc @@ -1538,11 +1538,11 @@ org.granite.tide.hibernate4.Hibernate4ChangeSetIntegrator ---- Once this is configured, it's also necessary to configure the client to be able to merge these incoming +ChangeSet+ objects -correctly. This can be done easily by setting up a +ChangeSetMerger+ components in your client context. +correctly. This can be done easily by setting up a +ChangeMerger+ components in your client context. [source,java] ---- -Tide.getInstance().addComponents([ChangeSetMerger]); +Tide.getInstance().addComponents([ChangeMerger]); ---- When all this is set up, *all* server to client updates will be sent as +ChangeSet+ objects. diff --git a/reference-docs/src/asciidoc/graniteds-datamanagement-javafx.adoc b/reference-docs/src/asciidoc/graniteds-datamanagement-javafx.adoc index 570c7278..c0e3b255 100644 --- a/reference-docs/src/asciidoc/graniteds-datamanagement-javafx.adoc +++ b/reference-docs/src/asciidoc/graniteds-datamanagement-javafx.adoc @@ -1117,11 +1117,11 @@ org.granite.tide.hibernate4.Hibernate4ChangeSetIntegrator ---- Once this is configured, it's also necessary to configure the client to be able to merge these incoming +ChangeSet+ objects -correctly. This can be done easily by setting up the +ChangeSetMerger+ components, for example: +correctly. This can be done easily by setting up the +ChangeMerger+ components, for example: [source,java] ---- -context.set(new ChangeSetMerger()); +context.set(new ChangeMerger()); ---- When all this is set up, *all* server to client updates will be sent as +ChangeSet+ objects.