summaryrefslogtreecommitdiffstats
path: root/helpcontent2/source/text/shared/guide/redlining_doccompare.xhp
blob: cf6c6e8d0d046b99b39d054eaec32792d2506d08 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************************
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
 *
 *         - GNU Lesser General Public License Version 2.1
 *         - Sun Industry Standards Source License Version 1.1
 *
 *  Sun Microsystems Inc., October, 2000
 *
 *  GNU Lesser General Public License Version 2.1
 *  =============================================
 *  Copyright 2000 by Sun Microsystems, Inc.
 *  901 San Antonio Road, Palo Alto, CA 94303, USA
 *
 *  This library is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU Lesser General Public
 *  License version 2.1, as published by the Free Software Foundation.
 *
 *  This library is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 *  Lesser General Public License for more details.
 *
 *  You should have received a copy of the GNU Lesser General Public
 *  License along with this library; if not, write to the Free Software
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 *  MA  02111-1307  USA
 *
 *
 *  Sun Industry Standards Source License Version 1.1
 *  =================================================
 *  The contents of this file are subject to the Sun Industry Standards
 *  Source License Version 1.1 (the "License"); You may not use this file
 *  except in compliance with the License. You may obtain a copy of the
 *  License at http://www.openoffice.org/license.html.
 *
 *  Software provided under this License is provided on an "AS IS" basis,
 *  WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
 *  WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
 *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
 *  See the License for the specific provisions governing your rights and
 *  obligations concerning the Software.
 *
 *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
 *
 *  Copyright: 2000 by Sun Microsystems, Inc.
 *
 *  All Rights Reserved.
 *
 *  Contributor(s): _______________________________________
 *
 *
 ************************************************************************-->
	
<helpdocument version="1.0">
<meta>
<topic id="textsharedguideredlining_doccomparexml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Comparing Versions of a Document</title>
<filename>/text/shared/guide/redlining_doccompare.xhp</filename>
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
<lastedited date="2004-07-26T10:16:25">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154788"><bookmark_value>documents; comparing</bookmark_value>
<bookmark_value>comparing documents</bookmark_value>
<bookmark_value>versions; comparing documents</bookmark_value>
<bookmark_value>changes; comparing</bookmark_value>
<bookmark_value>review function; comparing documents</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3154788" xml-lang="en-US" level="1" l10n="U" oldref="32"><variable id="redlining_doccompare"><link href="text/shared/guide/redlining_doccompare.xhp" name="Comparing Versions of a Document">Comparing Versions of a Document</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="33">If one of the authors has made changes to a document without recording them, you can compare the changed document to your original document.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153087" xml-lang="en-US" l10n="U" oldref="35">Open your original document and then choose <emph>Edit - Compare Document</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="36">A file selection dialog appears. Select the copy of the document and confirm the dialog.</paragraph>
<paragraph role="listitem" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="37">
<item type="productname">%PRODUCTNAME</item> combines both documents into your original document. All text passages that occur in your document but not in the copy are identified as having been inserted, and all text passages that are missing in your original document are identified as deletions.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="38">You can now accept the "insertions", in which case the relevant texts stay in their original form, or you can accept the "deletions", in which case the marked text contained in the copy is not inserted in your document.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
</body>
</helpdocument>