You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by bu...@apache.org on 2015/08/13 13:45:41 UTC

svn commit: r961713 - in /websites/staging/olingo/trunk/content: ./ doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html doc/odata4/tutorials/sqo_tcs/tutorial_sqo_tcs.html

Author: buildbot
Date: Thu Aug 13 11:45:41 2015
New Revision: 961713

Log:
Staging update by buildbot for olingo

Modified:
    websites/staging/olingo/trunk/content/   (props changed)
    websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html
    websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_tcs/tutorial_sqo_tcs.html

Propchange: websites/staging/olingo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Aug 13 11:45:41 2015
@@ -1 +1 @@
-1695447
+1695682

Modified: websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html Thu Aug 13 11:45:41 2015
@@ -103,7 +103,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>In the present tutorial, we will continue implementing <strong>OData system query options</strong>.
 After we have learned the rather simple system query options <code>$top</code>, <code>$skip</code> and <code>$count</code> in the previous tutorial, we’re going to deal with <code>$select</code> and <code>$expand</code> in the present tutorial.</p>
 <p><strong>Note:</strong><br />
-The full implementation of the OData service as described in the present tutorial can be found in the <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_Navigation.zip">attached zip file</a> that contains an Eclipse project that can be imported into your Eclipse workspace.</p>
+The full implementation of the OData service as described in the present tutorial can be found in the <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip">attached zip file</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.asc">pgp</a>) that contains an Eclipse project that can be imported into your Eclipse workspace.</p>
 <p><strong>Disclaimer:</strong><br />
 Again, in the present tutorial, we’ll focus only on the relevant implementation, in order to keep the code small and simple. The sample code as it is, shouldn’t be reused for advanced scenarios.</p>
 <p><strong>Table of Contents</strong></p>
@@ -130,7 +130,7 @@ Again, in the present tutorial, we’
 <hr />
 <h1 id="3-implementation">3. Implementation<a class="headerlink" href="#3-implementation" title="Permanent link">&para;</a></h1>
 <p>Open the class <code>myservice.mynamespace.service.DemoEntityProcessor</code><br />
-The method <code>readEntity()</code> contains the code for navigation which was treated in Tutorial Part 4. In the current tutorial we want to focus on query options and to keep the code as simple as possible, we delete the code of the <code>readEntity()</code> method and start from scratch.</p>
+The method <code>readEntity()</code> contains the code for navigation which was treated in Tutorial Part 4. In the current tutorial we want to focus on query options and to keep the code as simple as possible, therefore we delete the code of the <code>readEntity()</code> method and start from scratch.</p>
 <h2 id="31-implement-select">3.1. Implement <code>$select</code><a class="headerlink" href="#31-implement-select" title="Permanent link">&para;</a></h2>
 <p><strong>Background</strong><br />
 When requesting an entity collection from the backend, the OData service returns a list of entities and each entity contains a list of properties.<br />
@@ -142,7 +142,7 @@ This parameter can be specified in the f
 <li>Specify a comma-separated list of properties: <code>$select=Name,Description</code></li>
 <li>Specify a star to include all properties: <code>$select=*</code></li>
 </ul>
-<p><strong>Example</strong>
+<p><strong>Example</strong><br />
 First, just to remember how the full payload looks like, the “normal” query of the product without query options:<br />
 <a href="http://localhost:8080/DemoService/DemoService.svc/Products">http://localhost:8080/DemoService/DemoService.svc/Products</a></p>
 <p><img alt="AllProductsNoQueryOption" src="responseProducts_Full.jpg" title="The full list of Products" /></p>
@@ -251,25 +251,27 @@ The drawback of this implementation is,
 </pre></div>
 
 
-<h2 id="32-implement-expand">3.2. Implement $expand<a class="headerlink" href="#32-implement-expand" title="Permanent link">&para;</a></h2>
+<h2 id="32-implement-expand">3.2. Implement <code>$expand</code><a class="headerlink" href="#32-implement-expand" title="Permanent link">&para;</a></h2>
 <p><strong>Background</strong></p>
-<p>In order to understand the $expand system query option, let’s first quickly recap what we’ve learned in the navigation-tutorial:</p>
+<p>In order to understand the <code>$expand</code> system query option, let’s first quickly recap what we’ve learned in the navigation-tutorial:</p>
 <ol>
