D. Gregory, A. J. Abowd, and . Dix, Giving undo attention, Interacting with Computers, vol.4, issue.3, pp.317-342, 1992.

J. Benmouffok, J. Busca, M. Manuelmarqù-es, P. Shapiro, G. Sutra et al., Telex : A semantic platform for cooperative application development, Conférence Française de Systèmes d'Exploitation (CFSE), 2009.
URL : https://hal.archives-ouvertes.fr/inria-00444792

A. Brodnik, S. Carlsson, E. D. Demaine, J. I. Munro, and R. Sedgewick, Resizable Arrays in Optimal Time and Space, Workshop on Algorithms and Data Structures, pp.37-48, 1999.
DOI : 10.1007/3-540-48447-7_4

B. Berliner, . Cvs, and . Ii, Parallelizing software development, Proceedings of the USENIX Winter 1990 Technical Conference, pp.341-352, 1990.

P. Kenneth, T. A. Birman, and . Joseph, Reliable communication in the presence of failures, ACM Transactions on Computer Systems, vol.5, issue.1, pp.47-76, 1987.

P. Kenneth, A. Birman, P. Schiper, and . Stephenson, Lightweigt causal and atomic group multicast, ACM Transactions on Computer Systems, vol.9, issue.3, pp.272-314, 1991.

