You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/07/14 11:18:44 UTC
[1/3] isis-site git commit: docs for framework internal services,
bump archetype version, AppManifest.Util docs, swagger-ui screenshots
Repository: isis-site
Updated Branches:
refs/heads/asf-site c5f2b2e14 -> 99710b5f8
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/guides/tg.html
----------------------------------------------------------------------
diff --git a/content/guides/tg.html b/content/guides/tg.html
index a9dd2b0..6d84795 100644
--- a/content/guides/tg.html
+++ b/content/guides/tg.html
@@ -630,7 +630,7 @@ table.CodeRay td.code>pre{padding:0}
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=petclinic \
-D version=1.0-SNAPSHOT \
@@ -1479,7 +1479,7 @@ every time, specify the following system properties:</p>
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/guides/tg.pdf
----------------------------------------------------------------------
diff --git a/content/guides/tg.pdf b/content/guides/tg.pdf
index a535055..d7b9967 100644
--- a/content/guides/tg.pdf
+++ b/content/guides/tg.pdf
@@ -4,8 +4,8 @@
<< /Title (Tutorials)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160606183940+01'00')
-/ModDate (D:20160606183940+01'00')
+/CreationDate (D:20160714121616+01'00')
+/ModDate (D:20160714121616+01'00')
>>
endobj
2 0 obj
@@ -3694,7 +3694,7 @@ ET
BT
191.24 460.8250000000001 Td
/F4.0 11 Tf
-<312e31322e3220> Tj
+<312e31332e3020> Tj
ET
0.000 0.000 0.000 SCN
@@ -19709,7 +19709,7 @@ ET
BT
191.24 403.9450000000002 Td
/F4.0 11 Tf
-<312e31322e3220> Tj
+<312e31332e3020> Tj
ET
0.000 0.000 0.000 SCN
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/guides/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.html b/content/guides/ugfun.html
index 5ea7844..935fdbb 100644
--- a/content/guides/ugfun.html
+++ b/content/guides/ugfun.html
@@ -2224,7 +2224,7 @@ So, if you have used Apache Isis for prototyping (discussed above), then note th
<pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/guides/ugfun.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugfun.pdf b/content/guides/ugfun.pdf
index 627c838..eb3a72a 100644
--- a/content/guides/ugfun.pdf
+++ b/content/guides/ugfun.pdf
@@ -4,8 +4,8 @@
<< /Title (Fundamentals)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160712234852+01'00')
-/ModDate (D:20160712234852+01'00')
+/CreationDate (D:20160714121631+01'00')
+/ModDate (D:20160714121631+01'00')
>>
endobj
2 0 obj
@@ -30827,7 +30827,7 @@ ET
BT
191.24 622.9750000000003 Td
/F6.0 11 Tf
-<312e31322e3220> Tj
+<312e31332e3020> Tj
ET
0.000 0.000 0.000 SCN
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/images/isis-in-pictures/205-swagger-ui.png
----------------------------------------------------------------------
diff --git a/content/images/isis-in-pictures/205-swagger-ui.png b/content/images/isis-in-pictures/205-swagger-ui.png
new file mode 100644
index 0000000..e940d13
Binary files /dev/null and b/content/images/isis-in-pictures/205-swagger-ui.png differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/images/todoapp/swagger-ui.png
----------------------------------------------------------------------
diff --git a/content/images/todoapp/swagger-ui.png b/content/images/todoapp/swagger-ui.png
new file mode 100644
index 0000000..32239ae
Binary files /dev/null and b/content/images/todoapp/swagger-ui.png differ
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index c471e75..6eb7828 100644
--- a/content/index.html
+++ b/content/index.html
@@ -612,7 +612,7 @@ And I must say this: "Great Support from the development team"</p>
<div class="large-12 medium-12 columns">
<div class="description">
<h3 class="legend">Domain Driven Applications, Quickly</h3>
- <p>Apache Isis™ is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services or view models, and the framework dynamically generates a representation of that domain model as a webapp or a RESTful API.</p>
+ <p>Apache Isis™ is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services or view models, and the framework dynamically generates a representation of that domain model as a webapp or a rich hypermedia REST API.</p>
<p><a class="button btn btn-primary btn-lg learn-more" href="./documentation.html" role="button">Learn more �</a></p>
</div>
@@ -625,8 +625,8 @@ And I must say this: "Great Support from the development team"</p>
<div class="container">
<div class="row">
<div class="large-4 medium-4 columns">
- <h2>UI "for free"</h2>
- <p>Apache Isis dynamically builds a generic UI directly from the underlying domain objects.
+ <h2>UI & REST "for free"</h2>
+ <p>Apache Isis dynamically builds both a generic UI and also a rich hypermedia REST API directly from the underlying domain objects.
This makes for extremely rapid prototyping and a short feedback cycle, perfect for agile development.
The UI can also be extended for specific use cases, and can be themed using <a href="http://getbootstrap.com">Bootstrap</a>.</p>
<p><a class="button small info radius" href="./isis-in-pictures.html" role="button">See Apache Isis in action �</a></p>
@@ -682,6 +682,20 @@ And I must say this: "Great Support from the development team"</p>
<div class="row">
<div class="large-12 medium-12 columns">
+ <br/>
+ <br/>
+ <p>Apache Isis also provides a rich REST API with a full set of hypermedia controls. The framework provides two default representations, pluggable for other representations. The framework also automatically generates a Swagger spec to allow REST clients to be code-generated, and (for developers) exposes the REST API through the Swagger UI:</p>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="large-offset-1 large-10 medium-offset-1 medium-10 columns">
+ <a href="./images/todoapp/swagger-ui.png"><img src="./images/todoapp/swagger-ui.png" style="padding: 2px;border: 1px solid #021a40;" /></a>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="large-12 medium-12 columns">
<h4>Getting started</h4>
<br/>
<p>Start developing your own Apache Isis application using our <a href="guides/ugfun.html#_ugfun_getting-started_simpleapp-archetype">simpleapp archetype</a>:</p>
@@ -694,7 +708,7 @@ And I must say this: "Great Support from the development team"</p>
mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
- -D archetypeVersion=1.12.2 \
+ -D archetypeVersion=1.13.0 \
-D groupId=com.mycompany \
-D artifactId=myapp \
-D version=1.0-SNAPSHOT \
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/isis-in-pictures.html
----------------------------------------------------------------------
diff --git a/content/isis-in-pictures.html b/content/isis-in-pictures.html
index 8dc1bc5..2fc1367 100644
--- a/content/isis-in-pictures.html
+++ b/content/isis-in-pictures.html
@@ -789,7 +789,10 @@ for tabbed views introduced in v1.12.0.</p>
<h2 id="_rest_api">REST API</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>In addition to Apache Isis' Wicket viewer, it also provides a fully fledged REST API, as an implementation of the <a href="http://restfulobjects.org">Restful Objects</a> specification. The screenshot below shows accessing this REST API using a Chrome plugin:</p>
+<p>In addition to Apache Isis' Wicket viewer, it also provides a rich REST API with a full set of hypermedia controls, generated automatically from the domain objects (entities and view models). The framework provides two default representations, one an implementation of the <a href="http://restfulobjects.org">Restful Objects</a> spec, the other a simplified representation suitable for custom Javascript apps. Other representations can be plugged in.</p>
+</div>
+<div class="paragraph">
+<p>The screenshot below shows accessing the Restful Objects representation API accessed through a Chrome plugin:</p>
</div>
<div class="imageblock">
<div class="content">
@@ -797,7 +800,12 @@ for tabbed views introduced in v1.12.0.</p>
</div>
</div>
<div class="paragraph">
-<p>Like the Wicket viewer, the REST API is generated automatically from the domain objects (entities and view models).</p>
+<p>The framework also automatically integrates with Swagger, generating a Swagger spec from the underlying domain object model. From this spec REST clients can be code-generated; it also allows developers to play with the REST API through the Swagger UI:</p>
+</div>
+<div class="imageblock">
+<div class="content">
+<a class="image" href="images//isis-in-pictures/205-swagger-ui.png"><img src="images//isis-in-pictures/205-swagger-ui.png" alt="205 swagger ui" width="800px"></a>
+</div>
</div>
</div>
</div>
[2/3] isis-site git commit: docs for framework internal services,
bump archetype version, AppManifest.Util docs, swagger-ui screenshots
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/guides/rgcms.pdf
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.pdf b/content/guides/rgcms.pdf
index d7df1b8..f33ad63 100644
--- a/content/guides/rgcms.pdf
+++ b/content/guides/rgcms.pdf
@@ -4,8 +4,8 @@
<< /Title (Classes, Methods and Schema)
/Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
/Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20160712063952+01'00')
-/ModDate (D:20160712063952+01'00')
+/CreationDate (D:20160714121530+01'00')
+/ModDate (D:20160714121530+01'00')
>>
endobj
2 0 obj
@@ -23,7 +23,7 @@ endobj
3 0 obj
<< /Type /Pages
/Count 92
-/Kids [7 0 R 10 0 R 12 0 R 38 0 R 61 0 R 126 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 205 0 R 211 0 R 219 0 R 223 0 R 233 0 R 243 0 R 247 0 R 261 0 R 290 0 R 297 0 R 308 0 R 312 0 R 325 0 R 336 0 R 346 0 R 362 0 R 389 0 R 412 0 R 415 0 R 426 0 R 433 0 R 440 0 R 447 0 R 451 0 R 463 0 R 493 0 R 514 0 R 534 0 R 545 0 R 555 0 R 557 0 R 563 0 R 570 0 R 576 0 R 585 0 R 592 0 R 602 0 R 612 0 R 628 0 R 645 0 R 659 0 R 675 0 R 692 0 R 701 0 R 704 0 R 708 0 R 716 0 R 720 0 R 727 0 R 730 0 R 738 0 R 745 0 R 755 0 R 769 0 R 782 0 R 794 0 R 812 0 R 821 0 R 834 0 R 853 0 R 857 0 R 871 0 R 876 0 R 881 0 R 888 0 R 894 0 R 903 0 R 908 0 R 914 0 R 919 0 R 927 0 R 932 0 R 935 0 R 942 0 R 948 0 R 954 0 R 957 0 R]
+/Kids [7 0 R 10 0 R 12 0 R 38 0 R 61 0 R 126 0 R 150 0 R 155 0 R 163 0 R 168 0 R 172 0 R 177 0 R 187 0 R 191 0 R 194 0 R 205 0 R 211 0 R 219 0 R 223 0 R 233 0 R 243 0 R 247 0 R 261 0 R 290 0 R 297 0 R 308 0 R 312 0 R 325 0 R 336 0 R 346 0 R 362 0 R 389 0 R 412 0 R 415 0 R 426 0 R 433 0 R 440 0 R 446 0 R 449 0 R 455 0 R 483 0 R 497 0 R 521 0 R 539 0 R 551 0 R 557 0 R 563 0 R 570 0 R 576 0 R 585 0 R 592 0 R 602 0 R 612 0 R 628 0 R 645 0 R 659 0 R 675 0 R 692 0 R 701 0 R 704 0 R 708 0 R 716 0 R 720 0 R 727 0 R 730 0 R 738 0 R 745 0 R 755 0 R 769 0 R 782 0 R 794 0 R 812 0 R 821 0 R 834 0 R 853 0 R 857 0 R 871 0 R 876 0 R 881 0 R 888 0 R 894 0 R 903 0 R 908 0 R 914 0 R 919 0 R 927 0 R 932 0 R 935 0 R 942 0 R 948 0 R 954 0 R 957 0 R]
>>
endobj
4 0 obj
@@ -482,7 +482,7 @@ ET
BT
535.3009999999999 604.0159999999998 Td
/F1.0 10.5 Tf
-<3337> Tj
+<3338> Tj
ET
0.000 0.000 0.000 SCN
@@ -522,7 +522,7 @@ ET
BT
535.3009999999999 585.5359999999998 Td
/F1.0 10.5 Tf
-<3430> Tj
+<3431> Tj
ET
0.000 0.000 0.000 SCN
@@ -32292,7 +32292,7 @@ endobj
endobj
208 0 obj
<< /Limits [(_rgcms) (_rgcms_classes_lifecycleevent_AbstractLifecycleEvent)]
-/Names [(_rgcms) 13 0 R (_rgcms_classes) 416 0 R (_rgcms_classes_AppManifest-bootstrapping) 420 0 R (_rgcms_classes_contributee) 749 0 R (_rgcms_classes_domainevent) 528 0 R (_rgcms_classes_domainevent_AbstractDomainEvent) 549 0 R (_rgcms_classes_domainevent_ActionDomainEvent) 558 0 R (_rgcms_classes_domainevent_CollectionDomainEvent) 567 0 R (_rgcms_classes_domainevent_PropertyDomainEvent) 573 0 R (_rgcms_classes_i18n) 746 0 R (_rgcms_classes_i18n_TranslatableString) 747 0 R (_rgcms_classes_layout) 832 0 R (_rgcms_classes_layout_component) 844 0 R (_rgcms_classes_layout_grid-bootstrap3) 849 0 R (_rgcms_classes_lifecycleevent) 617 0 R (_rgcms_classes_lifecycleevent_AbstractLifecycleEvent) 666 0 R]
+/Names [(_rgcms) 13 0 R (_rgcms_classes) 416 0 R (_rgcms_classes_AppManifest-bootstrapping) 420 0 R (_rgcms_classes_contributee) 749 0 R (_rgcms_classes_domainevent) 530 0 R (_rgcms_classes_domainevent_AbstractDomainEvent) 549 0 R (_rgcms_classes_domainevent_ActionDomainEvent) 558 0 R (_rgcms_classes_domainevent_CollectionDomainEvent) 567 0 R (_rgcms_classes_domainevent_PropertyDomainEvent) 573 0 R (_rgcms_classes_i18n) 746 0 R (_rgcms_classes_i18n_TranslatableString) 747 0 R (_rgcms_classes_layout) 832 0 R (_rgcms_classes_layout_component) 844 0 R (_rgcms_classes_layout_grid-bootstrap3) 849 0 R (_rgcms_classes_lifecycleevent) 617 0 R (_rgcms_classes_lifecycleevent_AbstractLifecycleEvent) 666 0 R]
>>
endobj
209 0 obj
@@ -42494,7 +42494,7 @@ endobj
endobj
245 0 obj
<< /Limits [(alternatives-2) (appearance-in-the-ui-2)]
-/Names [(alternatives-2) 306 0 R (alternatives-3) 320 0 R (alternatives-4) 780 0 R (api) 421 0 R (api-2) 553 0 R (api-3) 561 0 R (api-4) 571 0 R (api-5) 577 0 R (appearance-in-the-ui) 788 0 R (appearance-in-the-ui-2) 797 0 R]
+/Names [(alternatives-2) 306 0 R (alternatives-3) 320 0 R (alternatives-4) 780 0 R (api) 421 0 R (api-2) 555 0 R (api-3) 561 0 R (api-4) 571 0 R (api-5) 577 0 R (appearance-in-the-ui) 788 0 R (appearance-in-the-ui-2) 797 0 R]
>>
endobj
246 0 obj
@@ -65737,7 +65737,7 @@ endobj
>>
endobj
425 0 obj
-<< /Length 36955
+<< /Length 36807
>>
stream
q
@@ -66126,10 +66126,107 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+2.938 Tw
+
BT
48.24 657.406 Td
/F1.0 10.5 Tf
-<626520736561726368656420666f7220646f6d61696e20736572766963657320616e6420656e7469746965732e> Tj
+<626520736561726368656420666f7220646f6d61696e2073657276696365732028616e6e6f7461746564207769746820> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+2.938 Tw
+
+BT
+315.7545454545454 657.406 Td
+/F3.0 10.5 Tf
+<40446f6d61696e53657276696365> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.938 Tw
+
+BT
+389.2545454545454 657.406 Td
+/F1.0 10.5 Tf
+<292c206d6978696e732028> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+2.938 Tw
+
+BT
+444.6482727272726 657.406 Td
+/F3.0 10.5 Tf
+<404d6978696e> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+2.938 Tw
+
+BT
+476.1482727272726 657.406 Td
+/F1.0 10.5 Tf
+<2920616e6420656e746974696573> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+48.24 641.626 Td
+/F1.0 10.5 Tf
+<28> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+51.873000000000005 641.626 Td
+/F3.0 10.5 Tf
+<4050657273697374656e6365436170616261626c65> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+162.123 641.626 Td
+/F1.0 10.5 Tf
+<292e> Tj
ET
0.000 0.000 0.000 SCN
@@ -66140,7 +66237,7 @@ ET
8.624 Tw
BT
-48.24 629.626 Td
+48.24 613.8459999999999 Td
/F1.0 10.5 Tf
<41732069732070657268617073206170706172656e742c2074686520> Tj
ET
@@ -66155,7 +66252,7 @@ ET
8.624 Tw
BT
-230.21245454545453 629.626 Td
+230.21245454545453 613.8459999999999 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -66170,7 +66267,7 @@ ET
8.624 Tw
BT
-293.21245454545453 629.626 Td
+293.21245454545453 613.8459999999999 Td
/F1.0 10.5 Tf
<206d6574686f64207265706c6163657320616e64206f766572726964657320626f746820746865> Tj
ET
@@ -66185,7 +66282,7 @@ ET
12.417 Tw
BT
-48.24 613.846 Td
+48.24 598.0659999999999 Td
/F3.0 10.5 Tf
<697369732e73657276696365732e5365727669636573496e7374616c6c657246726f6d416e6e6f746174696f6e2e7061636b616765507265666978> Tj
ET
@@ -66200,7 +66297,7 @@ ET
12.417 Tw
BT
-357.99 613.846 Td
+357.99 598.0659999999999 Td
/F1.0 10.5 Tf
[<206b> 20.01953125 <65792028757375616c6c7920666f756e6420696e20746865>] TJ
ET
@@ -66215,7 +66312,7 @@ ET
3.027 Tw
BT
-48.24 598.066 Td
+48.24 582.286 Td
/F3.0 10.5 Tf
<697369732e70726f70657274696573> Tj
ET
@@ -66230,7 +66327,7 @@ ET
3.027 Tw
BT
-126.99000000000001 598.066 Td
+126.99000000000001 582.286 Td
/F1.0 10.5 Tf
[<202066696c652920616e6420616c736f2074686560697369732e706572736973746f722e646174616e75636c6575732e5265676973746572456e7469746965732e7061636b61676550726566697860206b> 20.01953125 <6579>] TJ
ET
@@ -66245,7 +66342,7 @@ ET
3.365 Tw
BT
-48.24 582.2860000000001 Td
+48.24 566.506 Td
/F1.0 10.5 Tf
<28757375616c6c7920666f756e6420696e2074686520> Tj
ET
@@ -66260,7 +66357,7 @@ ET
3.365 Tw
BT
-168.4831818181818 582.2860000000001 Td
+168.4831818181818 566.506 Td
/F3.0 10.5 Tf
<706572736973746f725f646174616e75636c6575732e70726f70657274696573> Tj
ET
@@ -66275,7 +66372,7 @@ ET
3.365 Tw
BT
-336.48318181818183 582.2860000000001 Td
+336.48318181818183 566.506 Td
/F1.0 10.5 Tf
<2066696c65292e20205468652076616c7565206f662074686520> Tj
ET
@@ -66290,7 +66387,7 @@ ET
3.365 Tw
BT
-473.53999999999996 582.2860000000001 Td
+473.53999999999996 566.506 Td
/F3.0 10.5 Tf
<697369732e73657276696365732d> Tj
ET
@@ -66303,7 +66400,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 566.5060000000001 Td
+48.24 550.7259999999999 Td
/F3.0 10.5 Tf
<696e7374616c6c6572> Tj
ET
@@ -66314,7 +66411,7 @@ ET
0.200 0.200 0.200 SCN
BT
-95.49000000000001 566.5060000000001 Td
+95.49000000000001 550.7259999999999 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e2070726f706572747920697320616c736f2069676e6f7265642e>] TJ
ET
@@ -66325,7 +66422,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 538.7260000000001 Td
+48.24 522.9459999999999 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] TJ
ET
@@ -66336,7 +66433,7 @@ ET
0.259 0.545 0.792 SCN
BT
-186.70308984375 538.7260000000001 Td
+186.70308984375 522.9459999999999 Td
/F1.0 10.5 Tf
<49736973206164646f6e732720746f646f617070> Tj
ET
@@ -66347,7 +66444,7 @@ ET
0.200 0.200 0.200 SCN
BT
-288.49008984375 538.7260000000001 Td
+288.49008984375 522.9459999999999 Td
/F1.0 10.5 Tf
<20646566696e65732074686520666f6c6c6f77696e673a> Tj
ET
@@ -66356,28 +66453,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 522.910 m
-543.040 522.910 l
-545.249 522.910 547.040 521.119 547.040 518.910 c
-547.040 269.070 l
-547.040 266.861 545.249 265.070 543.040 265.070 c
-52.240 265.070 l
-50.031 265.070 48.240 266.861 48.240 269.070 c
-48.240 518.910 l
-48.240 521.119 50.031 522.910 52.240 522.910 c
+52.240 507.130 m
+543.040 507.130 l
+545.249 507.130 547.040 505.339 547.040 503.130 c
+547.040 253.290 l
+547.040 251.081 545.249 249.290 543.040 249.290 c
+52.240 249.290 l
+50.031 249.290 48.240 251.081 48.240 253.290 c
+48.240 503.130 l
+48.240 505.339 50.031 507.130 52.240 507.130 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 522.910 m
-543.040 522.910 l
-545.249 522.910 547.040 521.119 547.040 518.910 c
-547.040 269.070 l
-547.040 266.861 545.249 265.070 543.040 265.070 c
-52.240 265.070 l
-50.031 265.070 48.240 266.861 48.240 269.070 c
-48.240 518.910 l
-48.240 521.119 50.031 522.910 52.240 522.910 c
+52.240 507.130 m
+543.040 507.130 l
+545.249 507.130 547.040 505.339 547.040 503.130 c
+547.040 253.290 l
+547.040 251.081 545.249 249.290 543.040 249.290 c
+52.240 249.290 l
+50.031 249.290 48.240 251.081 48.240 253.290 c
+48.240 503.130 l
+48.240 505.339 50.031 507.130 52.240 507.130 c
h
S
Q
@@ -66385,7 +66482,7 @@ Q
0.333 0.333 0.333 SCN
BT
-59.24 500.0850000000001 Td
+59.24 484.305 Td
/F3.0 11 Tf
<404f76657272696465> Tj
ET
@@ -66396,7 +66493,7 @@ ET
0.000 0.533 0.000 SCN
BT
-59.24 485.3450000000001 Td
+59.24 469.565 Td
/F7.0 11 Tf
<7075626c6963> Tj
ET
@@ -66407,7 +66504,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 485.3450000000001 Td
+92.24000000000001 469.565 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -66418,7 +66515,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 485.3450000000001 Td
+97.74000000000001 469.565 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -66429,7 +66526,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 485.3450000000001 Td
+119.74000000000001 469.565 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -66440,7 +66537,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 485.3450000000001 Td
+125.24000000000001 469.565 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -66451,7 +66548,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 485.3450000000001 Td
+152.74 469.565 Td
/F3.0 11 Tf
<3c3f3e3e> Tj
ET
@@ -66462,7 +66559,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 485.3450000000001 Td
+174.74 469.565 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -66473,7 +66570,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 485.3450000000001 Td
+180.24 469.565 Td
/F3.0 11 Tf
<6765744d6f64756c6573> Tj
ET
@@ -66484,7 +66581,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 485.3450000000001 Td
+235.24 469.565 Td
/F3.0 11 Tf
<2829> Tj
ET
@@ -66495,7 +66592,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 485.3450000000001 Td
+246.24 469.565 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -66506,7 +66603,7 @@ ET
0.200 0.200 0.200 SCN
BT
-251.74 485.3450000000001 Td
+251.74 469.565 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -66517,7 +66614,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 470.6050000000001 Td
+59.24 454.825 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -66528,7 +66625,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 470.6050000000001 Td
+81.24000000000001 454.825 Td
/F7.0 11 Tf
<72657475726e> Tj
ET
@@ -66539,7 +66636,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 470.6050000000001 Td
+114.24000000000001 454.825 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -66550,7 +66647,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 470.6050000000001 Td
+119.74000000000001 454.825 Td
/F3.0 11 Tf
<417272617973> Tj
ET
@@ -66561,7 +66658,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 470.6050000000001 Td
+152.74 454.825 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66572,7 +66669,7 @@ ET
0.200 0.400 0.600 SCN
BT
-158.24 470.6050000000001 Td
+158.24 454.825 Td
/F3.0 11 Tf
<61734c697374> Tj
ET
@@ -66583,7 +66680,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 470.6050000000001 Td
+191.24 454.825 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -66594,7 +66691,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 455.86500000000007 Td
+59.24 440.085 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -66605,7 +66702,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 455.86500000000007 Td
+125.24000000000001 440.085 Td
/F3.0 11 Tf
<546f446f417070446f6d61696e4d6f64756c65> Tj
ET
@@ -66616,7 +66713,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 455.86500000000007 Td
+229.74 440.085 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66627,7 +66724,7 @@ ET
0.200 0.400 0.600 SCN
BT
-235.24 455.86500000000007 Td
+235.24 440.085 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -66638,7 +66735,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 455.86500000000007 Td
+262.74 440.085 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -66649,7 +66746,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 441.12500000000006 Td
+59.24 425.34499999999997 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -66660,7 +66757,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 441.12500000000006 Td
+125.24000000000001 425.34499999999997 Td
/F3.0 11 Tf
<546f446f417070466978747572654d6f64756c65> Tj
ET
@@ -66671,7 +66768,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 441.12500000000006 Td
+235.24 425.34499999999997 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66682,7 +66779,7 @@ ET
0.200 0.400 0.600 SCN
BT
-240.74 441.12500000000006 Td
+240.74 425.34499999999997 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -66693,7 +66790,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 441.12500000000006 Td
+268.24 425.34499999999997 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -66704,7 +66801,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 426.3850000000001 Td
+59.24 410.605 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -66715,7 +66812,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 426.3850000000001 Td
+125.24000000000001 410.605 Td
/F3.0 11 Tf
<546f446f4170704170704d6f64756c65> Tj
ET
@@ -66726,7 +66823,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 426.3850000000001 Td
+213.24 410.605 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66737,7 +66834,7 @@ ET
0.200 0.400 0.600 SCN
BT
-218.74 426.3850000000001 Td
+218.74 410.605 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -66748,7 +66845,7 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 426.3850000000001 Td
+246.24 410.605 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -66759,7 +66856,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 411.6450000000001 Td
+59.24 395.865 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -66770,7 +66867,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 411.6450000000001 Td
+125.24000000000001 395.865 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -66781,7 +66878,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 411.6450000000001 Td
+141.74 395.865 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66792,7 +66889,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 411.6450000000001 Td
+147.24 395.865 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -66803,7 +66900,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 411.6450000000001 Td
+202.24 395.865 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66814,7 +66911,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 411.6450000000001 Td
+207.74 395.865 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -66825,7 +66922,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 411.6450000000001 Td
+240.74 395.865 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66836,7 +66933,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 411.6450000000001 Td
+246.24 395.865 Td
/F3.0 11 Tf
<6175646974> Tj
ET
@@ -66847,7 +66944,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 411.6450000000001 Td
+273.74 395.865 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66858,7 +66955,7 @@ ET
0.200 0.400 0.600 SCN
BT
-279.24 411.6450000000001 Td
+279.24 395.865 Td
/F3.0 11 Tf
<41756469744d6f64756c65> Tj
ET
@@ -66869,7 +66966,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 411.6450000000001 Td
+339.74 395.865 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66880,7 +66977,7 @@ ET
0.200 0.400 0.600 SCN
BT
-345.24 411.6450000000001 Td
+345.24 395.865 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -66891,7 +66988,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 411.6450000000001 Td
+372.74 395.865 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -66902,7 +66999,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 396.9050000000001 Td
+59.24 381.125 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -66913,7 +67010,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 396.9050000000001 Td
+125.24000000000001 381.125 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -66924,7 +67021,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 396.9050000000001 Td
+141.74 381.125 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66935,7 +67032,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 396.9050000000001 Td
+147.24 381.125 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -66946,7 +67043,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 396.9050000000001 Td
+202.24 381.125 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66957,7 +67054,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 396.9050000000001 Td
+207.74 381.125 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -66968,7 +67065,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 396.9050000000001 Td
+240.74 381.125 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -66979,7 +67076,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 396.9050000000001 Td
+246.24 381.125 Td
/F3.0 11 Tf
<636f6d6d616e64> Tj
ET
@@ -66990,7 +67087,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 396.9050000000001 Td
+284.74 381.125 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67001,7 +67098,7 @@ ET
0.200 0.400 0.600 SCN
BT
-290.24 396.9050000000001 Td
+290.24 381.125 Td
/F3.0 11 Tf
<436f6d6d616e644d6f64756c65> Tj
ET
@@ -67012,7 +67109,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 396.9050000000001 Td
+361.74 381.125 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67023,7 +67120,7 @@ ET
0.200 0.400 0.600 SCN
BT
-367.24 396.9050000000001 Td
+367.24 381.125 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67034,7 +67131,7 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 396.9050000000001 Td
+394.74 381.125 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -67045,7 +67142,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 382.1650000000001 Td
+59.24 366.385 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -67056,7 +67153,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 382.1650000000001 Td
+125.24000000000001 366.385 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -67067,7 +67164,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 382.1650000000001 Td
+141.74 366.385 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67078,7 +67175,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 382.1650000000001 Td
+147.24 366.385 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -67089,7 +67186,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 382.1650000000001 Td
+202.24 366.385 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67100,7 +67197,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 382.1650000000001 Td
+207.74 366.385 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -67111,7 +67208,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 382.1650000000001 Td
+240.74 366.385 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67122,7 +67219,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 382.1650000000001 Td
+246.24 366.385 Td
/F3.0 11 Tf
<6465767574696c73> Tj
ET
@@ -67133,7 +67230,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 382.1650000000001 Td
+290.24 366.385 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67144,7 +67241,7 @@ ET
0.200 0.400 0.600 SCN
BT
-295.74 382.1650000000001 Td
+295.74 366.385 Td
/F3.0 11 Tf
<4465765574696c734d6f64756c65> Tj
ET
@@ -67155,7 +67252,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 382.1650000000001 Td
+372.74 366.385 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67166,7 +67263,7 @@ ET
0.200 0.400 0.600 SCN
BT
-378.24 382.1650000000001 Td
+378.24 366.385 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67177,7 +67274,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 382.1650000000001 Td
+405.74 366.385 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -67188,7 +67285,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 367.42500000000007 Td
+59.24 351.645 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -67199,7 +67296,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 367.42500000000007 Td
+125.24000000000001 351.645 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -67210,7 +67307,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 367.42500000000007 Td
+141.74 351.645 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67221,7 +67318,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 367.42500000000007 Td
+147.24 351.645 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -67232,7 +67329,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 367.42500000000007 Td
+202.24 351.645 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67243,7 +67340,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 367.42500000000007 Td
+207.74 351.645 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -67254,7 +67351,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 367.42500000000007 Td
+240.74 351.645 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67265,7 +67362,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 367.42500000000007 Td
+246.24 351.645 Td
/F3.0 11 Tf
<646f6378> Tj
ET
@@ -67276,7 +67373,7 @@ ET
0.200 0.200 0.200 SCN
BT
-268.24 367.42500000000007 Td
+268.24 351.645 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67287,7 +67384,7 @@ ET
0.200 0.400 0.600 SCN
BT
-273.74 367.42500000000007 Td
+273.74 351.645 Td
/F3.0 11 Tf
<446f63784d6f64756c65> Tj
ET
@@ -67298,7 +67395,7 @@ ET
0.200 0.200 0.200 SCN
BT
-328.74 367.42500000000007 Td
+328.74 351.645 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67309,7 +67406,7 @@ ET
0.200 0.400 0.600 SCN
BT
-334.24 367.42500000000007 Td
+334.24 351.645 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67320,7 +67417,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 367.42500000000007 Td
+361.74 351.645 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -67331,7 +67428,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 352.68500000000006 Td
+59.24 336.905 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -67342,7 +67439,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 352.68500000000006 Td
+125.24000000000001 336.905 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -67353,7 +67450,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 352.68500000000006 Td
+141.74 336.905 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67364,7 +67461,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 352.68500000000006 Td
+147.24 336.905 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -67375,7 +67472,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 352.68500000000006 Td
+202.24 336.905 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67386,7 +67483,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 352.68500000000006 Td
+207.74 336.905 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -67397,7 +67494,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 352.68500000000006 Td
+240.74 336.905 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67408,7 +67505,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 352.68500000000006 Td
+246.24 336.905 Td
/F3.0 11 Tf
<7075626c697368696e67> Tj
ET
@@ -67419,7 +67516,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 352.68500000000006 Td
+301.24 336.905 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67430,7 +67527,7 @@ ET
0.200 0.400 0.600 SCN
BT
-306.74 352.68500000000006 Td
+306.74 336.905 Td
/F3.0 11 Tf
<5075626c697368696e674d6f64756c65> Tj
ET
@@ -67441,7 +67538,7 @@ ET
0.200 0.200 0.200 SCN
BT
-394.74 352.68500000000006 Td
+394.74 336.905 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67452,7 +67549,7 @@ ET
0.200 0.400 0.600 SCN
BT
-400.24 352.68500000000006 Td
+400.24 336.905 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67463,7 +67560,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 352.68500000000006 Td
+427.74 336.905 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -67474,7 +67571,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 337.94500000000005 Td
+59.24 322.16499999999996 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -67485,7 +67582,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 337.94500000000005 Td
+125.24000000000001 322.16499999999996 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -67496,7 +67593,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 337.94500000000005 Td
+141.74 322.16499999999996 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67507,7 +67604,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 337.94500000000005 Td
+147.24 322.16499999999996 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -67518,7 +67615,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 337.94500000000005 Td
+202.24 322.16499999999996 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67529,7 +67626,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 337.94500000000005 Td
+207.74 322.16499999999996 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -67540,7 +67637,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 337.94500000000005 Td
+240.74 322.16499999999996 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67551,7 +67648,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 337.94500000000005 Td
+246.24 322.16499999999996 Td
/F3.0 11 Tf
<73657373696f6e6c6f67676572> Tj
ET
@@ -67562,7 +67659,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 337.94500000000005 Td
+317.74 322.16499999999996 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67573,7 +67670,7 @@ ET
0.200 0.400 0.600 SCN
BT
-323.24 337.94500000000005 Td
+323.24 322.16499999999996 Td
/F3.0 11 Tf
<53657373696f6e4c6f676765724d6f64756c65> Tj
ET
@@ -67584,7 +67681,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 337.94500000000005 Td
+427.74 322.16499999999996 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67595,7 +67692,7 @@ ET
0.200 0.400 0.600 SCN
BT
-433.24 337.94500000000005 Td
+433.24 322.16499999999996 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67606,7 +67703,7 @@ ET
0.200 0.200 0.200 SCN
BT
-460.74 337.94500000000005 Td
+460.74 322.16499999999996 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -67617,7 +67714,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 323.20500000000004 Td
+59.24 307.42499999999995 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -67628,7 +67725,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 323.20500000000004 Td
+125.24000000000001 307.42499999999995 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -67639,7 +67736,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 323.20500000000004 Td
+141.74 307.42499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67650,7 +67747,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 323.20500000000004 Td
+147.24 307.42499999999995 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -67661,7 +67758,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 323.20500000000004 Td
+202.24 307.42499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67672,7 +67769,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 323.20500000000004 Td
+207.74 307.42499999999995 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -67683,7 +67780,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 323.20500000000004 Td
+240.74 307.42499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67694,7 +67791,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 323.20500000000004 Td
+246.24 307.42499999999995 Td
/F3.0 11 Tf
<73657474696e6773> Tj
ET
@@ -67705,7 +67802,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 323.20500000000004 Td
+290.24 307.42499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67716,7 +67813,7 @@ ET
0.200 0.400 0.600 SCN
BT
-295.74 323.20500000000004 Td
+295.74 307.42499999999995 Td
/F3.0 11 Tf
<53657474696e67734d6f64756c65> Tj
ET
@@ -67727,7 +67824,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 323.20500000000004 Td
+372.74 307.42499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67738,7 +67835,7 @@ ET
0.200 0.400 0.600 SCN
BT
-378.24 323.20500000000004 Td
+378.24 307.42499999999995 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67749,7 +67846,7 @@ ET
0.200 0.200 0.200 SCN
BT
-405.74 323.20500000000004 Td
+405.74 307.42499999999995 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -67760,7 +67857,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 308.46500000000003 Td
+59.24 292.68499999999995 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -67771,7 +67868,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 308.46500000000003 Td
+125.24000000000001 292.68499999999995 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -67782,7 +67879,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 308.46500000000003 Td
+141.74 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67793,7 +67890,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 308.46500000000003 Td
+147.24 292.68499999999995 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -67804,7 +67901,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 308.46500000000003 Td
+202.24 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67815,7 +67912,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 308.46500000000003 Td
+207.74 292.68499999999995 Td
/F3.0 11 Tf
<7769636b6574> Tj
ET
@@ -67826,7 +67923,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 308.46500000000003 Td
+240.74 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67837,7 +67934,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 308.46500000000003 Td
+246.24 292.68499999999995 Td
/F3.0 11 Tf
<676d617033> Tj
ET
@@ -67848,7 +67945,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 308.46500000000003 Td
+273.74 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67859,7 +67956,7 @@ ET
0.200 0.400 0.600 SCN
BT
-279.24 308.46500000000003 Td
+279.24 292.68499999999995 Td
/F3.0 11 Tf
<637074> Tj
ET
@@ -67870,7 +67967,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 308.46500000000003 Td
+295.74 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67881,7 +67978,7 @@ ET
0.200 0.400 0.600 SCN
BT
-301.24 308.46500000000003 Td
+301.24 292.68499999999995 Td
/F3.0 11 Tf
<73657276696365> Tj
ET
@@ -67892,7 +67989,7 @@ ET
0.200 0.200 0.200 SCN
BT
-339.74 308.46500000000003 Td
+339.74 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67903,7 +68000,7 @@ ET
0.200 0.400 0.600 SCN
BT
-345.24 308.46500000000003 Td
+345.24 292.68499999999995 Td
/F3.0 11 Tf
<476d617033536572766963654d6f64756c65> Tj
ET
@@ -67914,7 +68011,7 @@ ET
0.200 0.200 0.200 SCN
BT
-444.24 308.46500000000003 Td
+444.24 292.68499999999995 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -67925,7 +68022,7 @@ ET
0.200 0.400 0.600 SCN
BT
-449.74 308.46500000000003 Td
+449.74 292.68499999999995 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -67936,7 +68033,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 293.725 Td
+59.24 277.94499999999994 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -67947,7 +68044,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 293.725 Td
+81.24000000000001 277.94499999999994 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -67958,7 +68055,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 278.985 Td
+59.24 263.2049999999999 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -67971,7 +68068,7 @@ ET
1.125 Tw
BT
-48.24 241.10600000000005 Td
+48.24 225.32599999999996 Td
/F1.0 10.5 Tf
<41732063616e206265207365656e2c2074686520766172696f757320286e6f6e2d4153462920> Tj
ET
@@ -67986,7 +68083,7 @@ ET
1.125 Tw
BT
-245.6632772216797 241.10600000000005 Td
+245.6632772216797 225.32599999999996 Td
/F1.0 10.5 Tf
[<497369732041> 20.01953125 <64646f6e73>] TJ
ET
@@ -68001,7 +68098,7 @@ ET
1.125 Tw
BT
-303.8138974609375 241.10600000000005 Td
+303.8138974609375 225.32599999999996 Td
/F1.0 10.5 Tf
<206d6f64756c657320616c736f20656163682070726f766964652061206d6f64756c6520636c6173732074686174> Tj
ET
@@ -68014,7 +68111,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 225.32600000000005 Td
+48.24 209.54599999999996 Td
/F1.0 10.5 Tf
<63616e20626520656173696c79207265666572656e6365642e> Tj
ET
@@ -68025,7 +68122,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 195.68000000000004 Td
+48.24 179.89999999999995 Td
/F3.0 10.5 Tf
<6765744164646974696f6e616c53657276696365732829> Tj
ET
@@ -68038,7 +68135,7 @@ ET
1.132 Tw
BT
-48.24 171.44600000000003 Td
+48.24 155.66599999999994 Td
/F1.0 10.5 Tf
[<57> 60.05859375 <65206e6f726d616c6c79207765207265636f6d6d656e6420746861742073657276696365732061726520646566696e6564206578636c75736976656c79207468726f75676820>] TJ
ET
@@ -68053,7 +68150,7 @@ ET
1.132 Tw
BT
-434.6518141276041 171.44600000000003 Td
+434.6518141276041 155.66599999999994 Td
/F3.0 10.5 Tf
<6765744d6f64756c65732829> Tj
ET
@@ -68068,7 +68165,7 @@ ET
1.132 Tw
BT
-497.6518141276041 171.44600000000003 Td
+497.6518141276041 155.66599999999994 Td
/F1.0 10.5 Tf
<2c20616e642074686174> Tj
ET
@@ -68083,7 +68180,7 @@ ET
0.333 Tw
BT
-48.24 155.66600000000003 Td
+48.24 139.88599999999994 Td
/F1.0 10.5 Tf
<74686973206d6574686f642073686f756c64207468657265666f72652072657475726e20616e20656d707479206c6973742e2020486f77657665722c20746865726520617265206365727461696e2075736520636173657320776865726520746865> Tj
ET
@@ -68098,7 +68195,7 @@ ET
1.473 Tw
BT
-48.24 139.88600000000002 Td
+48.24 124.10599999999994 Td
/F1.0 10.5 Tf
<612073657276696365206d757374206265206578706c696369746c792073706563696669656420656974686572206265636175736520746865207365727669636520726571756972656420646f6573206e6f742028666f72207768617465766572> Tj
ET
@@ -68111,7 +68208,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 124.10600000000002 Td
+48.24 108.32599999999994 Td
/F1.0 10.5 Tf
<726561736f6e292068617665206120> Tj
ET
@@ -68122,7 +68219,7 @@ ET
0.694 0.129 0.275 SCN
BT
-124.21800000000002 124.10600000000002 Td
+124.21800000000002 108.32599999999994 Td
/F3.0 10.5 Tf
<40446f6d61696e53657276696365> Tj
ET
@@ -68133,7 +68230,7 @@ ET
0.200 0.200 0.200 SCN
BT
-197.71800000000002 124.10600000000002 Td
+197.71800000000002 108.32599999999994 Td
/F1.0 10.5 Tf
<20616e6e6f746174696f6e2e> Tj
ET
@@ -68146,7 +68243,7 @@ ET
2.725 Tw
BT
-48.24 96.32600000000002 Td
+48.24 80.54599999999994 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c652c2074686520286e6f6e2d4153462920>] TJ
ET
@@ -68161,7 +68258,7 @@ ET
2.725 Tw
BT
-197.60306219951923 96.32600000000002 Td
+197.60306219951923 80.54599999999994 Td
/F1.0 10.5 Tf
<49736973206164646f6e7327207365637572697479> Tj
ET
@@ -68176,7 +68273,7 @@ ET
2.725 Tw
BT
-303.9055483774038 96.32600000000002 Td
+303.9055483774038 80.54599999999994 Td
/F1.0 10.5 Tf
<206d6f64756c65202876312e392e302920616c6c6f77732074686520706f6c69637920746f206576616c75617465> Tj
ET
@@ -68191,7 +68288,7 @@ ET
15.081 Tw
BT
-48.24 80.54600000000002 Td
+48.24 64.76599999999993 Td
/F1.0 10.5 Tf
[<636f6e666c696374696e67207065726d697373696f6e7320746f206265207370656369666965642062> 20.01953125 <79206578706c696369746c79207265676973746572696e672065697468657220746865>] TJ
ET
@@ -68200,36 +68297,6 @@ ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-41.627 Tw
-
-BT
-48.24 64.76600000000002 Td
-/F3.0 10.5 Tf
-<5065726d697373696f6e734576616c756174696f6e53657276696365416c6c6f7742656174735665746f> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-41.627 Tw
-
-BT
-268.74 64.76600000000002 Td
-/F1.0 10.5 Tf
-<20646f6d61696e2073657276696365206f7220746865> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -68277,7 +68344,7 @@ endobj
/URI (http://github.com/isisaddons/isis-app-todoapp)
>>
/Subtype /Link
-/Rect [186.70308984375 535.6600000000001 288.49008984375 549.94]
+/Rect [186.70308984375 519.88 288.49008984375 534.16]
/Type /Annot
>>
endobj
@@ -68288,12 +68355,12 @@ endobj
/URI (http://isisaddons.org)
>>
/Subtype /Link
-/Rect [245.6632772216797 238.04000000000005 303.8138974609375 252.32000000000005]
+/Rect [245.6632772216797 222.25999999999996 303.8138974609375 236.53999999999996]
/Type /Annot
>>
endobj
429 0 obj
-[426 0 R /XYZ 0 209.51000000000005 null]
+[426 0 R /XYZ 0 193.72999999999996 null]
endobj
430 0 obj
<< /Border [0 0 0]
@@ -68302,7 +68369,7 @@ endobj
/URI (rgant.pdf#_rgant-DomainService)
>>
/Subtype /Link
-/Rect [124.21800000000002 122.63600000000002 197.71800000000002 133.13600000000002]
+/Rect [124.21800000000002 106.85599999999994 197.71800000000002 117.35599999999994]
/Type /Annot
>>
endobj
@@ -68313,12 +68380,12 @@ endobj
/URI (http://github.com/isisaddons/isis-module-security)
>>
/Subtype /Link
-/Rect [197.60306219951923 93.26000000000002 303.9055483774038 107.54000000000002]
+/Rect [197.60306219951923 77.47999999999993 303.9055483774038 91.75999999999993]
/Type /Annot
>>
endobj
432 0 obj
-<< /Length 25204
+<< /Length 25534
>>
stream
q
@@ -68327,20 +68394,50 @@ q
/DeviceRGB CS
0.694 0.129 0.275 SCN
+41.627 Tw
+
BT
48.24 794.6759999999999 Td
/F3.0 10.5 Tf
-<5065726d697373696f6e734576616c756174696f6e536572766963655665746f4265617473416c6c6f77> Tj
+<5065726d697373696f6e734576616c756174696f6e53657276696365416c6c6f7742656174735665746f> Tj
ET
+
+0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
+41.627 Tw
+
BT
268.74 794.6759999999999 Td
/F1.0 10.5 Tf
+<20646f6d61696e2073657276696365206f7220746865> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+BT
+48.24 778.896 Td
+/F3.0 10.5 Tf
+<5065726d697373696f6e734576616c756174696f6e536572766963655665746f4265617473416c6c6f77> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+268.74 778.896 Td
+/F1.0 10.5 Tf
<20646f6d61696e20736572766963653a> Tj
ET
@@ -68348,28 +68445,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 778.860 m
-543.040 778.860 l
-545.249 778.860 547.040 777.069 547.040 774.860 c
-547.040 657.680 l
-547.040 655.471 545.249 653.680 543.040 653.680 c
-52.240 653.680 l
-50.031 653.680 48.240 655.471 48.240 657.680 c
-48.240 774.860 l
-48.240 777.069 50.031 778.860 52.240 778.860 c
+52.240 763.080 m
+543.040 763.080 l
+545.249 763.080 547.040 761.289 547.040 759.080 c
+547.040 641.900 l
+547.040 639.691 545.249 637.900 543.040 637.900 c
+52.240 637.900 l
+50.031 637.900 48.240 639.691 48.240 641.900 c
+48.240 759.080 l
+48.240 761.289 50.031 763.080 52.240 763.080 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 778.860 m
-543.040 778.860 l
-545.249 778.860 547.040 777.069 547.040 774.860 c
-547.040 657.680 l
-547.040 655.471 545.249 653.680 543.040 653.680 c
-52.240 653.680 l
-50.031 653.680 48.240 655.471 48.240 657.680 c
-48.240 774.860 l
-48.240 777.069 50.031 778.860 52.240 778.860 c
+52.240 763.080 m
+543.040 763.080 l
+545.249 763.080 547.040 761.289 547.040 759.080 c
+547.040 641.900 l
+547.040 639.691 545.249 637.900 543.040 637.900 c
+52.240 637.900 l
+50.031 637.900 48.240 639.691 48.240 641.900 c
+48.240 759.080 l
+48.240 761.289 50.031 763.080 52.240 763.080 c
h
S
Q
@@ -68377,7 +68474,7 @@ Q
0.333 0.333 0.333 SCN
BT
-59.24 756.035 Td
+59.24 740.255 Td
/F3.0 11 Tf
<404f76657272696465> Tj
ET
@@ -68388,7 +68485,7 @@ ET
0.000 0.533 0.000 SCN
BT
-59.24 741.295 Td
+59.24 725.515 Td
/F7.0 11 Tf
<7075626c6963> Tj
ET
@@ -68399,7 +68496,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 741.295 Td
+92.24000000000001 725.515 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -68410,7 +68507,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 741.295 Td
+97.74000000000001 725.515 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -68421,7 +68518,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 741.295 Td
+119.74000000000001 725.515 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -68432,7 +68529,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 741.295 Td
+125.24000000000001 725.515 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -68443,7 +68540,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 741.295 Td
+152.74 725.515 Td
/F3.0 11 Tf
<3c3f3e3e> Tj
ET
@@ -68454,7 +68551,7 @@ ET
0.200 0.200 0.200 SCN
BT
-174.74 741.295 Td
+174.74 725.515 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -68465,7 +68562,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 741.295 Td
+180.24 725.515 Td
/F3.0 11 Tf
<6765744164646974696f6e616c5365727669636573> Tj
ET
@@ -68476,7 +68573,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 741.295 Td
+295.74 725.515 Td
/F3.0 11 Tf
<2829> Tj
ET
@@ -68487,7 +68584,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 741.295 Td
+306.74 725.515 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -68498,7 +68595,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 741.295 Td
+312.24 725.515 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -68509,7 +68606,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 726.5550000000001 Td
+59.24 710.7750000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -68520,7 +68617,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 726.5550000000001 Td
+81.24000000000001 710.7750000000001 Td
/F7.0 11 Tf
<72657475726e> Tj
ET
@@ -68531,7 +68628,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 726.5550000000001 Td
+114.24000000000001 710.7750000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -68542,7 +68639,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 726.5550000000001 Td
+119.74000000000001 710.7750000000001 Td
/F3.0 11 Tf
<417272617973> Tj
ET
@@ -68553,7 +68650,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 726.5550000000001 Td
+152.74 710.7750000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68564,7 +68661,7 @@ ET
0.200 0.400 0.600 SCN
BT
-158.24 726.5550000000001 Td
+158.24 710.7750000000001 Td
/F3.0 11 Tf
<61734c697374> Tj
ET
@@ -68575,7 +68672,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 726.5550000000001 Td
+191.24 710.7750000000001 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -68586,7 +68683,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 711.815 Td
+59.24 696.0350000000001 Td
/F3.0 11 Tf
<ca2020202020202020202020> Tj
ET
@@ -68597,7 +68694,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 711.815 Td
+125.24000000000001 696.0350000000001 Td
/F3.0 11 Tf
<6f7267> Tj
ET
@@ -68608,7 +68705,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 711.815 Td
+141.74 696.0350000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68619,7 +68716,7 @@ ET
0.200 0.400 0.600 SCN
BT
-147.24 711.815 Td
+147.24 696.0350000000001 Td
/F3.0 11 Tf
<697369736164646f6e73> Tj
ET
@@ -68630,7 +68727,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 711.815 Td
+202.24 696.0350000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68641,7 +68738,7 @@ ET
0.200 0.400 0.600 SCN
BT
-207.74 711.815 Td
+207.74 696.0350000000001 Td
/F3.0 11 Tf
<6d6f64756c65> Tj
ET
@@ -68652,7 +68749,7 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 711.815 Td
+240.74 696.0350000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68663,7 +68760,7 @@ ET
0.200 0.400 0.600 SCN
BT
-246.24 711.815 Td
+246.24 696.0350000000001 Td
/F3.0 11 Tf
<7365637572697479> Tj
ET
@@ -68674,7 +68771,7 @@ ET
0.200 0.200 0.200 SCN
BT
-290.24 711.815 Td
+290.24 696.0350000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68685,7 +68782,7 @@ ET
0.200 0.400 0.600 SCN
BT
-295.74 711.815 Td
+295.74 696.0350000000001 Td
/F3.0 11 Tf
<646f6d> Tj
ET
@@ -68696,7 +68793,7 @@ ET
0.200 0.200 0.200 SCN
BT
-312.24 711.815 Td
+312.24 696.0350000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68707,7 +68804,7 @@ ET
0.200 0.400 0.600 SCN
BT
-317.74 711.815 Td
+317.74 696.0350000000001 Td
/F3.0 11 Tf
<7065726d697373696f6e> Tj
ET
@@ -68718,7 +68815,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 697.075 Td
+59.24 681.2950000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68729,7 +68826,7 @@ ET
0.200 0.400 0.600 SCN
BT
-64.74000000000001 697.075 Td
+64.74000000000001 681.2950000000001 Td
/F3.0 11 Tf
<5065726d697373696f6e734576616c756174696f6e536572766963655665746f4265617473416c6c6f77> Tj
ET
@@ -68740,7 +68837,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 697.075 Td
+295.74 681.2950000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -68751,7 +68848,7 @@ ET
0.200 0.400 0.600 SCN
BT
-301.24 697.075 Td
+301.24 681.2950000000001 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -68762,7 +68859,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 682.335 Td
+59.24 666.5550000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -68773,7 +68870,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 682.335 Td
+81.24000000000001 666.5550000000001 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -68784,7 +68881,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 667.595 Td
+59.24 651.815 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -68797,7 +68894,7 @@ ET
0.832 Tw
BT
-48.24 629.716 Td
+48.24 613.936 Td
/F1.0 10.5 Tf
<49662074686973206d6574686f642072657475726e732061206e6f6e2d> Tj
ET
@@ -68812,7 +68909,7 @@ ET
0.832 Tw
BT
-196.66793038504463 629.716 Td
+196.66793038504463 613.936 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -68827,7 +68924,7 @@ ET
0.832 Tw
BT
-217.66793038504463 629.716 Td
+217.66793038504463 613.936 Td
/F1.0 10.5 Tf
<2076616c75652c207468656e206974206f7665727269646573207468652076616c7565206f6620> Tj
ET
@@ -68842,7 +68939,7 @@ ET
0.832 Tw
BT
-407.199119001116 629.716 Td
+407.199119001116 613.936 Td
/F3.0 10.5 Tf
<697369732e7365727669636573> Tj
ET
@@ -68857,7 +68954,7 @@ ET
0.832 Tw
BT
-475.449119001116 629.716 Td
+475.449119001116 613.936 Td
/F1.0 10.5 Tf
[<20636f6e6669677572> 20.01953125 <6174696f6e>] TJ
ET
@@ -68870,7 +68967,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 613.936 Td
+48.24 598.1560000000001 Td
/F1.0 10.5 Tf
[<70726f7065727479> 89.84375 <2e>] TJ
ET
@@ -68881,7 +68978,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 584.2900000000002 Td
+48.24 568.5100000000002 Td
/F3.0 10.5 Tf
<67657441757468656e7469636174696f6e4d656368616e69736d2829> Tj
ET
@@ -68894,7 +68991,7 @@ ET
2.694 Tw
BT
-48.24 560.0560000000003 Td
+48.24 544.2760000000003 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -68909,7 +69006,7 @@ ET
2.694 Tw
BT
-84.23982142857143 560.0560000000003 Td
+84.23982142857143 544.2760000000003 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -68924,7 +69021,7 @@ ET
2.694 Tw
BT
-105.23982142857143 560.0560000000003 Td
+105.23982142857143 544.2760000000003 Td
/F1.0 10.5 Tf
<2c2074686973206d6574686f6420737065636966696573207468652061757468656e7469636174696f6e206d656368616e69736d20746f207573652e20205468652076616c69642076616c75657320617265> Tj
ET
@@ -68939,7 +69036,7 @@ ET
3.089 Tw
BT
-48.24 544.2760000000002 Td
+48.24 528.4960000000002 Td
/F1.0 10.5 Tf
<63757272656e746c7920> Tj
ET
@@ -68954,7 +69051,7 @@ ET
3.089 Tw
BT
-101.02543333333332 544.2760000000002 Td
+101.02543333333332 528.4960000000002 Td
/F3.0 10.5 Tf
<22736869726f22> Tj
ET
@@ -68969,7 +69066,7 @@ ET
3.089 Tw
BT
-137.77543333333332 544.2760000000002 Td
+137.77543333333332 528.4960000000002 Td
/F1.0 10.5 Tf
<20206f7220> Tj
ET
@@ -68984,7 +69081,7 @@ ET
3.089 Tw
BT
-166.20473333333334 544.2760000000002 Td
+166.20473333333334 528.4960000000002 Td
/F3.0 10.5 Tf
<2262797061737322> Tj
ET
@@ -68999,7 +69096,7 @@ ET
3.089 Tw
BT
-208.20473333333334 544.2760000000002 Td
+208.20473333333334 528.4960000000002 Td
/F1.0 10.5 Tf
<2e20204966206e756c6c2069732072657475726e6564207468656e207468652076616c7565206f662074686520> Tj
ET
@@ -69014,7 +69111,7 @@ ET
3.089 Tw
BT
-447.28999999999996 544.2760000000002 Td
+447.28999999999996 528.4960000000002 Td
/F3.0 10.5 Tf
<697369732e61757468656e7469636174696f6e> Tj
ET
@@ -69029,7 +69126,7 @@ ET
3.089 Tw
BT
-547.04 544.2760000000002 Td
+547.04 528.4960000000002 Td
ET
@@ -69040,7 +69137,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 528.4960000000002 Td
+48.24 512.7160000000002 Td
/F1.0 10.5 Tf
[<636f6e6669677572> 20.01953125 <6174696f6e2070726f70657274792028696e20>] TJ
ET
@@ -69051,7 +69148,7 @@ ET
0.694 0.129 0.275 SCN
BT
-182.25129492187503 528.4960000000002 Td
+182.25129492187503 512.7160000000002 Td
/F3.0 10.5 Tf
<697369732e70726f70657274696573> Tj
ET
@@ -69062,7 +69159,7 @@ ET
0.200 0.200 0.200 SCN
BT
-261.001294921875 528.4960000000002 Td
+261.001294921875 512.7160000000002 Td
/F1.0 10.5 Tf
<2066696c6529206973207573656420696e73746561642e> Tj
ET
@@ -69073,7 +69170,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 500.7160000000002 Td
+48.24 484.9360000000002 Td
/F1.0 10.5 Tf
<5365652074686520> Tj
ET
@@ -69084,7 +69181,7 @@ ET
0.259 0.545 0.792 SCN
BT
-86.58600000000001 500.7160000000002 Td
+86.58600000000001 484.9360000000002 Td
/F1.0 10.5 Tf
<7365637572697479206775696465> Tj
ET
@@ -69095,7 +69192,7 @@ ET
0.200 0.200 0.200 SCN
BT
-157.104 500.7160000000002 Td
+157.104 484.9360000000002 Td
/F1.0 10.5 Tf
[<20666f7220667572746865722064657461696c73206f6e20636f6e6669677572696e6720736869726f206f722062> 20.01953125 <7970617373207365637572697479> 89.84375 <2e>] TJ
ET
@@ -69105,8 +69202,8 @@ ET
q
0.5 w
0.933 0.933 0.933 SCN
-113.807 445.340 m
-113.807 484.900 l
+113.807 429.560 m
+113.807 469.120 l
S
Q
0.098 0.251 0.486 scn
@@ -69117,7 +69214,7 @@ Q
0.098 0.251 0.486 SCN
BT
-76.73933333333333 456.54000000000025 Td
+76.73933333333333 440.7600000000003 Td
/F5.1 24 Tf
<21> Tj
ET
@@ -69130,7 +69227,7 @@ ET
2.314 Tw
BT
-125.80666666666667 468.9360000000002 Td
+125.80666666666667 453.15600000000023 Td
/F1.0 10.5 Tf
[<546869732070726f70657274792069732069676e6f72656420666f7220696e74656772> 20.01953125 <6174696f6e2074657374732028776869636820616c7761> 20.01953125 <797320757365732074686520>] TJ
ET
@@ -69145,7 +69242,7 @@ ET
2.314 Tw
BT
-493.03999999999996 468.9360000000002 Td
+493.03999999999996 453.15600000000023 Td
/F3.0 10.5 Tf
<2262797061737322> Tj
ET
@@ -69160,7 +69257,7 @@ ET
2.314 Tw
BT
-535.04 468.9360000000002 Td
+535.04 453.15600000000023 Td
ET
@@ -69171,7 +69268,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.80666666666667 453.1560000000002 Td
+125.80666666666667 437.3760000000002 Td
/F1.0 10.5 Tf
<6d656368616e69736d292e> Tj
ET
@@ -69182,7 +69279,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24000000000001 419.5100000000002 Td
+48.24000000000001 403.73000000000025 Td
/F3.0 10.5 Tf
<676574417574686f72697a6174696f6e4d656368616e69736d2829> Tj
ET
@@ -69195,7 +69292,7 @@ ET
3.043 Tw
BT
-48.24000000000001 395.2760000000002 Td
+48.24000000000001 379.4960000000002 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -69210,7 +69307,7 @@ ET
3.043 Tw
BT
-84.58857142857144 395.2760000000002 Td
+84.58857142857144 379.4960000000002 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -69225,7 +69322,7 @@ ET
3.043 Tw
BT
-105.58857142857144 395.2760000000002 Td
+105.58857142857144 379.4960000000002 Td
/F1.0 10.5 Tf
<2c2074686973206d6574686f64207370656369666965732074686520617574686f72697a6174696f6e206d656368616e69736d20746f207573652e20205468652076616c69642076616c75657320617265> Tj
ET
@@ -69240,7 +69337,7 @@ ET
3.439 Tw
BT
-48.24000000000001 379.4960000000002 Td
+48.24000000000001 363.71600000000024 Td
/F1.0 10.5 Tf
<63757272656e746c7920> Tj
ET
@@ -69255,7 +69352,7 @@ ET
3.439 Tw
BT
-101.37543333333335 379.4960000000002 Td
+101.37543333333335 363.71600000000024 Td
/F3.0 10.5 Tf
<22736869726f22> Tj
ET
@@ -69270,7 +69367,7 @@ ET
3.439 Tw
BT
-138.12543333333335 379.4960000000002 Td
+138.12543333333335 363.71600000000024 Td
/F1.0 10.5 Tf
<20206f7220> Tj
ET
@@ -69285,7 +69382,7 @@ ET
3.439 Tw
BT
-167.60473333333334 379.4960000000002 Td
+167.60473333333334 363.71600000000024 Td
/F3.0 10.5 Tf
<2262797061737322> Tj
ET
@@ -69300,7 +69397,7 @@ ET
3.439 Tw
BT
-209.60473333333334 379.4960000000002 Td
+209.60473333333334 363.71600000000024 Td
/F1.0 10.5 Tf
<2e20204966206e756c6c2069732072657475726e6564207468656e207468652076616c7565206f662074686520> Tj
ET
@@ -69315,7 +69412,7 @@ ET
3.439 Tw
BT
-452.53999999999996 379.4960000000002 Td
+452.53999999999996 363.71600000000024 Td
/F3.0 10.5 Tf
<697369732e617574686f72697a6174696f6e> Tj
ET
@@ -69330,7 +69427,7 @@ ET
3.439 Tw
BT
-547.04 379.4960000000002 Td
+547.04 363.71600000000024 Td
ET
@@ -69341,7 +69438,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 363.7160000000002 Td
+48.24000000000001 347.9360000000002 Td
/F1.0 10.5 Tf
[<636f6e6669677572> 20.01953125 <6174696f6e2070726f70657274792028696e20>] TJ
ET
@@ -69352,7 +69449,7 @@ ET
0.694 0.129 0.275 SCN
BT
-182.25129492187503 363.7160000000002 Td
+182.25129492187503 347.9360000000002 Td
/F3.0 10.5 Tf
<697369732e70726f70657274696573> Tj
ET
@@ -69363,7 +69460,7 @@ ET
0.200 0.200 0.200 SCN
BT
-261.001294921875 363.7160000000002 Td
+261.001294921875 347.9360000000002 Td
/F1.0 10.5 Tf
<2066696c6529206973207573656420696e73746561642e> Tj
ET
@@ -69374,7 +69471,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 335.9360000000002 Td
+48.24000000000001 320.15600000000023 Td
/F1.0 10.5 Tf
<5365652074686520> Tj
ET
@@ -69385,7 +69482,7 @@ ET
0.259 0.545 0.792 SCN
BT
-86.58600000000001 335.9360000000002 Td
+86.58600000000001 320.15600000000023 Td
/F1.0 10.5 Tf
<7365637572697479206775696465> Tj
ET
@@ -69396,7 +69493,7 @@ ET
0.200 0.200 0.200 SCN
BT
-157.104 335.9360000000002 Td
+157.104 320.15600000000023 Td
/F1.0 10.5 Tf
[<20666f7220667572746865722064657461696c73206f6e20636f6e6669677572696e6720736869726f206f722062> 20.01953125 <7970617373207365637572697479> 89.84375 <2e>] TJ
ET
@@ -69406,8 +69503,8 @@ ET
q
0.5 w
0.933 0.933 0.933 SCN
-113.807 280.560 m
-113.807 320.120 l
+113.807 264.780 m
+113.807 304.340 l
S
Q
0.098 0.251 0.486 scn
@@ -69418,7 +69515,7 @@ Q
0.098 0.251 0.486 SCN
BT
-76.73933333333335 291.7600000000003 Td
+76.73933333333335 275.9800000000003 Td
/F5.1 24 Tf
<21> Tj
ET
@@ -69431,7 +69528,7 @@ ET
2.314 Tw
BT
-125.80666666666667 304.15600000000023 Td
+125.80666666666667 288.37600000000026 Td
/F1.0 10.5 Tf
[<546869732070726f70657274792069732069676e6f72656420666f7220696e74656772> 20.01953125 <6174696f6e2074657374732028776869636820616c7761> 20.01953125 <797320757365732074686520>] TJ
ET
@@ -69446,7 +69543,7 @@ ET
2.314 Tw
BT
-493.03999999999996 304.15600000000023 Td
+493.03999999999996 288.37600000000026 Td
/F3.0 10.5 Tf
<2262797061737322> Tj
ET
@@ -69461,7 +69558,7 @@ ET
2.314 Tw
BT
-535.04 304.15600000000023 Td
+535.04 288.37600000000026 Td
ET
@@ -69472,7 +69569,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.80666666666667 288.3760000000002 Td
+125.80666666666667 272.59600000000023 Td
/F1.0 10.5 Tf
<6d656368616e69736d292e> Tj
ET
@@ -69483,7 +69580,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24000000000001 254.73000000000022 Td
+48.24000000000001 238.95000000000024 Td
/F3.0 10.5 Tf
<67657446697874757265732829> Tj
ET
@@ -69496,7 +69593,7 @@ ET
1.905 Tw
BT
-48.24000000000001 230.4960000000002 Td
+48.24000000000001 214.71600000000024 Td
/F1.0 10.5 Tf
<4966206e6f6e2d> Tj
ET
@@ -69511,7 +69608,7 @@ ET
1.905 Tw
BT
-83.45093750000001 230.4960000000002 Td
+83.45093750000001 214.71600000000024 Td
/F3.0 10.5 Tf
<6e756c6c> Tj
ET
@@ -69526,7 +69623,7 @@ ET
1.905 Tw
BT
-104.45093750000001 230.4960000000002 Td
+104.45093750000001 214.71600000000024 Td
/F1.0 10.5 Tf
<2c2074686973206d6574686f64207370656369666965732074686520666978747572652073637269707428732920746f2062652072756e206f6e20737461727475702e20205468697320697320706172746963756c61726c79> Tj
ET
@@ -69539,7 +69636,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 214.7160000000002 Td
+48.24000000000001 198.93600000000023 Td
/F1.0 10.5 Tf
<75736566756c207768656e20646576656c6f70696e67206f722064656d6f696e67207768696c65207573696e6720616e20696e2d6d656d6f72792064617461626173652e> Tj
ET
@@ -69550,7 +69647,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24000000000001 186.9360000000002 Td
+48.24000000000001 171.15600000000023 Td
/F1.0 10.5 Tf
[<46> 40.0390625 <6f72206578616d706c653a>] TJ
ET
@@ -69559,28 +69656,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 171.120 m
-543.040 171.120 l
-545.249 171.120 547.040 169.329 547.040 167.120 c
-547.040 94.160 l
-547.040 91.951 545.249 90.160 543.040 90.160 c
-52.240 90.160 l
-50.031 90.160 48.240 91.951 48.240 94.160 c
-48.240 167.120 l
-48.240 169.329 50.031 171.120 52.240 171.120 c
+52.240 155.340 m
+543.040 155.340 l
+545.249 155.340 547.040 153.549 547.040 151.340 c
+547.040 78.380 l
+547.040 76.171 545.249 74.380 543.040 74.380 c
+52.240 74.380 l
+50.031 74.380 48.240 76.171 48.240 78.380 c
+48.240 151.340 l
+48.240 153.549 50.031 155.340 52.240 155.340 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 171.120 m
-543.040 171.120 l
-545.249 171.120 547.040 169.329 547.040 167.120 c
-547.040 94.160 l
-547.040 91.951 545.249 90.160 543.040 90.160 c
-52.240 90.160 l
-50.031 90.160 48.240 91.951 48.240 94.160 c
-48.240 167.120 l
-48.240 169.329 50.031 171.120 52.240 171.120 c
+52.240 155.340 m
+543.040 155.340 l
+545.249 155.340 547.040 153.549 547.040 151.340 c
+547.040 78.380 l
+547.040 76.171 545.249 74.380 543.040 74.380 c
+52.240 74.380 l
+50.031 74.380 48.240 76.171 48.240 78.380 c
+48.240 151.340 l
+48.240 153.549 50.031 155.340 52.240 155.340 c
h
S
Q
@@ -69588,7 +69685,7 @@ Q
0.333 0.333 0.333 SCN
BT
-59.24000000000001 148.2950000000002 Td
+59.24000000000001 132.5150000000002 Td
/F3.0 11 Tf
<404f76657272696465> Tj
ET
@@ -69599,7 +69696,7 @@ ET
0.000 0.533 0.000 SCN
BT
-59.24000000000001 133.55500000000018 Td
+59.24000000000001 117.77500000000022 Td
/F7.0 11 Tf
<7075626c6963> Tj
ET
@@ -69610,7 +69707,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 133.55500000000018 Td
+92.24000000000001 117.77500000000022 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -69621,7 +69718,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 133.55500000000018 Td
+97.74000000000001 117.77500000000022 Td
/F3.0 11 Tf
<4c697374> Tj
ET
@@ -69632,7 +69729,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 133.55500000000018 Td
+119.74000000000001 117.77500000000022 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -69643,7 +69740,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 133.55500000000018 Td
+125.24000000000001 117.77500000000022 Td
/F3.0 11 Tf
<436c617373> Tj
ET
@@ -69654,7 +69751,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 133.55500000000018 Td
+152.74 117.77500000000022 Td
/F3.0 11 Tf
<3c3f> Tj
ET
@@ -69665,7 +69762,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 133.55500000000018 Td
+163.74 117.77500000000022 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -69676,7 +69773,7 @@ ET
0.000 0.533 0.000 SCN
BT
-169.24 133.55500000000018 Td
+169.24 117.77500000000022 Td
/F7.0 11 Tf
<657874656e6473> Tj
ET
@@ -69687,7 +69784,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 133.55500000000018 Td
+207.74 117.77500000000022 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -69698,7 +69795,7 @@ ET
0.200 0.200 0.200 SCN
BT
-213.24 133.55500000000018 Td
+213.24 117.77500000000022 Td
/F3.0 11 Tf
<46697874757265536372697074> Tj
ET
@@ -69709,7 +69806,7 @@ ET
0.200 0.200 0.200 SCN
BT
-284.74 133.55500000000018 Td
+284.74 117.77500000000022 Td
/F3.0 11 Tf
<3e3e> Tj
ET
@@ -69720,7 +69817,7 @@ ET
0.200 0.200 0.200 SCN
BT
-295.74 133.55500000000018 Td
+295.74 117.77500000000022 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -69731,7 +69828,7 @@ ET
0.200 0.200 0.200 SCN
BT
-301.24 133.55500000000018 Td
+301.24 117.77500000000022 Td
/F3.0 11 Tf
<6765744669787475726573> Tj
ET
@@ -69742,7 +69839,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 133.55500000000018 Td
+361.74 117.77500000000022 Td
/F3.0 11 Tf
<2829> Tj
ET
@@ -69753,7 +69850,7 @@ ET
0.200 0.200 0.200 SCN
BT
-372.74 133.55500000000018 Td
+372.74 117.77500000000022 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -69764,7 +69861,7 @@ ET
0.200 0.200 0.200 SCN
BT
-378.24 133.55500000000018 Td
+378.24 117.77500000000022 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -69775,7 +69872,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 118.8150000000002 Td
+59.24000000000001 103.03500000000022 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -69786,7 +69883,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 118.8150000000002 Td
+81.24000000000001 103.03500000000022 Td
/F7.0 11 Tf
<72657475726e> Tj
ET
@@ -69797,7 +69894,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 118.8150000000002 Td
+114.24000000000001 103.03500000000022 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -69808,7 +69905,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 118.8150000000002 Td
+119.74000000000001 103.03500000000022 Td
/F3.0 11 Tf
<4c69737473> Tj
ET
@@ -69819,7 +69916,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 118.8150000000002 Td
+147.24 103.03500000000022 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -69830,7 +69927,7 @@ ET
0.200 0.400 0.600 SCN
BT
-152.74 118.8150000000002 Td
+152.74 103.03500000000022 Td
/F3.0 11 Tf
<6e657741727261794c697374> Tj
ET
@@ -69841,7 +69938,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 118.8150000000002 Td
+218.74 103.03500000000022 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -69852,7 +69949,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 118.8150000000002 Td
+224.24 103.03500000000022 Td
/F3.0 11 Tf
<746f646f617070> Tj
ET
@@ -69863,7 +69960,7 @@ ET
0.200 0.200 0.200 SCN
BT
-262.74 118.8150000000002 Td
+262.74 103.03500000000022 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -69874,7 +69971,7 @@ ET
0.200 0.400 0.600 SCN
BT
-268.24 118.8150000000002 Td
+268.24 103.03500000000022 Td
/F3.0 11 Tf
<66697874757265> Tj
ET
@@ -69885,7 +69982,7 @@ ET
0.200 0.200 0.200 SCN
BT
-306.74 118.8150000000002 Td
+306.74 103.03500000000022 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -69896,7 +69993,7 @@ ET
0.200 0.400 0.600 SCN
BT
-312.24 118.8150000000002 Td
+312.24 103.03500000000022 Td
/F3.0 11 Tf
<64656d6f> Tj
ET
@@ -69907,7 +70004,7 @@ ET
0.200 0.200 0.200 SCN
BT
-334.24 118.8150000000002 Td
+334.24 103.03500000000022 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -69918,7 +70015,7 @@ ET
0.200 0.400 0.600 SCN
BT
-339.74 118.8150000000002 Td
+339.74 103.03500000000022 Td
/F3.0 11 Tf
<44656d6f46697874757265> Tj
ET
@@ -69929,7 +70026,7 @@ ET
0.200 0.200 0.200 SCN
BT
-400.24 118.8150000000002 Td
+400.24 103.03500000000022 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -69940,7 +70037,7 @@ ET
0.200 0.400 0.600 SCN
BT
-405.74 118.8150000000002 Td
+405.74 103.03500000000022 Td
/F3.0 11 Tf
<636c617373> Tj
ET
@@ -69951,7 +70048,7 @@ ET
0.200 0.200 0.200 SCN
BT
-433.24 118.8150000000002 Td
+433.24 103.03500000000022 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -69962,28 +70059,13 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24000000000001 104.07500000000019 Td
+59.24000000000001 88.29500000000021 Td
/F3.0 11 Tf
<7d> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
-
-8.909 Tw
-
-BT
-48.24000000000001 66.1960000000002 Td
-/F1.0 10.5 Tf
-<4e6f7465207468617420696e206f7264657220666f7220666978747572657320746f20626520696e7374616c6c656420697420697320616c736f206e656365737361727920746f2073657420746865> Tj
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
q
0.000 0.000 0.000 scn
0.000 0.000 0.000 SCN
@@ -70026,7 +70108,7 @@ endobj
>>
endobj
434 0 obj
-[433 0 R /XYZ 0 598.1200000000001 null]
+[433 0 R /XYZ 0 582.3400000000001 null]
endobj
435 0 obj
<< /Border [0 0 0]
@@ -70035,12 +70117,12 @@ endobj
/URI (ugsec.pdf)
>>
/Subtype /Link
-/Rect [86.58600000000001 497.6500000000002 157.104 511.9300000000002]
+/Rect [86.58600000000001 481.87000000000023 157.104 496.1500000000002]
/Type /Annot
>>
endobj
436 0 obj
-[433 0 R /XYZ 0 433.3400000000002 null]
+[433 0 R /XYZ 0 417.56000000000023 null]
endobj
437 0 obj
<< /Border [0 0 0]
@@ -70049,27 +70131,42 @@ endobj
/URI (ugsec.pdf)
>>
/Subtype /Link
-/Rect [86.58600000000001 332.87000000000023 157.104 347.1500000000002]
+/Rect [86.58600000000001 317.09000000000026 157.104 331.37000000000023]
/Type /Annot
>>
endobj
438 0 obj
-[433 0 R /XYZ 0 268.56000000000023 null]
+[433 0 R /XYZ 0 252.78000000000026 null]
endobj
439 0 obj
-<< /Length 18953
+<< /Length 18567
>>
stream
q
/DeviceRGB cs
-0.694 0.129 0.275 scn
+0.200 0.200 0.200 scn
/DeviceRGB CS
+0.200 0.200 0.200 SCN
+
+8.909 Tw
+
+BT
+48.24 794.6759999999999 Td
+/F1.0 10.5 Tf
+<4e6f7465207468617420696e206f7264657220666f7220666978747572657320746f20626520696e7374616c6c656420697420697320616c736f206e656365737361727920746f2073657420746865> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
1.443 Tw
BT
-48.24 794.6759999999999 Td
+48.24 778.896 Td
/F3.0 10.5 Tf
<697369732e706572736973746f722e646174616e75636c6575732e696e7374616c6c2d6669787475726573> Tj
ET
@@ -70084,7 +70181,7 @@ ET
1.443 Tw
BT
-273.99 794.6759999999999 Td
+273.99 778.896 Td
/F1.0 10.5 Tf
[<206b> 20.01953125 <657920746f20>] TJ
ET
@@ -70099,7 +70196,7 @@ ET
1.443 Tw
BT
-313.6923461914063 794.6759999999999 Td
+313.6923461914063 778.896 Td
/F3.0 10.5 Tf
<74727565> Tj
ET
@@ -70114,7 +70211,7 @@ ET
1.443 Tw
BT
-334.6923461914063 794.6759999999999 Td
+334.6923461914063 778.896 Td
/F1.0 10.5 Tf
<2e2020546869732063616e206d6f737420656173696c7920626520646f6e65207573696e6720746865> Tj
ET
@@ -70127,7 +70224,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 778.896 Td
+48.24 763.116 Td
/F3.0 10.5 Tf
<676574436f6e66696775726174696f6e50726f706572746965732829> Tj
ET
@@ -70138,7 +70235,7 @@ ET
0.200 0.200 0.200 SCN
BT
-195.24 778.896 Td
+195.24 763.116 Td
/F1.0 10.5 Tf
[<206d6574686f642c206469736375737365642062656c6f77> 69.82421875 <2e>] TJ
ET
@@ -70149,7 +70246,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 749.2500000000001 Td
+48.24 733.47 Td
/F3.0 10.5 Tf
<676574436f6e66696775726174696f6e50726f706572746965732829> Tj
ET
@@ -70162,7 +70259,7 @@ ET
1.688 Tw
BT
-48.24 725.0160000000001 Td
+48.24 709.236 Td
/F1.0 10.5 Tf
[<54686973206d6574686f6420616c6c6f7720617262697472> 20.01953125 <617279206f7468657220636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727469657320746f206265206f76657272696464656e2e20204f6e6520636f6d6d6f6e20757365>] TJ
ET
@@ -70175,7 +70272,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 709.2360000000001 Td
+48.24 693.456 Td
/F1.0 10.5 Tf
<6361736520697320696e20636f6e6a756e6374696f6e20776974682074686520> Tj
ET
@@ -70186,7 +70283,7 @@ ET
0.694 0.129 0.275 SCN
BT
-202.50600000000003 709.2360000000001 Td
+202.50600000000003 693.456 Td
/F3.0 10.5 Tf
<67657446697874757265732829> Tj
ET
@@ -70197,7 +70294,7 @@ ET
0.200 0.200 0.200 SCN
BT
-270.75600000000003 709.2360000000001 Td
+270.75600000000003 693.456 Td
/F1.0 10.5 Tf
<206d6574686f642c206469736375737365642061626f76653a> Tj
ET
@@ -70206,28 +70303,28 @@ ET
0.000 0.000 0.000 scn
q
0.961 0.961 0.961 scn
-52.240 693.420 m
-543.040 693.420 l
-545.249 693.420 547.040 691.629 547.040 689.420 c
-547.040 586.980 l
-547.040 584.771 545.249 582.980 543.040 582.980 c
-52.240 582.980 l
-50.031 582.980 48.240 584.771 48.240 586.980 c
-48.240 689.420 l
-48.240 691.629 50.031 693.420 52.240 693.420 c
+52.240 677.640 m
+543.040 677.640 l
+545.249 677.640 547.040 675.849 547.040 673.640 c
+547.040 571.200 l
+547.040 568.991 545.249 567.200 543.040 567.200 c
+52.240 567.200 l
+50.031 567.200 48.240 568.991 48.240 571.200 c
+48.240 673.640 l
+48.240 675.849 50.031 677.640 52.240 677.640 c
h
f
0.800 0.800 0.800 SCN
0.75 w
-52.240 693.420 m
-543.040 693.420 l
-545.249 693.420 547.040 691.629 547.040 689.420 c
-547.040 586.980 l
-547.040 584.771 545.249 582.980 543.040 582.980 c
-52.240 582.980 l
-50.031 582.980 48.240 584.771 48.240 586.980 c
-48.240 689.420 l
-48.240 691.629 50.031 693.420 52.240 693.420 c
+52.240 677.640 m
+543.040 677.640 l
+545.249 677.640 547.040 675.849 547.040 673.640 c
+547.040 571.200 l
+547.040 568.991 545.249 567.200 543.040 567.200 c
+52.240 567.200 l
+50.031 567.200 48.240 568.991 48.240 571.200 c
+48.240 673.640 l
+48.240 675.849 50.031 677.640 52.240 677.640 c
h
S
Q
@@ -70235,7 +70332,7 @@ Q
0.333 0.333 0.333 SCN
BT
-59.24 670.5950000000001 Td
+59.24 654.815 Td
/F3.0 11 Tf
<404f76657272696465> Tj
ET
@@ -70246,7 +70343,7 @@ ET
0.000 0.533 0.000 SCN
BT
-59.24 655.8550000000001 Td
+59.24 640.075 Td
/F7.0 11 Tf
<7075626c6963> Tj
ET
@@ -70257,7 +70354,7 @@ ET
0.200 0.200 0.200 SCN
BT
-92.24000000000001 655.8550000000001 Td
+92.24000000000001 640.075 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70268,7 +70365,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 655.8550000000001 Td
+97.74000000000001 640.075 Td
/F3.0 11 Tf
<4d6170> Tj
ET
@@ -70279,7 +70376,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 655.8550000000001 Td
+114.24000000000001 640.075 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -70290,7 +70387,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 655.8550000000001 Td
+119.74000000000001 640.075 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -70301,7 +70398,7 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 655.8550000000001 Td
+152.74 640.075 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -70312,7 +70409,7 @@ ET
0.200 0.200 0.200 SCN
BT
-158.24 655.8550000000001 Td
+158.24 640.075 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70323,7 +70420,7 @@ ET
0.200 0.200 0.200 SCN
BT
-163.74 655.8550000000001 Td
+163.74 640.075 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -70334,7 +70431,7 @@ ET
0.200 0.200 0.200 SCN
BT
-196.74 655.8550000000001 Td
+196.74 640.075 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -70345,7 +70442,7 @@ ET
0.200 0.200 0.200 SCN
BT
-202.24 655.8550000000001 Td
+202.24 640.075 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70356,7 +70453,7 @@ ET
0.200 0.200 0.200 SCN
BT
-207.74 655.8550000000001 Td
+207.74 640.075 Td
/F3.0 11 Tf
<676574436f6e66696775726174696f6e50726f70657274696573> Tj
ET
@@ -70367,7 +70464,7 @@ ET
0.200 0.200 0.200 SCN
BT
-350.74 655.8550000000001 Td
+350.74 640.075 Td
/F3.0 11 Tf
<2829> Tj
ET
@@ -70378,7 +70475,7 @@ ET
0.200 0.200 0.200 SCN
BT
-361.74 655.8550000000001 Td
+361.74 640.075 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70389,7 +70486,7 @@ ET
0.200 0.200 0.200 SCN
BT
-367.24 655.8550000000001 Td
+367.24 640.075 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -70400,7 +70497,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 641.1150000000002 Td
+59.24 625.335 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -70411,7 +70508,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 641.1150000000002 Td
+81.24000000000001 625.335 Td
/F3.0 11 Tf
<4d6170> Tj
ET
@@ -70422,7 +70519,7 @@ ET
0.200 0.200 0.200 SCN
BT
-97.74000000000001 641.1150000000002 Td
+97.74000000000001 625.335 Td
/F3.0 11 Tf
<3c> Tj
ET
@@ -70433,7 +70530,7 @@ ET
0.200 0.200 0.200 SCN
BT
-103.24000000000001 641.1150000000002 Td
+103.24000000000001 625.335 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -70444,7 +70541,7 @@ ET
0.200 0.200 0.200 SCN
BT
-136.24 641.1150000000002 Td
+136.24 625.335 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -70455,7 +70552,7 @@ ET
0.200 0.200 0.200 SCN
BT
-141.74 641.1150000000002 Td
+141.74 625.335 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70466,7 +70563,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 641.1150000000002 Td
+147.24 625.335 Td
/F3.0 11 Tf
<537472696e67> Tj
ET
@@ -70477,7 +70574,7 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 641.1150000000002 Td
+180.24 625.335 Td
/F3.0 11 Tf
<3e> Tj
ET
@@ -70488,7 +70585,7 @@ ET
0.200 0.200 0.200 SCN
BT
-185.74 641.1150000000002 Td
+185.74 625.335 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70499,7 +70596,7 @@ ET
0.200 0.200 0.200 SCN
BT
-191.24 641.1150000000002 Td
+191.24 625.335 Td
/F3.0 11 Tf
<70726f7073> Tj
ET
@@ -70510,7 +70607,7 @@ ET
0.200 0.200 0.200 SCN
BT
-218.74 641.1150000000002 Td
+218.74 625.335 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70521,7 +70618,7 @@ ET
0.200 0.200 0.200 SCN
BT
-224.24 641.1150000000002 Td
+224.24 625.335 Td
/F3.0 11 Tf
<3d> Tj
ET
@@ -70532,7 +70629,7 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 641.1150000000002 Td
+229.74 625.335 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70543,7 +70640,7 @@ ET
0.200 0.200 0.200 SCN
BT
-235.24 641.1150000000002 Td
+235.24 625.335 Td
/F3.0 11 Tf
<4d617073> Tj
ET
@@ -70554,7 +70651,7 @@ ET
0.200 0.200 0.200 SCN
BT
-257.24 641.1150000000002 Td
+257.24 625.335 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -70565,7 +70662,7 @@ ET
0.200 0.400 0.600 SCN
BT
-262.74 641.1150000000002 Td
+262.74 625.335 Td
/F3.0 11 Tf
<6e6577486173684d6170> Tj
ET
@@ -70576,7 +70673,7 @@ ET
0.200 0.200 0.200 SCN
BT
-317.74 641.1150000000002 Td
+317.74 625.335 Td
/F3.0 11 Tf
<28293b> Tj
ET
@@ -70587,7 +70684,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 626.3750000000002 Td
+59.24 610.5950000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -70598,7 +70695,7 @@ ET
0.200 0.200 0.200 SCN
BT
-81.24000000000001 626.3750000000002 Td
+81.24000000000001 610.5950000000001 Td
/F3.0 11 Tf
<70726f7073> Tj
ET
@@ -70609,7 +70706,7 @@ ET
0.200 0.200 0.200 SCN
BT
-108.74000000000001 626.3750000000002 Td
+108.74000000000001 610.5950000000001 Td
/F3.0 11 Tf
<2e> Tj
ET
@@ -70620,7 +70717,7 @@ ET
0.200 0.400 0.600 SCN
BT
-114.24000000000001 626.3750000000002 Td
+114.24000000000001 610.5950000000001 Td
/F3.0 11 Tf
<707574> Tj
ET
@@ -70631,7 +70728,7 @@ ET
0.200 0.200 0.200 SCN
BT
-130.74 626.3750000000002 Td
+130.74 610.5950000000001 Td
/F3.0 11 Tf
<28> Tj
ET
@@ -70642,7 +70739,7 @@ ET
0.867 0.133 0.000 SCN
BT
-136.24 626.3750000000002 Td
+136.24 610.5950000000001 Td
/F3.0 11 Tf
<22697369732e706572736973746f722e646174616e75636c6575732e696e7374616c6c2d666978747572657322> Tj
ET
@@ -70653,7 +70750,7 @@ ET
0.200 0.200 0.200 SCN
BT
-383.74 626.3750000000002 Td
+383.74 610.5950000000001 Td
/F3.0 11 Tf
<2c> Tj
ET
@@ -70664,7 +70761,7 @@ ET
0.200 0.200 0.200 SCN
BT
-389.24 626.3750000000002 Td
+389.24 610.5950000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70675,7 +70772,7 @@ ET
0.867 0.133 0.000 SCN
BT
-394.74 626.3750000000002 Td
+394.74 610.5950000000001 Td
/F3.0 11 Tf
<227472756522> Tj
ET
@@ -70686,7 +70783,7 @@ ET
0.200 0.200 0.200 SCN
BT
-427.74 626.3750000000002 Td
+427.74 610.5950000000001 Td
/F3.0 11 Tf
<293b> Tj
ET
@@ -70697,7 +70794,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 611.6350000000002 Td
+59.24 595.8550000000001 Td
/F3.0 11 Tf
<ca202020> Tj
ET
@@ -70708,7 +70805,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 611.6350000000002 Td
+81.24000000000001 595.8550000000001 Td
/F7.0 11 Tf
<72657475726e> Tj
ET
@@ -70719,7 +70816,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 611.6350000000002 Td
+114.24000000000001 595.8550000000001 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -70730,7 +70827,7 @@ ET
0.200 0.200 0.200 SCN
BT
-119.74000000000001 611.6350000000002 Td
+119.74000000000001 595.8550000000001 Td
/F3.0 11 Tf
<70726f7073> Tj
ET
@@ -70741,7 +70838,7 @@ ET
0.200 0.200 0.200 SCN
BT
-147.24 611.6350000000002 Td
+147.24 595.8550000000001 Td
/F3.0 11 Tf
<3b> Tj
ET
@@ -70752,7 +70849,7 @@ ET
0.200 0.200 0.200 SCN
BT
-59.24 596.8950000000002 Td
+59.24 581.1150000000001 Td
/F3.0 11 Tf
<7d> Tj
ET
@@ -70763,7 +70860,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 552.2960000000002 Td
+48.24 536.5160000000001 Td
/F2.0 13 Tf
[<332e312e322e20426f6f74737472> 20.01953125 <617070696e67>] TJ
ET
@@ -70776,7 +70873,7 @@ ET
1.083 Tw
BT
-48.24 525.7360000000003 Td
+48.24 509.9560000000002 Td
/F1.0 10.5 Tf
<4f6e65206f6620746865207072696d61727920676f616c73206f662074686520> Tj
ET
@@ -70791,7 +70888,7 @@ ET
1.083 Tw
BT
-213.85886694335935 525.7360000000003 Td
+213.85886694335935 509.9560000000002 Td
/F3.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
@@ -70806,7 +70903,7 @@ ET
1.083 Tw
BT
-271.6088669433593 525.7360000000003 Td
+271.6088669433593 509.9560000000002 Td
/F1.0 10.5 Tf
[<20697320746f20756e6966792074686520626f6f74737472> 20.01953125 <617070696e67206f6620626f746820696e74656772> 20.01953125 <6174696f6e207465737473>] TJ
ET
@@ -70821,7 +70918,7 @@ ET
2.610 Tw
BT
-48.24 509.95600000000024 Td
+48.24 494.17600000000016 Td
/F1.0 10.5 Tf
[<616e6420746865207765626170702e20205468697320726571756972657320746861742074686520696e74656772> 20.01953125 <6174696f6e20746573747320616e64207765626170702063616e20626f7468207265666572656e636520746865>] TJ
ET
@@ -70834,7 +70931,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 494.1760000000003 Td
+48.24 478.3960000000002 Td
/F1.0 10.5 Tf
<696d706c656d656e746174696f6e2e> Tj
ET
@@ -70847,7 +70944,7 @@ ET
3.013 Tw
BT
-48.24 466.39600000000024 Td
+48.24 450.61600000000016 Td
/F1.0 10.5 Tf
[<57> 60.05859375 <65207374726f6e676c79207265636f6d6d656e64207573696e67206120>] TJ
ET
@@ -70862,7 +70959,7 @@ ET
3.013 Tw
BT
-227.40662139423074 466.39600000000024 Td
+227.40662139423074 450.61600000000016 Td
/F3.0 10.5 Tf
<6d796170702d617070> Tj
ET
@@ -70877,7 +70974,7 @@ ET
3.013 Tw
BT
-274.65662139423074 466.39600000000024 Td
+274.65662139423074 450.61600000000016 Td
/F1.0 10.5 Tf
<204d6176656e206d6f64756c6520746f20686f6c642074686520696d706c656d656e746174696f6e206f6620746865> Tj
ET
@@ -70892,7 +70989,7 @@ ET
2.265 Tw
BT
-48.24 450.6160000000002 Td
+48.24 434.8360000000001 Td
/F3.0 10.5 Tf
<4170704d616e6966657374> Tj
ET
@@ -70907,7 +71004,7 @@ ET
2.265 Tw
BT
-105.99000000000001 450.6160000000002 Td
+105.99000000000001 434.8360000000001 Td
/F1.0 10.5 Tf
<2e202054686973204d6176656e206d6f64756c652063616e207468656e20616c736f20686f6c6420646570656e64656e636965732077686963682061726520636f6d6d6f6e20746f20626f7468> Tj
ET
@@ -70922,7 +71019,7 @@ ET
1.344 Tw
BT
-48.24 434.83600000000024 Td
+48.24 419.05600000000015 Td
/F1.0 10.5 Tf
[<696e74656772> 20.01953125 <6174696f6e20746573747320616e6420746865207765626170702c207370656369666963616c6c792074686520>] TJ
ET
@@ -70937,7 +71034,7 @@ ET
1.344 Tw
BT
-304.3330099826388 434.83600000000024 Td
+304.3330099826388 419.05600000000015 Td
/F3.0 10.5 Tf
<6f72672e6170616368652e697369732e636f72653a697369732d636f72652d72756e74696d65> Tj
ET
@@ -70952,7 +71049,7 @@ ET
1.344 Tw
BT
-503.8330099826388 434.83600000000024 Td
+503.8330099826388 419.05600000000015 Td
/F1.0 10.5 Tf
<20616e6420746865> Tj
ET
@@ -70965,7 +71062,7 @@ ET
0.694 0.129 0.275 SCN
BT
-48.24 419.05600000000027 Td
+48.24 403.2760000000002 Td
/F3.0 10.5 Tf
<6f72672e6170616368652e697369732e636f72653a697369732d636f72652d77726170706572> Tj
ET
@@ -70976,7 +71073,7 @@ ET
0.200 0.200 0.200 SCN
BT
-247.74 419.05600000000027 Td
+247.74 403.2760000000002 Td
/F1.0 10.5 Tf
<206d6f64756c65732e> Tj
ET
@@ -70989,7 +71086,7 @@ ET
1.719 Tw
BT
-48.24 391.27600000000024 Td
+48.24 375.49600000000015 Td
/F1.0 10.5 Tf
[<57> 60.05859375 <6520616c736f207374726f6e676c79207265636f6d6d656e64207468617420616e> 20.01953125 <79206170706c69636174696f6e2d6c61> 20.01953125 <79657220646f6d61696e20736572766963657320616e642076696577206d6f64656c732028636f6465>] TJ
ET
@@ -71004,7 +71101,7 @@ ET
1.011 Tw
BT
-48.24 375.4960000000002 Td
+48.24 359.7160000000001 Td
/F1.0 10.5 Tf
<74686174207265666572656e6365732070657273697374656e7420646f6d61696e20656e746974696573206275742074686174206973206e6f74207265666572656e636564206261636b29206973206d6f76656420746f207468697320> Tj
ET
@@ -71019,7 +71116,7 @@ ET
1.011 Tw
BT
-515.54 375.4960000000002 Td
+515.54 359.7160000000001 Td
/F3.0 10.5 Tf
<6d796170702d> Tj
ET
@@ -71034,7 +71131,7 @@ ET
0.869 Tw
BT
-48.24 359.71600000000024 Td
+48.24 343.93600000000015 Td
/F3.0 10.5 Tf
<617070> Tj
ET
@@ -71049,7 +71146,7 @@ ET
0.869 Tw
BT
-63.99 359.71600000000024 Td
+63.99 343.93600000000015 Td
/F1.0 10.5 Tf
[<206d6f64756c652e2020546869732077696c6c20616c6c6f7720746865206172636869746563747572> 20.01953125 <616c206c61> 20.01953125 <796572696e67206f6620746865206f766572> 20.01953125 <616c6c206170706c69636174696f6e20746f20626520656e666f726365642062> 20.01953125 <79>] TJ
ET
@@ -71062,7 +71159,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 343.93600000000026 Td
+48.24 328.1560000000002 Td
/F1.0 10.5 Tf
<4d6176656e2e> Tj
ET
@@ -71073,7 +71170,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 316.15600000000023 Td
+48.24 300.37600000000015 Td
/F1.0 10.5 Tf
[<57686174207468656e2072656d61696e7320697320746f207570646174652074686520626f6f74737472> 20.01953125 <617070696e6720636f646520697473656c662e>] TJ
ET
@@ -71084,7 +71181,7 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 284.32600000000025 Td
+48.24 268.54600000000016 Td
/F2.0 10.5 Tf
[<496e74656772> 20.01953125 <6174696f6e2054> 29.78515625 <65737473>] TJ
ET
@@ -71094,12 +71191,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.656 Tw
+1.743 Tw
BT
-48.24 258.4960000000002 Td
+48.24 242.71600000000012 Td
/F1.0 10.5 Tf
-[<426f6f74737472> 20.01953125 <617070696e6720696e74656772> 20.01953125 <6174696f6e207465737473206973207374696c6c20706572666f726d6564207573696e672074686520>] TJ
+<4120> Tj
ET
@@ -71109,12 +71206,12 @@ ET
0.694 0.129 0.275 scn
0.694 0.129 0.275 SCN
-2.656 Tw
+1.743 Tw
BT
-363.05941796875 258.4960000000002 Td
+60.10484375 242.71600000000012 Td
/F3.0 10.5 Tf
-<4973697353797374656d466f72546573742e4275696c646572> Tj
+<4170704d616e69666573742e5574696c> Tj
ET
@@ -71124,12 +71221,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-2.656 Tw
+1.743 Tw
BT
-494.30941796875 258.4960000000002 Td
+144.10484375 242.71600000000012 Td
/F1.0 10.5 Tf
-<2c206275742076657279> Tj
+<2068656c70657220636c6173732070726f76696465732061206e756d626572206f6620737461746963206d6574686f647320746861742063616e206265207573656420746f20736574207570> Tj
ET
@@ -71139,27 +71236,12 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.238 Tw
+0.505 Tw
BT
-48.24 242.7160000000002 Td
+48.24 226.93600000000012 Td
/F1.0 10.5 Tf
-[<6f6674656e2074686520626f6f74737472> 20.01953125 <617070696e6720636f64652063616e206265207375627374616e7469616c6c792073696d706c69666965642028636f6d706172656420746f206e6f74207573696e6720616e20>] TJ
-ET
-
-
-0.000 Tw
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.694 0.129 0.275 scn
-0.694 0.129 0.275 SCN
-
-0.238 Tw
-
-BT
-486.66499999999996 242.7160000000002 Td
-/F3.0 10.5 Tf
-<4170704d616e6966657374> Tj
+[<636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727469657320617070726f70726961746520666f7220696e74656772> 20.01953125 <6174696f6e2074657374696e67202865672072756e207573696e6720616e20696e2d6d656d6f7279206461746162617365292e>] TJ
ET
@@ -71169,25 +71251,25 @@ ET
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
-0.238 Tw
+0.876 Tw
BT
-544.415 242.7160000000002 Td
+48.24 211.15600000000012 Td
/F1.0 10.5 Tf
-<2c> Tj
+[<5468697320616c6c6f77732074686520726573706f6e736962696c697479206f662072657475726e696e672074686520636f6e6669677572> 20.01953125 <6174696f6e2070726f7065727469657320746f2062656c6f6e672065786c75736976656c7920746f20746865>] TJ
ET
0.000 Tw
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.200 0.200 0.200 scn
-0.200 0.200 0.200 SCN
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
BT
-48.24 226.9360000000002 Td
-/F1.0 10.5 Tf
-<74686174206973292e> Tj
+48.24 195.37600000000012 Td
+/F3.0 10.5 Tf
+<4170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
@@ -71196,20 +71278,9 @@ ET
0.200 0.200 0.200 SCN
BT
-48.24 199.1560000000002 Td
+105.99000000000001 195.37600000000012 Td
/F1.0 10.5 Tf
-[<46> 40.0390625 <6f72206578616d706c652c20746869732069732074686520626f6f74737472> 20.01953125 <617070696e6720636f646520666f722074686520>] TJ
-ET
-
-0.000 0.000 0.000 SCN
-0.000 0.000 0.000 scn
-0.259 0.545 0.792 scn
-0.259 0.545 0.792 SCN
-
-BT
-301.499384765625 199.1560000000002 Td
-/F1.0 10.5 Tf
-<53696d706c6541707020617263686574797065> Tj
+<2e> Tj
ET
0.000 0.000 0.000 SCN
@@ -71218,9 +71289,9 @@ ET
0.200 0.200 0.200 SCN
BT
-408.72538476562505 199.1560000000002 Td
+48.24 167.59600000000012 Td
/F1.0 10.5 Tf
-[<206c6f6f6b7320736f6d657468696e67206c696b> 20.01953125 <653a>] TJ
+<546865726520617265207468726565207375636820737461746963206d6574686f64733a> Tj
ET
0.000 0.000 0.000 SCN
@@ -71255,22 +71326,21 @@ endobj
/MediaBox [0 0 595.28 841.89]
/Contents 439 0 R
/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/Font << /F3.0 18 0 R
-/F1.0 8 0 R
+/Font << /F1.0 8 0 R
+/F3.0 18 0 R
/F7.0 140 0 R
/F2.0 16 0 R
>>
/XObject << /Stamp1 1017 0 R
>>
>>
-/Annots [445 0 R]
>>
endobj
441 0 obj
-[440 0 R /XYZ 0 763.08 null]
+[440 0 R /XYZ 0 747.3 null]
endobj
442 0 obj
-[440 0 R /XYZ 0 570.9800000000001 null]
+[440 0 R /XYZ 0 555.2 null]
endobj
443 0 obj
<< /Limits [(code-objectsdto-code) (properties)]
@@ -71278,21 +71348,10 @@ endobj
>>
endobj
444 0 obj
-[440 0 R /XYZ 0 300.34000000000026 null]
+[440 0 R /XYZ 0 284.5600000000002 null]
endobj
445 0 obj
-<< /Border [0 0 0]
-/A << /Type /Action
-/S /URI
-/URI (ugfun.pdf#_ugfun_getting-started_simpleapp-archetype)
->>
-/Subtype /Link
-/Rect [301.499384765625 196.0900000000002 408.72538476562505 210.3700000000002]
-/Type /Annot
->>
-endobj
-446 0 obj
-<< /Length 34742
+<< /Length 47115
>>
stream
q
@@ -71302,10 +71361,10 @@ q
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 581.530 l
-547.040 579.321 545.249 577.530 543.040 577.530 c
-52.240 577.530 l
-50.031 577.530 48.240 579.321 48.240 581.530 c
+547.040 625.750 l
+547.040 623.541 545.249 621.750 543.040 621.750 c
+52.240 621.750 l
+50.031 621.750 48.240 623.541 48.240 625.750 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -71316,10 +71375,10 @@ f
52.240 805.890 m
543.040 805.890 l
545.249 805.890 547.040 804.099 547.040 801.890 c
-547.040 581.530 l
-547.040 579.321 545.249 577.530 543.040 577.530 c
-52.240 577.530 l
-50.031 577.530 48.240 579.321 48.240 581.530 c
+547.040 625.750 l
+547.040 623.541 545.249 621.750 543.040 621.750 c
+52.240 621.750 l
+50.031 621.750 48.240 623.541 48.240 625.750 c
48.240 801.890 l
48.240 804.099 50.031 805.890 52.240 805.890 c
h
@@ -71355,7 +71414,7 @@ ET
BT
97.74000000000001 783.0649999999999 Td
/F7.0 11 Tf
-<636c617373> Tj
+<696e74657266616365> Tj
ET
0.000 0.000 0.000 SCN
@@ -71364,7 +71423,7 @@ ET
0.200 0.200 0.200 SCN
BT
-125.24000000000001 783.0649999999999 Td
+147.24 783.0649999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71375,9 +71434,9 @@ ET
0.733 0.000 0.400 SCN
BT
-130.74 783.0649999999999 Td
+152.74 783.0649999999999 Td
/F7.0 11 Tf
-<446f6d61696e41707053797374656d496e697469616c697a6572> Tj
+<4170704d616e6966657374> Tj
ET
0.000 0.000 0.000 SCN
@@ -71386,7 +71445,7 @@ ET
0.200 0.200 0.200 SCN
BT
-273.74 783.0649999999999 Td
+213.24 783.0649999999999 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71397,7 +71456,7 @@ ET
0.200 0.200 0.200 SCN
BT
-279.24 783.0649999999999 Td
+218.74 783.0649999999999 Td
/F3.0 11 Tf
<7b> Tj
ET
@@ -71410,7 +71469,29 @@ ET
BT
59.24 768.3249999999999 Td
/F3.0 11 Tf
-<ca202020> Tj
+<ca20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+70.24000000000001 768.3249999999999 Td
+/F3.0 11 Tf
+<2e2e2e> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+BT
+59.24 753.585 Td
+/F3.0 11 Tf
+<ca20> Tj
ET
0.000 0.000 0.000 SCN
@@ -71419,7 +71500,7 @@ ET
0.000 0.533 0.000 SCN
BT
-81.24000000000001 768.3249999999999 Td
+70.24000000000001 753.585 Td
/F7.0 11 Tf
<7075626c6963> Tj
ET
@@ -71430,7 +71511,7 @@ ET
0.200 0.200 0.200 SCN
BT
-114.24000000000001 768.3249999999999 Td
+103.24000000000001 753.585 Td
/F3.0 11 Tf
<20> Tj
ET
@@ -71441,7 +71522,7 @@ ET
0.000 0.533 0.000 SCN
BT
-119.74000000000001 768.3249999999999 Td
+108.74000000000001 753.585 Td
/F7.0 11 Tf
<737461746963> Tj
ET
@@ -71452,20 +71533,20 @@ ET
0.200 0.200 0.200 SCN
BT
-152.74 768.3249999999999 Td
+141.74 753.585 Td
/F3.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
-0.533 0.533 0.533 scn
-0.533 0.533 0.533 SCN
+0.000 0.533 0.000 scn
+0.000 0.533 0.000 SCN
BT
-158.24 768.3249999999999 Td
+147.24 753.585 Td
/F7.0 11 Tf
-<766f6964> Tj
+<636c617373> Tj
ET
0.000 0.000 0.000 SCN
@@ -71474,20 +71555,31 @@ ET
0.200 0.200 0.200 SCN
BT
-180.24 768.3249999999999 Td
+174.74 753.585 Td
/F3.0 11 Tf
<20> Tj
ET
0.000 0.000 0.000 SCN
0.000 0.000 0.000 scn
+0.733 0.000 0.400 scn
+0.733 0.000 0.400 SCN
+
+BT
+180.24 753.585 Td
+/F7.0 11 Tf
+<5574696c> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
0.200 0.200 0.200 scn
0.200 0.200 0.200 SCN
BT
-185.74 768.3249999999999 Td
+202.24 753.585 Td
/F3.0 11 Tf
-<696e697449736674> Tj
+<20> Tj
ET
0.000 0.000 0.000 SCN
@@ -71496,9 +71588,9 @@ ET
0.200 0.200 0.200 SCN
BT
-229.74 768.3249999999999 Td
+207.74 753.585 Td
/F3.0 11 Tf
-<2829> Tj
+<7b> Tj
ET
0.000 0.000 0.000 SCN
@@ -71507,9 +71599,20 @@ ET
0.200 0.200 0.200 SCN
BT
-240.74 768.3249999999999 Td
+59.24 738.845 Td
/F3.0 11 Tf
-<20> Tj
+<ca202020> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.533 0.000 scn
+0.000 0.533 0.000 SCN
+
+BT
+81.24000000000001 738.845 Td
+/F7.0 11 Tf
+<7075626c6963> Tj
ET
0.000 0.000 0.000 SCN
@@ -71518,9 +71621,20 @@ ET
0.200 0.200 0.200 SCN
BT
-246.24 768.3249999999999 Td
+114.24000000000001 738.845 Td
/F3.0 11 Tf
-<7b> Tj
+<20> Tj
+ET
+
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.000 0.533 0.000 scn
+0.000 0.533 0.000 SCN
+
+BT
+119.74000000000001 738.845 Td
+/F7.0 11 Tf
+<737461746963> Tj
ET
0.000 0.000 0.000 SCN
@@ -71529,9 +71643,9 @@ ET
0.200 0.200 0.200 SCN
<TRUNCATED>
[3/3] isis-site git commit: docs for framework internal services,
bump archetype version, AppManifest.Util docs, swagger-ui screenshots
Posted by da...@apache.org.
docs for framework internal services, bump archetype version, AppManifest.Util docs, swagger-ui screenshots
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/99710b5f
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/99710b5f
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/99710b5f
Branch: refs/heads/asf-site
Commit: 99710b5f8b04f22d5fb3b018f430abddea737bdf
Parents: c5f2b2e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 14 12:17:27 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 14 12:17:27 2016 +0100
----------------------------------------------------------------------
content/css/slick/1.5.0/config.rb | 18 +-
content/css/slick/1.5.0/fonts/slick.svg | 28 +-
content/css/slick/1.5.0/slick-theme.css | 402 +-
content/css/slick/1.5.0/slick-theme.scss | 372 +-
content/css/slick/1.5.0/slick.css | 230 +-
content/css/slick/1.5.0/slick.scss | 190 +-
content/guides/rgcms.html | 70 +-
content/guides/rgcms.pdf | 11901 ++++++++++-------
content/guides/tg.html | 4 +-
content/guides/tg.pdf | 8 +-
content/guides/ugfun.html | 2 +-
content/guides/ugfun.pdf | 6 +-
.../images/isis-in-pictures/205-swagger-ui.png | Bin 0 -> 138809 bytes
content/images/todoapp/swagger-ui.png | Bin 0 -> 105485 bytes
content/index.html | 22 +-
content/isis-in-pictures.html | 12 +-
16 files changed, 7796 insertions(+), 5469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/css/slick/1.5.0/config.rb
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/config.rb b/content/css/slick/1.5.0/config.rb
index 81f5ae3..d9504b1 100644
--- a/content/css/slick/1.5.0/config.rb
+++ b/content/css/slick/1.5.0/config.rb
@@ -1,10 +1,10 @@
-css_dir = "."
-sass_dir = "."
-images_dir = "."
-fonts_dir = "fonts"
-relative_assets = true
-
-output_style = :compact
-line_comments = false
-
+css_dir = "."
+sass_dir = "."
+images_dir = "."
+fonts_dir = "fonts"
+relative_assets = true
+
+output_style = :compact
+line_comments = false
+
preferred_syntax = :scss
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/css/slick/1.5.0/fonts/slick.svg
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/fonts/slick.svg b/content/css/slick/1.5.0/fonts/slick.svg
index b36a66a..60fbaf1 100644
--- a/content/css/slick/1.5.0/fonts/slick.svg
+++ b/content/css/slick/1.5.0/fonts/slick.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by Fontastic.me</metadata>
-<defs>
-<font id="slick" horiz-adv-x="512">
-<font-face font-family="slick" units-per-em="512" ascent="480" descent="-32"/>
-<missing-glyph horiz-adv-x="512" />
-
-<glyph unicode="→" d="M241 113l130 130c4 4 6 8 6 13 0 5-2 9-6 13l-130 130c-3 3-7 5-12 5-5 0-10-2-13-5l-29-30c-4-3-6-7-6-12 0-5 2-10 6-13l87-88-87-88c-4-3-6-8-6-13 0-5 2-9 6-12l29-30c3-3 8-5 13-5 5 0 9 2 12 5z m234 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="←" d="M296 113l29 30c4 3 6 7 6 12 0 5-2 10-6 13l-87 88 87 88c4 3 6 8 6 13 0 5-2 9-6 12l-29 30c-3 3-8 5-13 5-5 0-9-2-12-5l-130-130c-4-4-6-8-6-13 0-5 2-9 6-13l130-130c3-3 7-5 12-5 5 0 10 2 13 5z m179 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="•" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
-<glyph unicode="a" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
-</font></defs></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by Fontastic.me</metadata>
+<defs>
+<font id="slick" horiz-adv-x="512">
+<font-face font-family="slick" units-per-em="512" ascent="480" descent="-32"/>
+<missing-glyph horiz-adv-x="512" />
+
+<glyph unicode="→" d="M241 113l130 130c4 4 6 8 6 13 0 5-2 9-6 13l-130 130c-3 3-7 5-12 5-5 0-10-2-13-5l-29-30c-4-3-6-7-6-12 0-5 2-10 6-13l87-88-87-88c-4-3-6-8-6-13 0-5 2-9 6-12l29-30c3-3 8-5 13-5 5 0 9 2 12 5z m234 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph unicode="←" d="M296 113l29 30c4 3 6 7 6 12 0 5-2 10-6 13l-87 88 87 88c4 3 6 8 6 13 0 5-2 9-6 12l-29 30c-3 3-8 5-13 5-5 0-9-2-12-5l-130-130c-4-4-6-8-6-13 0-5 2-9 6-13l130-130c3-3 7-5 12-5 5 0 10 2 13 5z m179 143c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph unicode="•" d="M475 256c0-40-9-77-29-110-20-34-46-60-80-80-33-20-70-29-110-29-40 0-77 9-110 29-34 20-60 46-80 80-20 33-29 70-29 110 0 40 9 77 29 110 20 34 46 60 80 80 33 20 70 29 110 29 40 0 77-9 110-29 34-20 60-46 80-80 20-33 29-70 29-110z"/>
+<glyph unicode="a" d="M475 439l0-128c0-5-1-9-5-13-4-4-8-5-13-5l-128 0c-8 0-13 3-17 11-3 7-2 14 4 20l40 39c-28 26-62 39-100 39-20 0-39-4-57-11-18-8-33-18-46-32-14-13-24-28-32-46-7-18-11-37-11-57 0-20 4-39 11-57 8-18 18-33 32-46 13-14 28-24 46-32 18-7 37-11 57-11 23 0 44 5 64 15 20 9 38 23 51 42 2 1 4 3 7 3 3 0 5-1 7-3l39-39c2-2 3-3 3-6 0-2-1-4-2-6-21-25-46-45-76-59-29-14-60-20-93-20-30 0-58 5-85 17-27 12-51 27-70 47-20 19-35 43-47 70-12 27-17 55-17 85 0 30 5 58 17 85 12 27 27 51 47 70 19 20 43 35 70 47 27 12 55 17 85 17 28 0 55-5 81-15 26-11 50-26 70-45l37 37c6 6 12 7 20 4 8-4 11-9 11-17z"/>
+</font></defs></svg>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/css/slick/1.5.0/slick-theme.css
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick-theme.css b/content/css/slick/1.5.0/slick-theme.css
index a53cd69..22e3498 100644
--- a/content/css/slick/1.5.0/slick-theme.css
+++ b/content/css/slick/1.5.0/slick-theme.css
@@ -1,201 +1,201 @@
-@charset 'UTF-8';
-/* Slider */
-.slick-loading .slick-list
-{
- background: #fff url('./ajax-loader.gif') center center no-repeat;
-}
-
-/* Icons */
-@font-face
-{
- font-family: 'slick';
- font-weight: normal;
- font-style: normal;
-
- src: url('./fonts/slick.eot');
- src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg');
-}
-/* Arrows */
-.slick-prev,
-.slick-next
-{
- font-size: 0;
- line-height: 0;
-
- position: absolute;
- top: 50%;
-
- display: block;
-
- width: 20px;
- height: 20px;
- margin-top: -10px;
- padding: 0;
-
- cursor: pointer;
-
- color: transparent;
- border: none;
- outline: none;
- background: transparent;
-}
-.slick-prev:hover,
-.slick-prev:focus,
-.slick-next:hover,
-.slick-next:focus
-{
- color: transparent;
- outline: none;
- background: transparent;
-}
-.slick-prev:hover:before,
-.slick-prev:focus:before,
-.slick-next:hover:before,
-.slick-next:focus:before
-{
- opacity: 1;
-}
-.slick-prev.slick-disabled:before,
-.slick-next.slick-disabled:before
-{
- opacity: .25;
-}
-
-.slick-prev:before,
-.slick-next:before
-{
- font-family: 'slick';
- font-size: 20px;
- line-height: 1;
-
- opacity: .75;
- color: white;
-
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.slick-prev
-{
- left: -25px;
-}
-[dir='rtl'] .slick-prev
-{
- right: -25px;
- left: auto;
-}
-.slick-prev:before
-{
- content: '\u2190';
-}
-[dir='rtl'] .slick-prev:before
-{
- content: '\u2192';
-}
-
-.slick-next
-{
- right: -25px;
-}
-[dir='rtl'] .slick-next
-{
- right: auto;
- left: -25px;
-}
-.slick-next:before
-{
- content: '\u2192';
-}
-[dir='rtl'] .slick-next:before
-{
- content: '\u2190';
-}
-
-/* Dots */
-.slick-slider
-{
- margin-bottom: 30px;
-}
-
-.slick-dots
-{
- position: absolute;
- bottom: -45px;
-
- display: block;
-
- width: 100%;
- padding: 0;
-
- list-style: none;
-
- text-align: center;
-}
-.slick-dots li
-{
- position: relative;
-
- display: inline-block;
-
- width: 20px;
- height: 20px;
- margin: 0 5px;
- padding: 0;
-
- cursor: pointer;
-}
-.slick-dots li button
-{
- font-size: 0;
- line-height: 0;
-
- display: block;
-
- width: 20px;
- height: 20px;
- padding: 5px;
-
- cursor: pointer;
-
- color: transparent;
- border: 0;
- outline: none;
- background: transparent;
-}
-.slick-dots li button:hover,
-.slick-dots li button:focus
-{
- outline: none;
-}
-.slick-dots li button:hover:before,
-.slick-dots li button:focus:before
-{
- opacity: 1;
-}
-.slick-dots li button:before
-{
- font-family: 'slick';
- font-size: 6px;
- line-height: 20px;
-
- position: absolute;
- top: 0;
- left: 0;
-
- width: 20px;
- height: 20px;
-
- content: '\u2022';
- text-align: center;
-
- opacity: .25;
- color: black;
-
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-.slick-dots li.slick-active button:before
-{
- opacity: .75;
- color: black;
-}
+@charset 'UTF-8';
+/* Slider */
+.slick-loading .slick-list
+{
+ background: #fff url('./ajax-loader.gif') center center no-repeat;
+}
+
+/* Icons */
+@font-face
+{
+ font-family: 'slick';
+ font-weight: normal;
+ font-style: normal;
+
+ src: url('./fonts/slick.eot');
+ src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg');
+}
+/* Arrows */
+.slick-prev,
+.slick-next
+{
+ font-size: 0;
+ line-height: 0;
+
+ position: absolute;
+ top: 50%;
+
+ display: block;
+
+ width: 20px;
+ height: 20px;
+ margin-top: -10px;
+ padding: 0;
+
+ cursor: pointer;
+
+ color: transparent;
+ border: none;
+ outline: none;
+ background: transparent;
+}
+.slick-prev:hover,
+.slick-prev:focus,
+.slick-next:hover,
+.slick-next:focus
+{
+ color: transparent;
+ outline: none;
+ background: transparent;
+}
+.slick-prev:hover:before,
+.slick-prev:focus:before,
+.slick-next:hover:before,
+.slick-next:focus:before
+{
+ opacity: 1;
+}
+.slick-prev.slick-disabled:before,
+.slick-next.slick-disabled:before
+{
+ opacity: .25;
+}
+
+.slick-prev:before,
+.slick-next:before
+{
+ font-family: 'slick';
+ font-size: 20px;
+ line-height: 1;
+
+ opacity: .75;
+ color: white;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.slick-prev
+{
+ left: -25px;
+}
+[dir='rtl'] .slick-prev
+{
+ right: -25px;
+ left: auto;
+}
+.slick-prev:before
+{
+ content: '\u2190';
+}
+[dir='rtl'] .slick-prev:before
+{
+ content: '\u2192';
+}
+
+.slick-next
+{
+ right: -25px;
+}
+[dir='rtl'] .slick-next
+{
+ right: auto;
+ left: -25px;
+}
+.slick-next:before
+{
+ content: '\u2192';
+}
+[dir='rtl'] .slick-next:before
+{
+ content: '\u2190';
+}
+
+/* Dots */
+.slick-slider
+{
+ margin-bottom: 30px;
+}
+
+.slick-dots
+{
+ position: absolute;
+ bottom: -45px;
+
+ display: block;
+
+ width: 100%;
+ padding: 0;
+
+ list-style: none;
+
+ text-align: center;
+}
+.slick-dots li
+{
+ position: relative;
+
+ display: inline-block;
+
+ width: 20px;
+ height: 20px;
+ margin: 0 5px;
+ padding: 0;
+
+ cursor: pointer;
+}
+.slick-dots li button
+{
+ font-size: 0;
+ line-height: 0;
+
+ display: block;
+
+ width: 20px;
+ height: 20px;
+ padding: 5px;
+
+ cursor: pointer;
+
+ color: transparent;
+ border: 0;
+ outline: none;
+ background: transparent;
+}
+.slick-dots li button:hover,
+.slick-dots li button:focus
+{
+ outline: none;
+}
+.slick-dots li button:hover:before,
+.slick-dots li button:focus:before
+{
+ opacity: 1;
+}
+.slick-dots li button:before
+{
+ font-family: 'slick';
+ font-size: 6px;
+ line-height: 20px;
+
+ position: absolute;
+ top: 0;
+ left: 0;
+
+ width: 20px;
+ height: 20px;
+
+ content: '\u2022';
+ text-align: center;
+
+ opacity: .25;
+ color: black;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+.slick-dots li.slick-active button:before
+{
+ opacity: .75;
+ color: black;
+}
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/css/slick/1.5.0/slick-theme.scss
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick-theme.scss b/content/css/slick/1.5.0/slick-theme.scss
index e00802b..880a7cb 100644
--- a/content/css/slick/1.5.0/slick-theme.scss
+++ b/content/css/slick/1.5.0/slick-theme.scss
@@ -1,187 +1,187 @@
-@charset "UTF-8";
-
-// Default Variables
-
-$slick-font-path: "./fonts/" !default;
-$slick-font-family: "slick" !default;
-$slick-loader-path: "./" !default;
-$slick-arrow-color: white !default;
-$slick-dot-color: black !default;
-$slick-dot-color-active: $slick-dot-color !default;
-$slick-prev-character: "\u2190" !default;
-$slick-next-character: "\u2192" !default;
-$slick-dot-character: "\u2022" !default;
-$slick-dot-size: 6px !default;
-$slick-opacity-default: 0.75 !default;
-$slick-opacity-on-hover: 1 !default;
-$slick-opacity-not-active: 0.25 !default;
-
-@function slick-image-url($url) {
- @if function-exists(image-url) {
- @return image-url($url);
- }
- @else {
- @return url($slick-loader-path + $url);
- }
-}
-
-@function slick-font-url($url) {
- @if function-exists(font-url) {
- @return font-url($url);
- }
- @else {
- @return url($slick-font-path + $url);
- }
-}
-
-/* Slider */
-
-.slick-list {
- .slick-loading & {
- background: #fff slick-image-url("ajax-loader.gif") center center no-repeat;
- }
-}
-
-/* Icons */
-@if $slick-font-family == "slick" {
- @font-face {
- font-family: "slick";
- src: slick-font-url("slick.eot");
- src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"), slick-font-url("slick.woff") format("woff"), slick-font-url("slick.ttf") format("truetype"), slick-font-url("slick.svg#slick") format("svg");
- font-weight: normal;
- font-style: normal;
- }
-}
-
-/* Arrows */
-
-.slick-prev,
-.slick-next {
- position: absolute;
- display: block;
- height: 20px;
- width: 20px;
- line-height: 0px;
- font-size: 0px;
- cursor: pointer;
- background: transparent;
- color: transparent;
- top: 50%;
- margin-top: -10px;
- padding: 0;
- border: none;
- outline: none;
- &:hover, &:focus {
- outline: none;
- background: transparent;
- color: transparent;
- &:before {
- opacity: $slick-opacity-on-hover;
- }
- }
- &.slick-disabled:before {
- opacity: $slick-opacity-not-active;
- }
-}
-
-.slick-prev:before, .slick-next:before {
- font-family: $slick-font-family;
- font-size: 20px;
- line-height: 1;
- color: $slick-arrow-color;
- opacity: $slick-opacity-default;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.slick-prev {
- left: -25px;
- [dir="rtl"] & {
- left: auto;
- right: -25px;
- }
- &:before {
- content: $slick-prev-character;
- [dir="rtl"] & {
- content: $slick-next-character;
- }
- }
-}
-
-.slick-next {
- right: -25px;
- [dir="rtl"] & {
- left: -25px;
- right: auto;
- }
- &:before {
- content: $slick-next-character;
- [dir="rtl"] & {
- content: $slick-prev-character;
- }
- }
-}
-
-/* Dots */
-
-.slick-slider {
- margin-bottom: 30px;
-}
-
-.slick-dots {
- position: absolute;
- bottom: -45px;
- list-style: none;
- display: block;
- text-align: center;
- padding: 0;
- width: 100%;
- li {
- position: relative;
- display: inline-block;
- height: 20px;
- width: 20px;
- margin: 0 5px;
- padding: 0;
- cursor: pointer;
- button {
- border: 0;
- background: transparent;
- display: block;
- height: 20px;
- width: 20px;
- outline: none;
- line-height: 0px;
- font-size: 0px;
- color: transparent;
- padding: 5px;
- cursor: pointer;
- &:hover, &:focus {
- outline: none;
- &:before {
- opacity: $slick-opacity-on-hover;
- }
- }
- &:before {
- position: absolute;
- top: 0;
- left: 0;
- content: $slick-dot-character;
- width: 20px;
- height: 20px;
- font-family: $slick-font-family;
- font-size: $slick-dot-size;
- line-height: 20px;
- text-align: center;
- color: $slick-dot-color;
- opacity: $slick-opacity-not-active;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- }
- }
- &.slick-active button:before {
- color: $slick-dot-color-active;
- opacity: $slick-opacity-default;
- }
- }
+@charset "UTF-8";
+
+// Default Variables
+
+$slick-font-path: "./fonts/" !default;
+$slick-font-family: "slick" !default;
+$slick-loader-path: "./" !default;
+$slick-arrow-color: white !default;
+$slick-dot-color: black !default;
+$slick-dot-color-active: $slick-dot-color !default;
+$slick-prev-character: "\u2190" !default;
+$slick-next-character: "\u2192" !default;
+$slick-dot-character: "\u2022" !default;
+$slick-dot-size: 6px !default;
+$slick-opacity-default: 0.75 !default;
+$slick-opacity-on-hover: 1 !default;
+$slick-opacity-not-active: 0.25 !default;
+
+@function slick-image-url($url) {
+ @if function-exists(image-url) {
+ @return image-url($url);
+ }
+ @else {
+ @return url($slick-loader-path + $url);
+ }
+}
+
+@function slick-font-url($url) {
+ @if function-exists(font-url) {
+ @return font-url($url);
+ }
+ @else {
+ @return url($slick-font-path + $url);
+ }
+}
+
+/* Slider */
+
+.slick-list {
+ .slick-loading & {
+ background: #fff slick-image-url("ajax-loader.gif") center center no-repeat;
+ }
+}
+
+/* Icons */
+@if $slick-font-family == "slick" {
+ @font-face {
+ font-family: "slick";
+ src: slick-font-url("slick.eot");
+ src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"), slick-font-url("slick.woff") format("woff"), slick-font-url("slick.ttf") format("truetype"), slick-font-url("slick.svg#slick") format("svg");
+ font-weight: normal;
+ font-style: normal;
+ }
+}
+
+/* Arrows */
+
+.slick-prev,
+.slick-next {
+ position: absolute;
+ display: block;
+ height: 20px;
+ width: 20px;
+ line-height: 0px;
+ font-size: 0px;
+ cursor: pointer;
+ background: transparent;
+ color: transparent;
+ top: 50%;
+ margin-top: -10px;
+ padding: 0;
+ border: none;
+ outline: none;
+ &:hover, &:focus {
+ outline: none;
+ background: transparent;
+ color: transparent;
+ &:before {
+ opacity: $slick-opacity-on-hover;
+ }
+ }
+ &.slick-disabled:before {
+ opacity: $slick-opacity-not-active;
+ }
+}
+
+.slick-prev:before, .slick-next:before {
+ font-family: $slick-font-family;
+ font-size: 20px;
+ line-height: 1;
+ color: $slick-arrow-color;
+ opacity: $slick-opacity-default;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.slick-prev {
+ left: -25px;
+ [dir="rtl"] & {
+ left: auto;
+ right: -25px;
+ }
+ &:before {
+ content: $slick-prev-character;
+ [dir="rtl"] & {
+ content: $slick-next-character;
+ }
+ }
+}
+
+.slick-next {
+ right: -25px;
+ [dir="rtl"] & {
+ left: -25px;
+ right: auto;
+ }
+ &:before {
+ content: $slick-next-character;
+ [dir="rtl"] & {
+ content: $slick-prev-character;
+ }
+ }
+}
+
+/* Dots */
+
+.slick-slider {
+ margin-bottom: 30px;
+}
+
+.slick-dots {
+ position: absolute;
+ bottom: -45px;
+ list-style: none;
+ display: block;
+ text-align: center;
+ padding: 0;
+ width: 100%;
+ li {
+ position: relative;
+ display: inline-block;
+ height: 20px;
+ width: 20px;
+ margin: 0 5px;
+ padding: 0;
+ cursor: pointer;
+ button {
+ border: 0;
+ background: transparent;
+ display: block;
+ height: 20px;
+ width: 20px;
+ outline: none;
+ line-height: 0px;
+ font-size: 0px;
+ color: transparent;
+ padding: 5px;
+ cursor: pointer;
+ &:hover, &:focus {
+ outline: none;
+ &:before {
+ opacity: $slick-opacity-on-hover;
+ }
+ }
+ &:before {
+ position: absolute;
+ top: 0;
+ left: 0;
+ content: $slick-dot-character;
+ width: 20px;
+ height: 20px;
+ font-family: $slick-font-family;
+ font-size: $slick-dot-size;
+ line-height: 20px;
+ text-align: center;
+ color: $slick-dot-color;
+ opacity: $slick-opacity-not-active;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
+ }
+ &.slick-active button:before {
+ color: $slick-dot-color-active;
+ opacity: $slick-opacity-default;
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/css/slick/1.5.0/slick.css
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick.css b/content/css/slick/1.5.0/slick.css
index 59119f4..f597056 100644
--- a/content/css/slick/1.5.0/slick.css
+++ b/content/css/slick/1.5.0/slick.css
@@ -1,116 +1,116 @@
-/* Slider */
-.slick-slider
-{
- position: relative;
-
- display: block;
-
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-
- -webkit-touch-callout: none;
- -khtml-user-select: none;
- -ms-touch-action: pan-y;
- touch-action: pan-y;
- -webkit-tap-highlight-color: transparent;
-}
-
-.slick-list
-{
- position: relative;
-
- display: block;
- overflow: hidden;
-
- margin: 0;
- padding: 0;
-}
-.slick-list:focus
-{
- outline: none;
-}
-.slick-list.dragging
-{
- cursor: pointer;
- cursor: hand;
-}
-
-.slick-slider .slick-track,
-.slick-slider .slick-list
-{
- -webkit-transform: translate3d(0, 0, 0);
- -moz-transform: translate3d(0, 0, 0);
- -ms-transform: translate3d(0, 0, 0);
- -o-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
-}
-
-.slick-track
-{
- position: relative;
- top: 0;
- left: 0;
-
- display: block;
-}
-.slick-track:before,
-.slick-track:after
-{
- display: table;
-
- content: '';
-}
-.slick-track:after
-{
- clear: both;
-}
-.slick-loading .slick-track
-{
- visibility: hidden;
-}
-
-.slick-slide
-{
- display: none;
- float: left;
-
- height: 100%;
- min-height: 1px;
-}
-[dir='rtl'] .slick-slide
-{
- float: right;
-}
-.slick-slide img
-{
- display: block;
-}
-.slick-slide.slick-loading img
-{
- display: none;
-}
-.slick-slide.dragging img
-{
- pointer-events: none;
-}
-.slick-initialized .slick-slide
-{
- display: block;
-}
-.slick-loading .slick-slide
-{
- visibility: hidden;
-}
-.slick-vertical .slick-slide
-{
- display: block;
-
- height: auto;
-
- border: 1px solid transparent;
+/* Slider */
+.slick-slider
+{
+ position: relative;
+
+ display: block;
+
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+
+ -webkit-touch-callout: none;
+ -khtml-user-select: none;
+ -ms-touch-action: pan-y;
+ touch-action: pan-y;
+ -webkit-tap-highlight-color: transparent;
+}
+
+.slick-list
+{
+ position: relative;
+
+ display: block;
+ overflow: hidden;
+
+ margin: 0;
+ padding: 0;
+}
+.slick-list:focus
+{
+ outline: none;
+}
+.slick-list.dragging
+{
+ cursor: pointer;
+ cursor: hand;
+}
+
+.slick-slider .slick-track,
+.slick-slider .slick-list
+{
+ -webkit-transform: translate3d(0, 0, 0);
+ -moz-transform: translate3d(0, 0, 0);
+ -ms-transform: translate3d(0, 0, 0);
+ -o-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+}
+
+.slick-track
+{
+ position: relative;
+ top: 0;
+ left: 0;
+
+ display: block;
+}
+.slick-track:before,
+.slick-track:after
+{
+ display: table;
+
+ content: '';
+}
+.slick-track:after
+{
+ clear: both;
+}
+.slick-loading .slick-track
+{
+ visibility: hidden;
+}
+
+.slick-slide
+{
+ display: none;
+ float: left;
+
+ height: 100%;
+ min-height: 1px;
+}
+[dir='rtl'] .slick-slide
+{
+ float: right;
+}
+.slick-slide img
+{
+ display: block;
+}
+.slick-slide.slick-loading img
+{
+ display: none;
+}
+.slick-slide.dragging img
+{
+ pointer-events: none;
+}
+.slick-initialized .slick-slide
+{
+ display: block;
+}
+.slick-loading .slick-slide
+{
+ visibility: hidden;
+}
+.slick-vertical .slick-slide
+{
+ display: block;
+
+ height: auto;
+
+ border: 1px solid transparent;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/css/slick/1.5.0/slick.scss
----------------------------------------------------------------------
diff --git a/content/css/slick/1.5.0/slick.scss b/content/css/slick/1.5.0/slick.scss
index 888e760..4cf4ec2 100644
--- a/content/css/slick/1.5.0/slick.scss
+++ b/content/css/slick/1.5.0/slick.scss
@@ -1,96 +1,96 @@
-/* Slider */
-
-.slick-slider {
- position: relative;
- display: block;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- -ms-touch-action: pan-y;
- touch-action: pan-y;
- -webkit-tap-highlight-color: transparent;
-}
-.slick-list {
- position: relative;
- overflow: hidden;
- display: block;
- margin: 0;
- padding: 0;
-
- &:focus {
- outline: none;
- }
-
- &.dragging {
- cursor: pointer;
- cursor: hand;
- }
-}
-.slick-slider .slick-track,
-.slick-slider .slick-list {
- -webkit-transform: translate3d(0, 0, 0);
- -moz-transform: translate3d(0, 0, 0);
- -ms-transform: translate3d(0, 0, 0);
- -o-transform: translate3d(0, 0, 0);
- transform: translate3d(0, 0, 0);
-}
-
-.slick-track {
- position: relative;
- left: 0;
- top: 0;
- display: block;
-
- &:before,
- &:after {
- content: "";
- display: table;
- }
-
- &:after {
- clear: both;
- }
-
- .slick-loading & {
- visibility: hidden;
- }
-}
-.slick-slide {
- float: left;
- height: 100%;
- min-height: 1px;
- [dir="rtl"] & {
- float: right;
- }
- img {
- display: block;
- }
- &.slick-loading img {
- display: none;
- }
-
- display: none;
-
- &.dragging img {
- pointer-events: none;
- }
-
- .slick-initialized & {
- display: block;
- }
-
- .slick-loading & {
- visibility: hidden;
- }
-
- .slick-vertical & {
- display: block;
- height: auto;
- border: 1px solid transparent;
- }
+/* Slider */
+
+.slick-slider {
+ position: relative;
+ display: block;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ -ms-touch-action: pan-y;
+ touch-action: pan-y;
+ -webkit-tap-highlight-color: transparent;
+}
+.slick-list {
+ position: relative;
+ overflow: hidden;
+ display: block;
+ margin: 0;
+ padding: 0;
+
+ &:focus {
+ outline: none;
+ }
+
+ &.dragging {
+ cursor: pointer;
+ cursor: hand;
+ }
+}
+.slick-slider .slick-track,
+.slick-slider .slick-list {
+ -webkit-transform: translate3d(0, 0, 0);
+ -moz-transform: translate3d(0, 0, 0);
+ -ms-transform: translate3d(0, 0, 0);
+ -o-transform: translate3d(0, 0, 0);
+ transform: translate3d(0, 0, 0);
+}
+
+.slick-track {
+ position: relative;
+ left: 0;
+ top: 0;
+ display: block;
+
+ &:before,
+ &:after {
+ content: "";
+ display: table;
+ }
+
+ &:after {
+ clear: both;
+ }
+
+ .slick-loading & {
+ visibility: hidden;
+ }
+}
+.slick-slide {
+ float: left;
+ height: 100%;
+ min-height: 1px;
+ [dir="rtl"] & {
+ float: right;
+ }
+ img {
+ display: block;
+ }
+ &.slick-loading img {
+ display: none;
+ }
+
+ display: none;
+
+ &.dragging img {
+ pointer-events: none;
+ }
+
+ .slick-initialized & {
+ display: block;
+ }
+
+ .slick-loading & {
+ visibility: hidden;
+ }
+
+ .slick-vertical & {
+ display: block;
+ height: auto;
+ border: 1px solid transparent;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis-site/blob/99710b5f/content/guides/rgcms.html
----------------------------------------------------------------------
diff --git a/content/guides/rgcms.html b/content/guides/rgcms.html
index d48f58b..f5c5de1 100644
--- a/content/guides/rgcms.html
+++ b/content/guides/rgcms.html
@@ -2888,7 +2888,7 @@ listener; see <a href="#_rgcms_methods_lifecycle_jdo-api">here</a> for further d
</div>
</div>
<div class="paragraph">
-<p>This tells the framework that the package and subpackages under <code>com.mycompany.myapp.dom</code> should be searched for domain services and entities.</p>
+<p>This tells the framework that the package and subpackages under <code>com.mycompany.myapp.dom</code> should be searched for domain services (annotated with <code>@DomainService</code>), mixins (<code>@Mixin</code>) and entities (<code>@PersistenceCapabable</code>).</p>
</div>
<div class="paragraph">
<p>As is perhaps apparent, the <code>getModules()</code> method replaces and overrides both the <code>isis.services.ServicesInstallerFromAnnotation.packagePrefix</code> key (usually found in the <code>isis.properties</code> file) and also the`isis.persistor.datanucleus.RegisterEntities.packagePrefix` key (usually found in the <code>persistor_datanucleus.properties</code> file). The value of the <code>isis.services-installer</code> configuration property is also ignored.</p>
@@ -3042,10 +3042,47 @@ listener; see <a href="#_rgcms_methods_lifecycle_jdo-api">here</a> for further d
<div class="sect4">
<h5 id="_integration_tests">Integration Tests</h5>
<div class="paragraph">
-<p>Bootstrapping integration tests is still performed using the <code>IsisSystemForTest.Builder</code>, but very often the bootstrapping code can be substantially simplified (compared to not using an <code>AppManifest</code>, that is).</p>
+<p>A <code>AppManifest.Util</code> helper class provides a number of static methods that can be used to set up configuration
+properties appropriate for integration testing (eg run using an in-memory database). This allows the responsibility
+of returning the configuration properties to belong exlusively to the <code>AppManifest</code>.</p>
</div>
<div class="paragraph">
-<p>For example, this is the bootstrapping code for the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> looks something like:</p>
+<p>There are three such static methods:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">interface</span> <span class="class">AppManifest</span> {
+ ...
+ public <span class="directive">static</span> <span class="type">class</span> <span class="class">Util</span> {
+ <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
+ withJavaxJdoRunInMemoryProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="1"></i><b>(1)</b>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
+ withDataNucleusProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="2"></i><b>(2)</b>
+ <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>,<span class="predefined-type">String</span>>
+ withIsisIntegTestProperties(<span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map) { ... } <i class="conum" data-value="3"></i><b>(3)</b>
+ }
+}</code></pre>
+</div>
+</div>
+<div class="colist arabic">
+<table>
+<tr>
+<td><i class="conum" data-value="1"></i><b>1</b></td>
+<td>sets up the <code>javax.jdo.option.Connection*</code> properties so as to run against an in-memory instance of HSQLDB</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="2"></i><b>2</b></td>
+<td>sets up DataNucleus to automatically create the databse schema, as well as a number of other standard properties
+(disable persistence by reachability, support mixed case identifiers, disable level 2 cache)</td>
+</tr>
+<tr>
+<td><i class="conum" data-value="3"></i><b>3</b></td>
+<td>sets up standard properties for the Apache Isis framework, most specifically to enable fixtures to be installed.</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>For example, the bootstrapping code for the <a href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> looks something like:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -3055,16 +3092,28 @@ listener; see <a href="#_rgcms_methods_lifecycle_jdo-api">here</a> for further d
<span class="keyword">if</span>(isft == <span class="predefined-constant">null</span>) {
isft = <span class="keyword">new</span> IsisSystemForTest.Builder()
.withLoggingAt(org.apache.log4j.Level.INFO)
- .with(<span class="keyword">new</span> MyAppAppManifest())
- .with(<span class="keyword">new</span> IsisConfigurationForJdoIntegTests())
- .build()
- .setUpSystem();
+ .with(<span class="keyword">new</span> DomainAppAppManifest() {
+ <span class="annotation">@Override</span>
+ <span class="directive">public</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> getConfigurationProperties() {
+ <span class="directive">final</span> <span class="predefined-type">Map</span><<span class="predefined-type">String</span>, <span class="predefined-type">String</span>> map = Maps.newHashMap();
+ <span class="predefined-type">Util</span>.withJavaxJdoRunInMemoryProperties(map);
+ <span class="predefined-type">Util</span>.withDataNucleusProperties(map);
+ <span class="predefined-type">Util</span>.withIsisIntegTestProperties(map);
+ <span class="keyword">return</span> map;
+ }
+ })
+ .build();
+ isft.setUpSystem();
IsisSystemForTest.set(isft);
}
}
}</code></pre>
</div>
</div>
+<div class="paragraph">
+<p>Previously the <code>IsisConfigurationJdoIntegTests</code> (subclass of <code>IsisConfiguration</code>) was provided to set up these
+configuration properties. This class is still supported, but is deprecated.</p>
+</div>
</div>
<div class="sect4">
<h5 id="_webapps">Webapps</h5>
@@ -3130,7 +3179,7 @@ listener; see <a href="#_rgcms_methods_lifecycle_jdo-api">here</a> for further d
<div class="sect3">
<h4 id="_subsidiary_goals">3.1.3. Subsidiary Goals</h4>
<div class="paragraph">
-<p>There are a number of subsidiary goals of the <code>AppManifest</code> class (though as of v1.9.0 these have not yet implemented):</p>
+<p>There are a number of subsidiary goals of the <code>AppManifest</code> class (though as of v1.13.0 these have not yet implemented):</p>
</div>
<div class="ulist">
<ul>
@@ -3139,15 +3188,12 @@ listener; see <a href="#_rgcms_methods_lifecycle_jdo-api">here</a> for further d
<div class="ulist">
<ul>
<li>
-<p>Normally the running application is shared (on a thread-local) between integration tests. What the framework could do is to be intelligent enough to keep track of the manifest in use for each integration test and tear down the shared state if the "next" test uses a different manifest</p>
+<p>Normally the running application is shared (on a thread-local) between integration tests. What the framework could perhaps do is to be intelligent enough to keep track of the manifest in use for each integration test and tear down the shared state if the "next" test uses a different manifest</p>
</li>
</ul>
</div>
</li>
<li>
-<p>Speed up bootstrapping by only scanning for classes annotated by <code>@DomainService</code> and <code>@PersistenceCapable</code> once.</p>
-</li>
-<li>
<p>Provide a programmatic way to contribute elements of <code>web.xml</code>.</p>
</li>
<li>