-<li>In order to be able to navigate from one entity to another entity, we need at least 2 EntityTypes and at least one NavigationProperty</li>
-</ol>
-<p><img alt="Metadata" src="metadataNav.jpg" title="Declaring the navigation in the metadata" /></p>
-<ol>
-<li>We can invoke one single entity, e.g. display one product:</li>
-</ol>
-<p><img alt="Products(1)SingleRead" src="responseProducts_1.jpg" title="The result of a single read" /></p>
-<ol>
-<li>And we can follow the navigation to the second entity, by appending the navigation property name, e.g. invoke the category of that product.
-  As we’ve seen in the metadata above, the name of the navigation property is <em>Category</em></li>
+<li>
+<p>In order to be able to navigate from one entity to another entity, we need at least 2 EntityTypes and at least one NavigationProperty
+      <img alt="Metadata" src="metadataNav.jpg" title="Declaring the navigation in the metadata" /></p>
+</li>
+<li>
+<p>We can invoke one single entity, e.g. display one product:
+      <img alt="Products(1)SingleRead" src="responseProducts_1.jpg" title="The result of a single read" /></p>
+</li>
+<li>
+<p>And we can follow the navigation to the second entity, by appending the navigation property name, e.g. invoke the category of that product.
+  As we’ve seen in the metadata above, the name of the navigation property is <em>Category</em>
+      <img alt="Products(1)NavToCat" src="responseProducts_1_navCat.jpg" title="Navigating from a Product to its Category" /></p>
+</li>
 </ol>
-<p><img alt="Products(1)NavToCat" src="responseProducts_1_navCat.jpg" title="Navigating from a Product to its Category" /></p>
 <p>We have executed two requests to our OData service, in order to obtain the data for the product and for its related category.<br />
 Now, since the category info is so tightly bound to the selected product, we’d like to get the same info by executing only <strong>one</strong> request.</p>
-<p>This can be achieved with the $expand  </p>
+<p>This can be achieved with the <code>$expand</code>  </p>
 <p>The URL is built as follows:  </p>
 <ul>
 <li>specify the request URI for the single read operation: <a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)">http://localhost:8080/DemoService/DemoService.svc/Products(1)</a>  </li>
@@ -278,7 +280,7 @@ Now, since the category info is so tight
 <li>specify the name of the desired navigation property:  <a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category">http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category</a>  </li>
 </ul>
 <p>As a result, the data of both entities is provided within one payload.<br />
-The data of the target entity is presented <em>“inline”</em>, which means as a child element of the source entity.  </p>
+The data of the target entity is presented <em>inline</em>, which means as a child element of the source entity.  </p>
 <p><img alt="Products(1)Expanded" src="responseProducts_1_expandCat.jpg" title="The Product with its expanded Category" /></p>
 <p>One more advantage is that the system query option <code>$expand</code> can also be applied to an entity collection:</p>
 <p><img alt="AllProductsExpanded" src="responseProducts_expandCat.jpg" title="All Products with expanded Category" /></p>
@@ -290,11 +292,11 @@ The implementation for the entity collec
 <p>In brief, what we have to do is: fetch the data for both entities and merge into one entity</p>
 <p>We can distinguish the following steps:  </p>
 <ol>
-<li>Retrieve the ExpandOption from Uri<br />
+<li>Retrieve the ExpandOption from Uri.<br />
   In our example: <code>$expand=Category</code>  </li>
-<li>Retrieve the (target) EdmEntityType which corresponds to the expand
+<li>Retrieve the (target) EdmEntityType which corresponds to the expand.<br />
   In our example: <em>Category</em>  </li>
-<li>Build the response data for the entity, enriched with the data of the expand entity<br />
+<li>Build the response data for the entity, enriched with the data of the expand entity.<br />
   In our example: <em>product1</em> merged with <em>category1</em>  </li>
 </ol>
 <p>Let's have a detailed look.</p>
@@ -309,7 +311,7 @@ The implementation for the entity collec
 <p>In brief: <code>ExpandOption</code> -&gt; <code>NavigationProperty</code> -&gt; <code>EdmEntityType</code>  </p>
 <p>From the <code>ExpandOption</code>, we can get the ExpandItems.<br />
 An <code>ExpandItem</code> corresponds to the name of the navigation property.<br />