R. Choudhary and P. Dewan, A General Multi-User Undo/Redo Model, Proceedings of the Fourth European Conference on Computer- Supported Cooperative Work (ECSCW '95), pp.231-246, 1995.
DOI : 10.1007/978-94-011-0349-7_15

S. Ratnasamy, L. Breslau, N. Lanham, and S. Shenker, Making gnutella-like p2p systems scalable, ACM SIGCOMM 2003 Conference on Applications, Technologies, Architectures, and Protocols for Computer Communication, pp.407-418, 2003.

F. Cristian, Understanding fault-tolerant distributed systems, Communications of the ACM, vol.34, issue.2, pp.56-78, 1991.
DOI : 10.1145/102792.102801

[. Clarke, O. Sandberg, B. Wiley, and T. W. Hong, Freenet: A Distributed Anonymous Information Storage and Retrieval System, Workshop on Design Issues in Anonymity and Unobservability, pp.46-66, 2000.
DOI : 10.1007/3-540-44702-4_4

B. Du and E. A. Brewer, Dtwiki, Proceeding of the 17th international conference on World Wide Web , WWW '08, pp.945-952, 2008.
DOI : 10.1145/1367497.1367624

A. Demers, D. Greene, C. Hauser, W. Irish, J. Larson et al., Epidemic algorithms for replicated database maintenance, Proceedings of the sixteenth annual ACM Symposium on Principles of Distributed Computing - PODC'87, pp.1-12, 1987.
DOI : 10.1145/43921.43922

[. Daswani, H. Garcia-molina, and B. Yang, Open Problems in Data-Sharing Peer-to-Peer Systems, 2003.
DOI : 10.1007/3-540-36285-1_1

X. Défago, A. Schiper, and P. Urbán, Total order broadcast and multicast algorithms, ACM Computing Surveys, vol.36, issue.4, pp.372-421, 2004.
DOI : 10.1145/1041680.1041682

C. A. Ellis and S. J. Gibbs, Concurrency control in groupware systems, Special Interest Group On Management Of Data (SIGMOD) Conference, pp.399-407, 1989.

. Egh-+-03-]-p, . Th, R. Eugster, S. B. Guerraoui, P. Handurukande et al., Lightweight probabilistic broadcast, ACM Trans. Comput. Syst, vol.21, issue.4, pp.341-374, 2003.

C. A. Ellis, S. J. Gibbs, and G. L. Rein, Groupware: some issues and experiences, Communications of the ACM, vol.34, issue.1, pp.39-58, 1991.
DOI : 10.1145/99977.99987
URL : http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.105.6398

A. Ronaldo, C. Ferreira, P. Grothoff, and . Ruth, A transport layer abstraction for peer-to-peer networks, Proceedings of Global and Peerto-Peer Computing 2003, pp.398-405, 2003.

C. Fidge, Logical time in distributed computing systems, Computer, vol.24, issue.8, pp.28-33, 1991.
DOI : 10.1109/2.84874

J. Ferrié, N. Vidot, and M. Cart, Concurrent Undo Operations in Collaborative Environments Using Operational Transformation, On the Move to Meaningful Internet Systems 2004 : CoopIS, DOA, and ODBASE -OTM Confederated International Conferences, pp.155-173, 2004.
DOI : 10.1007/978-3-540-30468-5_12

K. P. Gupta, R. Birman, and V. Renesse, Fighting fire with fire: using randomized gossip to combat stochastic scalability limits, Quality and Reliability Engineering International, vol.1, issue.3, pp.165-184, 2002.
DOI : 10.1002/qre.473

A. Gidenstam and M. Papatriantafilou, Adaptive plausible clocks, 24th International Conference on Distributed Computing Systems, 2004. Proceedings., pp.86-93, 2003.
DOI : 10.1109/ICDCS.2004.1281571

R. Hazemi and L. A. Macaulay, User requirements for undo support in cscw, British Computer Society Human Computer Interaction, pp.181-193, 1995.

C. Ignat, G. Oster, P. Molli, M. Cart, J. Ferrié et al., A Comparison of Bibliographie Optimistic Approaches to Collaborative Editing of Wiki Pages, Proceedings of the International Conference on Collaborative Computing : Networking , Applications and Worksharing -CollaborateCom, p.10, 2007.

R. Johansen and . Groupware, Computer Support for Business Teams, 1988.

[. Jiménez-peris, M. Patiño-martínez, B. Kemme, and G. Alonso, How to select a replication protocol according to scalability, availability and communication overhead, Proceedings 20th IEEE Symposium on Reliable Distributed Systems, pp.24-33, 2001.
DOI : 10.1109/RELDIS.2001.969732

R. Paul, R. H. Johnson, and . Thomas, RFC 677 : Maintenance of duplicate databases, Janvier, 1975.

A. Kermarrec, A. I. Rowstron, M. Shapiro, and P. Druschel, The IceCube approach to the reconciliation of divergent replicas, Proceedings of the twentieth annual ACM symposium on Principles of distributed computing , PODC '01, pp.210-218, 2001.
DOI : 10.1145/383962.384020
URL : https://hal.archives-ouvertes.fr/hal-01248215

A. D. Kshemkalyani and M. Singhal, Necessary and sufficient conditions on information for causal message ordering and their optimal implementation, Distributed Computing, vol.11, issue.2, pp.91-111, 1998.
DOI : 10.1007/s004460050044

L. Lamport, Time, clocks, and the ordering of events in a distributed system, Communications of the ACM, vol.21, issue.7, pp.558-565, 1978.
DOI : 10.1145/359545.359563

L. Lamport, The part-time parliament, ACM Transactions on Computer Systems, vol.16, issue.2, pp.133-169, 1998.
DOI : 10.1145/279227.279229

A. Paul-benjamin-lowry, M. R. Curtis, and . Lowry, Building a taxonomy and nomenclature of collaborative writing to improve interdisciplinary research and practice, Journal of Business Communication, 2004.

[. Ladin, B. Liskov, L. Shrira, and S. Ghemawat, Providing high availability using lazy replication, ACM Transactions on Computer Systems, vol.10, issue.4, pp.360-391, 1992.
DOI : 10.1145/138873.138877
URL : http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.49.2456

M. Letia, N. Preguiça, and M. Shapiro, CRDTs : Consistency without concurrency control, SOSP Workshop on Large Scale Distributed Systems and Middleware (LADIS), 2009.
DOI : 10.1145/1773912.1773921
URL : https://hal.archives-ouvertes.fr/inria-00397981

[. Mattern, Virtual time and global states of distributed systems, Proceedings of the International Workshop on Parallel and Distributed Algorithms, pp.215-226, 1989.

. Mediawiki, Api :query -properties, 2010.

M. Cart and J. Ferrié, Asynchronous reconciliation based on operational transformation for P2P collaborative environments, 2007 International Conference on Collaborative Computing: Networking, Applications and Worksharing (CollaborateCom 2007), 2007.
DOI : 10.1109/COLCOM.2007.4553821
URL : https://hal.archives-ouvertes.fr/lirmm-00189691

C. Joseph and . Morris, Distriwiki : : a distributed peer-to-peer wiki network, Int. Sym. Wikis, pp.69-74, 2007.

D. Malkhi and M. K. Reiter, Byzantine quorum systems, Distributed Computing, vol.11, issue.4, pp.203-213, 1998.
DOI : 10.1007/s004460050050
URL : http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.113.7381

A. Mostéfaoui and M. Raynal, Low cost consensus-based Atomic Broadcast, Proceedings. 2000 Pacific Rim International Symposium on Dependable Computing, pp.45-52, 2000.
DOI : 10.1109/PRDC.2000.897283

E. W. Myers, AnO(ND) difference algorithm and its variations, Algorithmica, vol.21, issue.1, pp.251-266, 1986.
DOI : 10.1007/BF01840446

A. David, P. Nichols, M. Curtis, J. Dixon, and . Lamping, Highlatency , low-bandwidth windowing in the jupiter collaboration system, UIST '95 : Proceedings of the 8th annual ACM symposium on User interface and software technology, pp.111-120, 1995.

S. [. Navaratnam, G. W. Chanson, and . Neufeld, Reliable group communication in distributed systems, [1988] Proceedings. The 8th International Conference on Distributed, pp.439-446, 1988.
DOI : 10.1109/DCS.1988.12546

]. B. Bibliographie-[-neu94 and . Neuman, Scale in distributed systems, Readings in Distributed Computing Systems, pp.463-489, 1994.

S. Noël and J. Robert, Empirical study on collaborative writing : What do co-authors do, use, and like ? Computer Supported Cooperative Work -JCSCW, pp.63-89, 2004.

O. Tim, J. Reilly, and . Battelle, Web squared : Web 2.0 five years on, 2009.

O. James, M. Brien, and . Shapiro, An application framework for nomadic, collaborative applications, Int. Conf. on Dist. App. and Interop. Sys. (DAIS), pp.48-63, 2006.

G. Oster, P. Urso, and P. Molli, Proving correctness of transformation functions in collaborative editing systems, 2005.
URL : https://hal.archives-ouvertes.fr/inria-00071213

[. Oster, P. Urso, P. Molli, and A. Imine, Data consistency for P2P collaborative editing, Proceedings of the 2006 20th anniversary conference on Computer supported cooperative work , CSCW '06, pp.259-267, 2006.
DOI : 10.1145/1180875.1180916
URL : https://hal.archives-ouvertes.fr/inria-00108523

[. Oster, P. Urso, P. Molli, and A. Imine, Tombstone Transformation Functions for Ensuring Consistency in Collaborative Editing Systems, 2006 International Conference on Collaborative Computing: Networking, Applications and Worksharing, 2006.
DOI : 10.1109/COLCOM.2006.361867
URL : https://hal.archives-ouvertes.fr/inria-00109039

A. Prakash and M. J. Knister, A framework for undoing actions in collaborative systems, ACM Transactions on Computer-Human Interaction, vol.1, issue.4, pp.295-330, 1994.
DOI : 10.1145/198425.198427

[. Preguiça, J. Manuelmarqù-es, M. Shapiro, and M. Letia, A Commutative Replicated Data Type for Cooperative Editing, 2009 29th IEEE International Conference on Distributed Computing Systems, 2009.
DOI : 10.1109/ICDCS.2009.20

R. Prakash, M. Raynal, and M. Singhal, An Adaptive Causal Ordering Algorithm Suited to Mobile Computing Environments, Journal of Parallel and Distributed Computing, vol.41, issue.2, pp.190-204, 1997.
DOI : 10.1006/jpdc.1996.1300

S. Plantikow, A. Reinefeld, and F. Schintke, Transactions for Distributed Wikis on Structured Overlays, 18th IFIP/IEEE International Workshop on Distributed Systems : Operations and Management, pp.256-267, 2007.
DOI : 10.1007/BF01786254

[. Perng, M. K. Reiter, and C. Wang, Censorship Resistance Revisited, 7th international workshop on Information Hiding, pp.62-76, 2005.
DOI : 10.1007/11558859_6
URL : http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.73.6906

I. T. Antony, P. Rowstron, and . Druschel, Pastry : Scalable, decentralized object location, and routing for large-scale peer-to-peer systems, Middleware IFIP/ACM international conference on distributed systems platforms, pp.329-350, 2001.

M. Ressel and R. Gunzenhäuser, Reducing the problems of group undo, Proceedings of the international ACM SIGGROUP conference on Supporting group work , GROUP '99, pp.131-139, 1999.
DOI : 10.1145/320297.320312

H. Roh, J. Kim, and J. Lee, How to design optimistic operations for peer-to-peer replication, Proceedings of the 9th Joint Conference on Information Sciences (JCIS), 2006.
DOI : 10.2991/jcis.2006.245

[. Ressel, D. Nitsche-ruhland, and R. Gunzenhäuser, An integrating, transformation-oriented approach to concurrency control and undo in group editors, Proceedings of the 1996 ACM conference on Computer supported cooperative work , CSCW '96, pp.288-297, 1996.
DOI : 10.1145/240080.240305

S. Rozet, git-wiki : because who needs cool names when you use git ? Wikipedia, p.2, 2008.

S. Rahhal, H. Weiss, P. Skaf-molli, P. Urso, and . Molli, Undo in peer-to-peer semantic wikis, 4th Semantic Wiki Workshop (SemWiki 2009) at the 6th European Semantic Web Conference, 2009.
URL : https://hal.archives-ouvertes.fr/inria-00366317

[. Salz, InterNetNews : Usenet transport for Internet sites, USENIX conference proceedings, pp.93-98, 1992.

P. Sutra, J. Barreto, and M. Shapiro, Decentralised Commitment for Optimistic Semantic Replication, International Conference on CO- OPERATIVE INFORMATION SYSTEM, 2007.
DOI : 10.1007/978-3-540-76848-7_21
URL : https://hal.archives-ouvertes.fr/inria-00444783

M. Suleiman, M. Cart, and J. Ferrié, Serialization of concurrent operations in a distributed collaborative environment, Proceedings of the international ACM SIGGROUP conference on Supporting group work : the integration challenge the integration challenge, GROUP '97, pp.435-445, 1997.
DOI : 10.1145/266838.267369

X. Sun, Y. Jia, Y. Zhang, D. Yang, and . Chen, Achieving convergence, causality preservation, and intention preservation in real-time cooperative editing systems, ACM Transactions on Computer-Human Interaction, vol.5, issue.1, pp.63-108, 1998.
DOI : 10.1145/274444.274447

[. Skaf-molli, C. Ignat, C. Rahhal, and P. Molli, New work modes for collaborative writing, Enterprise Information Systems and Web Technologies, pp.176-182, 2007.
URL : https://hal.archives-ouvertes.fr/inria-00129222

[. Skaf-molli, C. Ignat, C. Rahhal, and P. Molli, New work modes for collaborative writing, International Conference on Enterprise Information Systems and Web Technologies (EISWT-07), p.7, 2007.
URL : https://hal.archives-ouvertes.fr/inria-00129222

M. Shapiro and N. Preguiça, Designing a commutative replicated data type, 2007.
URL : https://hal.archives-ouvertes.fr/inria-00177693

Y. Saito and M. Shapiro, Optimistic replication, ACM Computing Surveys, vol.37, issue.1, pp.42-81, 2005.
DOI : 10.1145/1057977.1057980
URL : https://hal.archives-ouvertes.fr/inria-00444768

D. Sun and C. Sun, Operation context and context-based operational transformation, Proceedings of the 2006 20th anniversary conference on Computer supported cooperative work , CSCW '06, pp.279-288, 2006.
DOI : 10.1145/1180875.1180918

D. Sun and C. Sun, Context-Based Operational Transformation in Distributed Collaborative Editing Systems, IEEE Transactions on Parallel and Distributed Systems, vol.20, issue.10, pp.1454-1470, 2009.
DOI : 10.1109/TPDS.2008.240

[. Sun, Undo any operation at any time in group editors, Proceedings of the 2000 ACM conference on Computer supported cooperative work , CSCW '00, pp.191-200, 2000.
DOI : 10.1145/358916.358990

[. Sun, S. Xia, C. Sun, and D. Chen, Operational transformation for collaborative word processing, Proceedings of the 2004 ACM conference on Computer supported cooperative work , CSCW '04, pp.437-446, 2004.
DOI : 10.1145/1031607.1031681

J. Francisco, M. Torres-rojas, and . Ahamad, Plausible clocks : Constant size logical clocks for distributed systems, Distributed Computing, vol.12, issue.4, pp.179-195, 1999.

D. B. Terry, M. M. Theimer, K. Petersen, A. J. Demers, M. J. Spreitzer et al., Managing update conflicts in Bayou, a weakly connected replicated storage system, Proceedings of the fifteenth ACM symposium on Operating systems principles -SOSP'95, pp.172-182, 1995.

[. Vidot, M. Cart, J. Ferrié, and M. Suleiman, Copies convergence in a distributed real-time collaborative environment, Proceedings of the 2000 ACM conference on Computer supported cooperative work , CSCW '00, pp.171-180, 2000.
DOI : 10.1145/358916.358988
URL : https://hal.archives-ouvertes.fr/hal-00684563

[. Vidot, Convergence des copies dans un environnements collaboratifs répartis, 2002.

J. S. Vitter, US&R: A New Framework for Redoing, IEEE Software, vol.1, issue.4, pp.39-52, 1984.
DOI : 10.1109/MS.1984.229460

T. J. Gene, A. J. Wuu, and . Bernstein, Efficient solutions to the replicated log and dictionary problems, ACM Symposium on Principles of Distributed Computing, pp.233-242, 1984.

]. Wik, . Wikimedia, and . Wikipedia, The free encyclopedia that anyone can edit

S. Weiss, P. Urso, and P. Molli, An Undo Framework for P2P Collaborative Editing, The 4th International Conference on Collaborative Computing, 2008.
DOI : 10.1007/978-3-540-30468-5_12
URL : https://hal.archives-ouvertes.fr/inria-00432373

[. Weiss, P. Urso, and P. Molli, Logoot: A Scalable Optimistic Replication Algorithm for Collaborative Editing on P2P Networks, 2009 29th IEEE International Conference on Distributed Computing Systems, 2009.
DOI : 10.1109/ICDCS.2009.75
URL : https://hal.archives-ouvertes.fr/inria-00432368

[. Weiss, P. Urso, and P. Molli, Logoot-Undo: Distributed Collaborative Editing System on P2P Networks, IEEE Transactions on Parallel and Distributed Systems, vol.21, issue.8, pp.1162-1174, 2010.
DOI : 10.1109/TPDS.2009.173
URL : https://hal.archives-ouvertes.fr/hal-00450416

H. Yu and A. Vahdat, The costs and limits of availability for replicated services, ACM Symposium on Operating Systems Principles (SOSP), pp.29-42, 2001.

. Dans-ce-manuscrit, ´ edition collaborative qui nous permet de formaliser le modèle CCI. Dans ce modèle, nous proposons Logoot, un type de données répliqué commutatif (CRDT) pour les documents texte. Par la suite, nous définissons un mécanisme d'annulation générique pour les types de données CRDT. Nous appliquons notre mécanisme d'annulation sur Logoot pour obtenir un CRDT texte avec la fonctionnalité d'annulation appelée Logoot +, Nous proposons finalement uné evaluation comparative des approches Logoot et Logoot + ` a partir des modifications produites sur plus de 2000 pages de Wikipédia