Abstract: Methods and systems of merging a first document with at least a second document to generate a third document. Each of the first and second documents includes at least one data unit. Each data unit is associated with a unit identifier and an edit identifier. The unit identifiers of each of the documents are compared to the unit identifiers of the other document to determine whether each unit identifier is a matching or non-matching unit identifier. Edit identifiers of the data units associated with the matching unit identifiers are compared to each other. Data units associated with the non-matching unit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the matching edit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the non-matching edit identifiers are merged into the third document.

Abstract: A collaborative authoring application provides an authoring environment in which two or more users can edit a document concurrently. Each user edits a copy of the document, sends updates to a master copy of the document, and receives updates from the master copy of the document. The authoring environment generally inhibits the users from providing conflicting editing instructions to the master copy of the document. For example, each user can generate a content lock about one or more data units within the document. The authoring environment may synchronize content locks automatically and content only at the request of the user.

Abstract: A collaborative authoring application provides an authoring environment in which two or more users can edit a document concurrently. Each user edits a copy of the document, sends updates to a master copy of the document, and receives updates from the master copy of the document. The authoring environment generally inhibits the users from providing conflicting editing instructions to the master copy of the document. For example, each user can generate a content lock about one or more data units within the document. The authoring environment may synchronize content locks automatically and content only at the request of the user.

Abstract: Tools and techniques for synchronizing metadata and document content across client systems using different communication channels are provided. These tools may define logical communication channels between client software components, and may allocate one of these channels to synchronizing updates to the contents of documents shared between these client components. These tools may allocate another one of the communication channels to synchronizing metadata between the client components, with the metadata describing activity pertaining to the shared documents. The client components may receive indications of activity made by users to the document contents, and may create metadata representing the activity. These client components may then transmit this metadata, using the further communication channel, to any number of other client components automatically in real time with the updates.

Abstract: Example systems and methods are directed at maintaining and retrieving presence metadata. One example method includes receiving a request from a first client to edit a document file, and sending short-term check out metadata to the first client to begin an editing session. The method also includes writing the transition ID to a transition table stored in a cache, wherein the presence of another transition ID in the cache indicates that a document has switched from a single-client mode to a multi-client mode. An example system includes a processing unit operative to receive a document, the document including short-term check out metadata indicating an editing session has begun, ping a cache to determine if another transition ID is stored in the cache, and send a transition ID to a transition table stored in a cache to switch from a single-client mode to a multi-client mode.

Abstract: Examples are related to systems and methods for controlling access to document files on a document server. One example system includes document files stored on a document server, at least one of the document files referencing a file lock, and a document access processing module. The example document access processing module includes a file sharing processing module that determines a coauthoring status of a software application of a client computer requesting access to the document file, and a file lock processing module that stores one or more file locks and that controls the setting and resetting of file locks. The example document access processing module uses the coauthoring status of the software application and the file lock status of a document file to determine whether a software application is permitted to have write access to the document file.

Abstract: A collaborative authoring application provides an authoring environment in which two or more users can edit a document concurrently. Each user edits a copy of the document, sends updates to a master copy of the document, and receives updates from the master copy of the document. The authoring environment may be configured into a public mode of operation, in which content and metadata are synchronized automatically, or into a private mode of operation, in which metadata is synchronized automatically and content is synchronized only at the request of the user. The authoring application may edit documents offline in public or private mode.

Abstract: Methods and systems of merging a first document with at least a second document to generate a third document. Each of the first and second documents includes at least one data unit. Each data unit is associated with a unit identifier and an edit identifier. The unit identifiers of each of the documents are compared to the unit identifiers of the other document to determine whether each unit identifier is a matching or non-matching unit identifier. Edit identifiers of the data units associated with the matching unit identifiers are compared to each other. Data units associated with the non-matching unit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the matching edit identifiers are inserted directly into the third document. Data units associated with the matching unit identifiers and the non-matching edit identifiers are merged into the third document.

Abstract: A collaborative authoring application provides an authoring environment in which two or more users can edit a document concurrently. Each user edits a copy of the document, sends updates to a master copy of the document, and receives updates from the master copy of the document. The authoring environment generally inhibits the users from providing conflicting editing instructions to the master copy of the document. For example, each user can generate a content lock about one or more data units within the document. The authoring environment may synchronize content locks automatically and content only at the request of the user.