-So for the URL <a href="http://localhost:8080/DemoService/DemoService.svc/Products?$expand=Category">http://localhost:8080/DemoService/DemoService.svc/Products?$expand=Category</a> we get one ExpandItem, which corresponds to the navigation property <em>Category</em>.  </p>
+So for the URL <a href="http://localhost:8080/DemoService/DemoService.svc/Products?$expand=Category">http://localhost:8080/DemoService/DemoService.svc/Products?$expand=Category</a> we get one <code>ExpandItem</code>, which corresponds to the navigation property <em>Category</em>.  </p>
 <p>In the present tutorial, we’re keeping the implementation as simple as possible.
 So we’re relying on the fact that our example service only contains one navigation property per entity type.
 Therefore, we can directly access the first <code>ExpandItem</code>.  </p>
@@ -406,7 +408,7 @@ Also, the <code>expandOption</code> has
                                   <span class="o">.</span><span class="na">selectList</span><span class="o">(</span><span class="n">selectList</span><span class="o">)</span>
                                   <span class="o">.</span><span class="na">suffix</span><span class="o">(</span><span class="n">Suffix</span><span class="o">.</span><span class="na">ENTITY</span><span class="o">).</span><span class="na">build</span><span class="o">();</span>
 
-<span class="c1">// make sure that $expand and $select are considered by the serializer</span>
+<span class="c1">// make sure that `$expand` and $select are considered by the serializer</span>
 <span class="c1">// adding the selectOption to the serializerOpts will actually tell the lib to do the job</span>
 <span class="n">EntitySerializerOptions</span> <span class="n">opts</span> <span class="o">=</span> <span class="n">EntitySerializerOptions</span><span class="o">.</span><span class="na">with</span><span class="o">()</span>
                                                       <span class="o">.</span><span class="na">contextURL</span><span class="o">(</span><span class="n">contextUrl</span><span class="o">)</span>
@@ -418,7 +420,7 @@ Also, the <code>expandOption</code> has
 
 <p><strong>Note:</strong><br />
 The complete <code>readEntity(...)</code> method can be found in the <em>Appendix</em> at the end of the site or together with the <code>readEntityCollection(...)</code> method in the <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip">sample project zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.asc">pgp</a>).</p>
-<h2 id="33-implement-expand-with-options">3.3. Implement $expand with options<a class="headerlink" href="#33-implement-expand-with-options" title="Permanent link">&para;</a></h2>
+<h2 id="33-implement-expand-with-options">3.3. Implement <code>$expand</code> with options<a class="headerlink" href="#33-implement-expand-with-options" title="Permanent link">&para;</a></h2>
 <p><strong>Background</strong></p>
 <p>As of OData v4 spec, the expand can also be further refined with system query options  </p>
 <p>Some samples:</p>
@@ -458,7 +460,7 @@ We only need to know from where to get t
 <li>Get the data for the navigation property (the normal expand)  </li>
 <li>Refine the result by applying the system query options  </li>
 </ul>
-<p><strong>Support for <code>$select</code> with <code>$expand</code></strong>
+<p><strong>Support for <code>$select</code> with <code>$expand</code></strong><br />
 Like described in section 3.1, the Olingo library provides support and convenience methods for <code>$select</code> implementation. So the necessary creation and pass of the <code>selectList</code> to the creation of <code>ContextURL</code> and pass of the <code>selectOptions</code> to the <code>EntitySerializerOptions</code> is already done (see also code sample in the final step in section 3.2).  </p>
 <hr />
 <h1 id="4-run-the-implemented-service">4. Run the implemented service<a class="headerlink" href="#4-run-the-implemented-service" title="Permanent link">&para;</a></h1>
@@ -486,19 +488,19 @@ Like described in section 3.1, the Oling
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category">http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category</a></li>
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category">http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category</a></li>
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Categories(1)?$expand=Products">http://localhost:8080/DemoService/DemoService.svc/Categories(1)?$expand=Products</a>
-  <strong>NOTE:</strong> In current <code>4.0.0-beta-03</code> version of Olingo is a minor bug which prevents the expand of a navigation which has the same name as an EntitySet (see <a href="https://issues.apache.org/jira/browse/OLINGO-741">OLINGO-741</a>).
-  Hence above link will work with latest SNAPSHOT version or the final <code>4.0.0</code> release.</li>
+    <strong>NOTE:</strong> In current <code>4.0.0-beta-03</code> version of Olingo is a minor bug which prevents the expand of a navigation which has the same name as an EntitySet (see <a href="https://issues.apache.org/jira/browse/OLINGO-741">OLINGO-741</a>).
+    Hence above link will work with latest SNAPSHOT version or the final <code>4.0.0</code> release.</li>
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Categories(1)?$expand=*">http://localhost:8080/DemoService/DemoService.svc/Categories(1)?$expand=*</a></li>
 </ul>
 </li>
 <li>
