incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r795783 - in /websites/production/odftoolkit: ./ content/odftoolkit/odfdom/Convenience Layer Design Ideas.html content/odftoolkit/odfdom/Development.html
Date Thu, 15 Sep 2011 07:59:24 GMT
Author: devinhan
Date: Thu Sep 15 07:59:23 2011
New Revision: 795783

Log:
Publishing merge to odftoolkit site by devinhan

Added:
    websites/production/odftoolkit/content/odftoolkit/odfdom/Convenience Layer Design Ideas.html
      - copied unchanged from r795782, websites/staging/odftoolkit/trunk/content/odftoolkit/odfdom/Convenience
Layer Design Ideas.html
Modified:
    websites/production/odftoolkit/   (props changed)
    websites/production/odftoolkit/content/odftoolkit/odfdom/Development.html

Propchange: websites/production/odftoolkit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 07:59:23 2011
@@ -1 +1 @@
-/websites/staging/odftoolkit/trunk:794771-795776
+/websites/staging/odftoolkit/trunk:794771-795782

Modified: websites/production/odftoolkit/content/odftoolkit/odfdom/Development.html
==============================================================================
--- websites/production/odftoolkit/content/odftoolkit/odfdom/Development.html (original)
+++ websites/production/odftoolkit/content/odftoolkit/odfdom/Development.html Thu Sep 15 07:59:23
2011
@@ -85,10 +85,10 @@
 <p>Setup Mercurial (optional):  <br />
 Config file $Hg Install DirMercurial.ini on Windows or <Hg Install Dir>/.hgrc on Unix.
 <br />
 Enhance the default configuration, using GIT diff and enable <a href="http://mercurial.selenic.com/wiki/Win32TextExtension">default
plugin</a> avoid different line breaks in the source.<br />
-<pre>
-    [ui]
-    username = your Name <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#121;&#111;&#117;&#114;&#76;&#111;&#103;&#105;&#110;&#78;&#97;&#109;&#101;&#64;&#111;&#100;&#102;&#116;&#111;&#111;&#108;&#107;&#105;&#116;&#46;&#111;&#114;&#103;">&#121;&#111;&#117;&#114;&#76;&#111;&#103;&#105;&#110;&#78;&#97;&#109;&#101;&#64;&#111;&#100;&#102;&#116;&#111;&#111;&#108;&#107;&#105;&#116;&#46;&#111;&#114;&#103;</a>
-    ;merge = your-merge-program (or internal:merge)</p>
+</p>
+<p>[ui]
+username = your Name <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#121;&#111;&#117;&#114;&#76;&#111;&#103;&#105;&#110;&#78;&#97;&#109;&#101;&#64;&#111;&#100;&#102;&#116;&#111;&#111;&#108;&#107;&#105;&#116;&#46;&#111;&#114;&#103;">&#121;&#111;&#117;&#114;&#76;&#111;&#103;&#105;&#110;&#78;&#97;&#109;&#101;&#64;&#111;&#100;&#102;&#116;&#111;&#111;&#108;&#107;&#105;&#116;&#46;&#111;&#114;&#103;</a>
+;merge = your-merge-program (or internal:merge)</p>
 <p>[diff]
 git = 1</p>
 <p>[defaults]
@@ -105,9 +105,10 @@ hgext.purge=</p>
 # Converts mixed line ending within a file to LF (Unix) format   <br />
 # before adding the file to the source repository  <br />
 # See http://mercurial.selenic.com/wiki/EolExtension  <br />
-only-consistent = False
-</pre>
-1. Get the <a href="http://odftoolkit.org/projects/odfdom/sources">ODFDOM source code</a>
from the odfdom~developer <a href="http://www.selenic.com/mercurial/wiki/">Mercurial</a>
repository. Please see below for a short introduction to using Mercurial on odftoolkit.org.
There's also a more general <a href="SourceControl.html">help</a> on how to use
source control systems on odftoolkit.org. The command <br />
+only-consistent = False</p>
+</li>
+<li>
+<p>Get the <a href="http://odftoolkit.org/projects/odfdom/sources">ODFDOM source
code</a> from the odfdom~developer <a href="http://www.selenic.com/mercurial/wiki/">Mercurial</a>
repository. Please see below for a short introduction to using Mercurial on odftoolkit.org.
There's also a more general <a href="SourceControl.html">help</a> on how to use
source control systems on odftoolkit.org. The command <br />
 <code>hg clone https://odftoolkit.org/hg/odfdom~developer</code> will download
the repository into a new directory.  <br />
 Please note that by this you'll get the latest changeset. If you for example want stable
release 0.8.6, you may want to use<br />
 <code>hg clone https://odftoolkit.org/hg/odfdom~developer -r v0.8.6</code></p>
@@ -254,10 +255,10 @@ button to base higher APIs on the stable
 <p><strong>Other Useful Pages</strong>   <br />
 </p>
 <ul>
-<li><a href="ODFDOM-Class-Structure.html">Class Structure in ODFDOM</a></li>
-<li>[Convenience Layer Design Ideas][25]</li>
+<li><a href="ODFDOM-Class-Structure.html">Class Structure in ODFDOM</a><br
/>
+</li>
+<li><a href="Convenience Layer Design Ideas.html">Convenience Layer Design Ideas</a></li>
 </ul>
-<p>[25]: Convenience Layer Design Ideas.html</p>
   </div>
 
   <div id="footera">



Mime
View raw message