Document daemon command
[TortoiseGit.git] / doc / source / en / TortoiseMerge / tme_preface.xml
blobf03a77d3d6d40880b5d7e5ec1db2f2d39b6e452b
1 <?xml version="1.0" encoding="UTF-8"?>\r
2 <!DOCTYPE preface SYSTEM "../../dtd/dblite.dtd">\r
3 <preface id="tme-preface" xmlns:xi="http://www.w3.org/2001/XInclude">\r
4     <title>Preface</title>\r
5     <simplesect>\r
6         <graphic srccredit="TortoiseGitMerge Logo" fileref="images/tortoisemerge_logo_hor468x64.png"/>\r
7     </simplesect>\r
8     <simplesect>\r
9         <para>\r
10             When working on a project, either an open-source project where\r
11             several people review your code, or a commercial\r
12             project where you sell a component with your source code, there will\r
13             be people and customers who find bugs or want to improve your\r
14             project. To do that they send you patches which you have to review\r
15             and decide if you want to apply them.\r
16         </para>\r
17         <para>\r
18             TortoiseGitMerge helps you with both those tasks:\r
19             <itemizedlist>\r
20                 <listitem>\r
21                     <para>\r
22                         Reviewing patches\r
23                     </para>\r
24                 </listitem>\r
25                 <listitem>\r
26                     <para>\r
27                         Applying the patches\r
28                     </para>\r
29                 </listitem>\r
30             </itemizedlist>\r
31         </para>\r
32         <para>\r
33             TortoiseGitMerge also helps you to sort out conflicted files which can\r
34             occur if you're working with a source control system and others\r
35             are working on the same files as you.\r
36         </para>\r
37     </simplesect>\r
38     <!-- ================================================================= -->\r
39     <!-- ========================   SECTION 1 ============================ -->\r
40     <!-- ================================================================= -->\r
41     <sect1 id="tme-preface-source">\r
42         <title>TortoiseGitMerge is free!</title>\r
43         <para>\r
44             TortoiseGitMerge is free. You don't have to pay for it, you can use it\r
45             any way you want. It is developed under the GP license (GPL).\r
46         </para>\r
47         <para>\r
48             TortoiseGitMerge is an Open Source project. That means you have full\r
49             read access to the source code of this program. You can browse it\r
50             on this link\r
51             <ulink url="http://code.google.com/p/tortoisegit/source/browse/">\r
52                 <citetitle>http://code.google.com/p/tortoisegit/source/browse/</citetitle>\r
53             </ulink>.\r
54         </para>\r
55         <xi:include href="../wishlist.xml"/>\r
56     </sect1>\r
57     <!-- ================================================================= -->\r
58     <!-- ========================   SECTION 2 ============================ -->\r
59     <!-- ================================================================= -->\r
60     <sect1 id="tme-preface-acknowledgements">\r
61         <title>Acknowledgments</title>\r
62         <para>\r
63                 TortoiseGitMerge is a port of TortoiseMerge (from TortoiseSVN project).\r
64         </para>\r
65         <para>\r
66             <variablelist>\r
67                 <varlistentry>\r
68                     <term>\r
69                         Stefan Küng\r
70                     </term>\r
71                     <listitem>\r
72                         <para>\r
73                             for the hard work on TortoiseMerge\r
74                         </para>\r
75                     </listitem>\r
76                 </varlistentry>\r
77                 <varlistentry>\r
78                     <term>\r
79                         Lübbe Onken\r
80                     </term>\r
81                     <listitem>\r
82                         <para>\r
83                             for the beautiful icons, logo, bug hunting and\r
84                             taking care of the documentation\r
85                         </para>\r
86                     </listitem>\r
87                 </varlistentry>\r
88                 <varlistentry>\r
89                     <term>\r
90                         Frank Li and Sven Strickroth\r
91                     </term>\r
92                     <listitem>\r
93                         <para>\r
94                             for the porting TortoiseMerge to TortoiseGitMerge, the (Tortoise)Git version.\r
95                         </para>\r
96                     </listitem>\r
97                 </varlistentry>\r
98                 <varlistentry>\r
99                     <term>\r
100                         The Tigris Style project\r
101                     </term>\r
102                     <listitem>\r
103                         <para>\r
104                             for some of the styles which are reused in this\r
105                             documentation\r
106                         </para>\r
107                     </listitem>\r
108                 </varlistentry>\r
109                 <varlistentry>\r
110                     <term>\r
111                         Our Contributors\r
112                     </term>\r
113                     <listitem>\r
114                         <para>\r
115                             for the patches, bug reports and new ideas, and for\r
116                             helping others by answering questions on our mailing list.\r
117                         </para>\r
118                     </listitem>\r
119                 </varlistentry>\r
120                 <varlistentry>\r
121                     <term>\r
122                         Our Donators\r
123                     </term>\r
124                     <listitem>\r
125                         <para>\r
126                             for many hours of joy with the music they sent us\r
127                         </para>\r
128                     </listitem>\r
129                 </varlistentry>\r
130             </variablelist>\r
131         </para>\r
132     <graphic srccredit="hide" fileref="images/background.png" />\r
133     </sect1>\r
134 </preface>\r