-<p>Using <code>$select</code> and $expand  </p>
+<p>Using <code>$select</code> and <code>$expand</code>  </p>
 <ul>
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)?$select=Name&amp;$expand=Category">http://localhost:8080/DemoService/DemoService.svc/Products(1)?$select=Name&amp;$expand=Category</a>  </li>
 </ul>
 </li>
 <li>
-<p>Using $expand with nested <code>$select</code><br />
+<p>Using <code>$expand</code> with nested <code>$select</code><br />
   We’re interested in <em>Product</em> and the name of its <em>Category</em></p>
 <ul>
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category($select=Name)">http://localhost:8080/DemoService/DemoService.svc/Products(1)?$expand=Category($select=Name)</a></li>
@@ -506,7 +508,7 @@ Like described in section 3.1, the Oling
 </ul>
 </li>
 <li>
-<p>Using <code>$select</code> and $expand with nested $select<br />
+<p>Using <code>$select</code> and <code>$expand</code> with nested $select<br />
   We’re interested in <em>Product</em> and its <em>Category</em>, but only the <em>name</em> of both  </p>
 <ul>
 <li><a href="http://localhost:8080/DemoService/DemoService.svc/Products(1)?$select=Name&amp;$expand=Category($select=Name)">http://localhost:8080/DemoService/DemoService.svc/Products(1)?$select=Name&amp;$expand=Category($select=Name)</a></li>
@@ -527,7 +529,7 @@ The same system query option expressions
 <li>Tutorial OData V4 service part 3: <a href="/doc/odata4/tutorials/write/tutorial_write.html">Write (Create, Update, Delete Entity)</a> | <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_Write.zip">sample project zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_Write.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_Write.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_Write.zip.asc">pgp</a>)  </li>
 <li>Tutorial OData V4 service, part 4: <a href="/doc/odata4/tutorials/navigation/tutorial_navigation.html">Navigation</a> | <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_Navigation.zip">sample project zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_Navigation.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_Navigation.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_Navigation.zip.asc">pgp</a>)</li>
 <li>Tutorial OData V4 service, part 5.1: <a href="/doc/odata4/tutorials/sqo_tcs/tutorial_sqo_tcs.html">System Query Options $top, $skip, $count</a> | <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip">sample project zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip.asc">pgp</a>)  </li>
-<li>Tutorial OData V4 service, part 5.2: <a href="/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html"> System Query Options $select, $expand (this page)</a> | <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip">sample project zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.asc">pgp</a>)  </li>
+<li>Tutorial OData V4 service, part 5.2: <a href="/doc/odata4/tutorials/sqo_es/tutorial_sqo_es.html">System Query Options $select, $expand (this page)</a> | <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip">sample project zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_es.zip.asc">pgp</a>)  </li>
 <li>Tutorial OData V4 service, part 5.3: System Query Options $orderby, $filter (to be announced)</li>
 </ul>
 <h3 id="further-reading">Further reading<a class="headerlink" href="#further-reading" title="Permanent link">&para;</a></h3>

Modified: websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_tcs/tutorial_sqo_tcs.html
==============================================================================
--- websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_tcs/tutorial_sqo_tcs.html (original)
+++ websites/staging/olingo/trunk/content/doc/odata4/tutorials/sqo_tcs/tutorial_sqo_tcs.html Thu Aug 13 11:45:41 2015
@@ -131,13 +131,13 @@ However, the user can change the order o
 <a href="http://localhost:8080/DemoService/DemoService.svc/Products?$top=2">http://localhost:8080/DemoService/DemoService.svc/Products?$top=2</a></p>
 <p><img alt="ProductsWith$top" src="responseTop2.jpg" title="The first 2 entries of the list of Products" /></p>
 <p>The following request returns the products starting with the 3rd and ignores the first 2 entries:
