Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2008-07-09 08:01:38 +0000
committerlgoubet2008-07-09 08:01:38 +0000
commitbe597d8f8a56f28edd370c83e36322e36544ad4d (patch)
treeee62a10379b7d29752c37cb4dcfc3dca279061ca
parent775883a13279003c97a7409cb05caeef440b1f5e (diff)
downloadorg.eclipse.emf.compare-be597d8f8a56f28edd370c83e36322e36544ad4d.tar.gz
org.eclipse.emf.compare-be597d8f8a56f28edd370c83e36322e36544ad4d.tar.xz
org.eclipse.emf.compare-be597d8f8a56f28edd370c83e36322e36544ad4d.zip
Correction de l'anglais
-rw-r--r--doc/org.eclipse.emf.compare.doc/tutorials/rst/Architecture.rst17
-rw-r--r--doc/org.eclipse.emf.compare.doc/tutorials/rst/EMF_Compare_Export_Tutorial.rst4
-rw-r--r--doc/org.eclipse.emf.compare.doc/tutorials/rst/User_Guide.rst19
3 files changed, 19 insertions, 21 deletions
diff --git a/doc/org.eclipse.emf.compare.doc/tutorials/rst/Architecture.rst b/doc/org.eclipse.emf.compare.doc/tutorials/rst/Architecture.rst
index 7f7be8169..1a49b1afb 100644
--- a/doc/org.eclipse.emf.compare.doc/tutorials/rst/Architecture.rst
+++ b/doc/org.eclipse.emf.compare.doc/tutorials/rst/Architecture.rst
@@ -2,34 +2,33 @@
EMF Compare Architecture
============================
-:Authors: Cédric
+:Authors: Cédric Brun
:Contact: cedric.brun@obeo.fr
-.. contents:: Table Of Contents
-
.. include:: <isonum.txt>
Copyright |copy| 2007-2008, Obeo\ |trade|.
+.. contents:: Table Of Contents
Comparison process
==================
-The comparison process is divided in 2 phases: matching and differencing.
-The matching phase browses the model version figuring out which element comes from which other one, then the differencing process browses the matching result and create the corresponding delta.
-This delta may itself be serialized as a model.
+The comparison process is divided in 2 phases : matching and differencing. The matching phase browses both models trying to figure out which element of model
+1 corresponds to which element of model 2. The differencing process then browses the result of the matching and creates the corresponding delta. The result of
+both phases can be serialized as models.
.. image:: ../images/Process.png
Plugins Architecture
=======================
-Here are the plugin architecture of the EMF Compare component :
+Here is the plugin architecture of the EMF Compare component :
.. image:: ../images/Plugins.png
API's
=====
-
-The red boxes in the following picture are the places you can plug your own engine / extend the default behavior.
+The red boxes in the following picture represent the component which were designed for extensibility. On all of these components can be plugged your own engines
+or behavior.
.. image:: ../images/compare_general_extensibility.png
diff --git a/doc/org.eclipse.emf.compare.doc/tutorials/rst/EMF_Compare_Export_Tutorial.rst b/doc/org.eclipse.emf.compare.doc/tutorials/rst/EMF_Compare_Export_Tutorial.rst
index 2838a9b7f..b9a0dc5e1 100644
--- a/doc/org.eclipse.emf.compare.doc/tutorials/rst/EMF_Compare_Export_Tutorial.rst
+++ b/doc/org.eclipse.emf.compare.doc/tutorials/rst/EMF_Compare_Export_Tutorial.rst
@@ -5,12 +5,12 @@ Adding new actions to the export menu
:Authors: Laurent Goubet
:Contact: laurent.goubet@obeo.fr
-.. contents:: Table Of Contents
-
.. include:: <isonum.txt>
Copyright |copy| 2007-2008, Obeo\ |trade|.
+.. contents:: Table Of Contents
+
Source Code
-----------
diff --git a/doc/org.eclipse.emf.compare.doc/tutorials/rst/User_Guide.rst b/doc/org.eclipse.emf.compare.doc/tutorials/rst/User_Guide.rst
index c3f78ba8b..a2bf433ac 100644
--- a/doc/org.eclipse.emf.compare.doc/tutorials/rst/User_Guide.rst
+++ b/doc/org.eclipse.emf.compare.doc/tutorials/rst/User_Guide.rst
@@ -1,16 +1,16 @@
-========================
+=======================
EMF Compare User Guide
-========================
+=======================
-:Authors: Cédric
+:Authors: Cédric Brun
:Contact: cedric.brun@obeo.fr
-.. contents:: Table Of Contents
-
.. include:: <isonum.txt>
Copyright |copy| 2007-2008, Obeo\ |trade|.
+.. contents:: Table Of Contents
+
Installation
============
@@ -20,10 +20,9 @@ or the build bits from the download page : <http://www.eclipse.org/modeling/emf
Requirements
------------
EMF Compare depends on:
-#. EMF runtime
-#. Eclipse Platform (if you don't want to run EMF Compare in "standalone mode".
-
+#. EMF runtime
+#. Eclipse Platform (if you don't want to run EMF Compare in "standalone mode").
Configuration
=============
@@ -38,7 +37,7 @@ You may add your own extension using the Preferences view / Global / Content-typ
Usage
-----
-Once activated you can compare your file (localy or from any Configuration Management System supported by the Team API) using the "compare with" menu in Eclipse.
+Once activated you can compare your file (locally or from any Configuration Management System supported by the Team API) using the "compare with" menu in Eclipse.
.. image:: ../images/CompareUI.png
@@ -53,5 +52,5 @@ The following areas are highlighted in the picture :
7. Merge all non conflicting differences (left to right or right to left)
8. Display properties differences
-Note that buttons may be disabled depending on whether you are using Configuration Management System or not.
+Note that some actions may be disabled depending on whether you are using VCS or not.

Back to the top