Author: buildbot
Date: Tue Dec 8 14:56:22 2015
New Revision: 974977
Log:
Staging update by buildbot for olingo
Modified:
websites/staging/olingo/trunk/content/ (props changed)
websites/staging/olingo/trunk/content/contribute.html
Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 8 14:56:22 2015
@@ -1 +1 @@
-1718625
+1718628
Modified: websites/staging/olingo/trunk/content/contribute.html
==============================================================================
--- websites/staging/olingo/trunk/content/contribute.html (original)
+++ websites/staging/olingo/trunk/content/contribute.html Tue Dec 8 14:56:22
2015
@@ -124,14 +124,15 @@ h2:hover > .headerlink, h3:hover > .head
<li>Submit your JIRA ticket to receive feedback</li>
</ol>
<h3 id="clone-the-olingo-project">Clone the Olingo Project<a
class="headerlink" href="#clone-the-olingo-project" title="Permanent
link">¶</a></h3>
-<p>The current development version can be found in the Apache git repository.
Please note that there are two different repositories, one for Version 2 and
one for Version 4 of the OData protocol.</p>
+<p>The current development version can be found in the Apache git repository.
+Please note Olingo provides two different libraries. One one hand Olingo V2
which implements the OData V2 specification and Olingo V4, which implements the
OData V4 specification.</p>
<p>To clone the current master branch of the Olingo project please use one of
the following commands:</p>
-<p><strong>OData V2 Code</strong></p>
+<p><strong>Olingo V2 Code</strong></p>
<div class="codehilite"><pre><span class="n">git</span> <span
class="n">clone</span> <span class="n">https</span><span
class="p">:</span><span class="o">//</span><span class="n">git</span><span
class="o">-</span><span class="n">wip</span><span class="o">-</span><span
class="n">us</span><span class="p">.</span><span class="n">apache</span><span
class="p">.</span><span class="n">org</span><span class="o">/</span><span
class="n">repos</span><span class="o">/</span><span class="n">asf</span><span
class="o">/</span><span class="n">olingo</span><span class="o">-</span><span
class="n">odata2</span>
</pre></div>
-<p><strong>OData V4 code</strong></p>
+<p><strong>Olingo V4 code</strong></p>
<div class="codehilite"><pre><span class="n">git</span> <span
class="n">clone</span> <span class="n">https</span><span
class="p">:</span><span class="o">//</span><span class="n">git</span><span
class="o">-</span><span class="n">wip</span><span class="o">-</span><span
class="n">us</span><span class="p">.</span><span class="n">apache</span><span
class="p">.</span><span class="n">org</span><span class="o">/</span><span
class="n">repos</span><span class="o">/</span><span class="n">asf</span><span
class="o">/</span><span class="n">olingo</span><span class="o">-</span><span
class="n">odata4</span>
</pre></div>
@@ -155,7 +156,7 @@ The Olingo project uses the following de
<li>Critical - The bug should be resolved immediately and must be fixed before
the next major release.</li>
<li>Major - This bug should be resolved as soon as possible in the normal
course of development activity, before the software is released.</li>
<li>Minor (<strong>default</strong>) - This bug should be repaired after
serious bugs have been fixed.</li>
-<li>Trivial -It can be resolved in a future major system revision or not be
resolved at all.</li>
+<li>Trivial - It can be resolved in a future major system revision or not be
resolved at all.</li>
</ul>
<p>The default priority is <strong>Minor</strong>.</p>
<h3 id="develop-the-according-bugfix-feature">Develop the according bugfix /
feature<a class="headerlink" href="#develop-the-according-bugfix-feature"
title="Permanent link">¶</a></h3>
@@ -178,7 +179,7 @@ You have done several commits and want t
</pre></div>
-<p>First rebase your local history to create a single commit. After that
create a patch file using git format-patch. Now you can upload and append your
created patch file to the JIRA issue.</p>
+<p>First rebase your local history to create a single commit. After that
create a patch file using <code>git format-patch</code>. Now you can upload and
append your created patch file to the JIRA issue.</p>
<p><strong>Example - Appling a patch file</strong> <br />
You like to apply a patch file named "OLINGO_42.patch". Use the following
commands:</p>
<div class="codehilite"><pre><span class="n">git</span> <span
class="n">am</span> <span class="o">--</span><span class="n">signoff</span>
0001<span class="o">-</span><span class="n">Test</span><span
class="p">.</span><span class="n">patch</span>