-<a href="http://localhost:8080/DemoService/DemoService.svc/Products?$skip=2">http://localhost:8080/DemoService/DemoService.svc/Products?<code>$skip</code>=2</a></p>
+<a href="http://localhost:8080/DemoService/DemoService.svc/Products?$skip=2">http://localhost:8080/DemoService/DemoService.svc/Products?$skip=2</a></p>
 <p><img alt="ProductsWith$skip" src="responseSkip2.jpg" title="Skipping the first 2 entries of the list of Products" /></p>
 <p>The following request returns the total number of products and includes it in the payload:<br />
-<a href="http://localhost:8080/DemoService/DemoService.svc/Products?$count=true">http://localhost:8080/DemoService/DemoService.svc/Products?<code>$count</code>=true</a></p>
+<a href="http://localhost:8080/DemoService/DemoService.svc/Products?$count=true">http://localhost:8080/DemoService/DemoService.svc/Products?$count=true</a></p>
 <p><img alt="ProductsWith$count" src="responseCount.jpg" title="The full list of Products with the count added in the payload" /></p>
 <p><strong>Note:</strong><br />
-The full implementation of the OData service as described in the present tutorial can be found in the attached zip file that contains an Eclipse project that can be imported into your Eclipse workspace.</p>
+The full implementation of the OData service as described in the present tutorial can be found in the <a href="http://www.apache.org/dyn/closer.cgi/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip">attached zip</a> (<a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip.sha512">sha512</a>, <a href="https://dist.apache.org/repos/dist/release/olingo/odata4/Tutorials/DemoService_Tutorial_sqo_tcs.zip.asc">pgp</a>) that contains an Eclipse project that can be imported into your Eclipse workspace.</p>
 <p><strong>Disclaimer:</strong><br />
 Again, in the present tutorial, we’ll focus only on the relevant implementation, in order to keep the code small and simple. The sample code shouldn’t be reused for advanced scenarios.</p>
 <p><strong>Table of Contents</strong></p>
@@ -165,7 +165,7 @@ Again, in the present tutorial, we’
 <p>Afterwards do a <em>Deploy and run</em>: it should be working.</p>
 <hr />
 <h1 id="3-implementing-system-query-options">3. Implementing system query options<a class="headerlink" href="#3-implementing-system-query-options" title="Permanent link">&para;</a></h1>
-<p>The system query options we’re focusing on are applied to the entity collection only (for example, it doesn’t make sense to apply a $top to a READ request of a single entity)</p>
+<p>The system query options we’re focusing on are applied to the entity collection only (for example, it doesn’t make sense to apply a <code>$top</code> to a READ request of a single entity)</p>
 <p>Therefore our implementation for all three query options is done in the class<br />
 <code>myservice.mynamespace.service.DemoEntityCollectionProcessor</code></p>
 <p>The general sequence of the implementation remains unchanged:</p>
@@ -266,7 +266,7 @@ With the query option <code>$skip</code>
 So if a user specifies <code>$skip=n</code> then our OData service has to return the list of entries starting at position n+1</p>
 <p>One important rule that we have to consider is described by the <a href="http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/part1-protocol/odata-v4.0-errata02-os-part1-protocol-complete.html#_Toc406398306">OData V4 specification</a>:  </p>
 <blockquote>
-<p>“Where $top and <code>$skip</code> are used together, <code>$skip</code> MUST be applied before $top, regardless of the order in which they appear in the request.”  </p>
+<p>“Where <code>$top</code> and <code>$skip</code> are used together, <code>$skip</code> MUST be applied before $top, regardless of the order in which they appear in the request.”  </p>
 </blockquote>
 <p>This means for us that we add the code for <code>$skip</code> before the code for <code>$top</code>.</p>
 <p><strong>Implementation</strong></p>
@@ -417,7 +417,7 @@ With the query option <code>$top</code>,
 <a href="http://localhost:8080/DemoService/DemoService.svc/Products?$count=true">http://localhost:8080/DemoService/DemoService.svc/Products?$count=true</a></p>
 </li>
 <li>
-<p>Combine $top and <code>$skip</code>
+<p>Combine <code>$top</code> and <code>$skip</code>
   <a href="http://localhost:8080/DemoService/DemoService.svc/Products?$skip=1&amp;$top=1">http://localhost:8080/DemoService/DemoService.svc/Products?$skip=1&amp;$top=1</a><br />
 <a href="http://localhost:8080/DemoService/DemoService.svc/Products?$top=1&amp;$skip=1">http://localhost:8080/DemoService/DemoService.svc/Products?$top=1&amp;$skip=1</a><br />
   Regardless of the order, the result should be the same</p>