You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/03/21 18:27:38 UTC

[causeway] branch release-2.0.0-RC1-RC1 updated: CAUSEWAY-3255: updates to website

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch release-2.0.0-RC1-RC1
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/release-2.0.0-RC1-RC1 by this push:
     new 9d592fdf16 CAUSEWAY-3255: updates to website
9d592fdf16 is described below

commit 9d592fdf16ec27b9e5481923dab857ea60eff8dd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Mar 21 18:15:57 2023 +0000

    CAUSEWAY-3255: updates to website
---
 .../components/docs/modules/ROOT/pages/about.adoc  | 41 +++++++++++++++-------
 .../modules/ROOT/pages/landing-page/catalogs.adoc  | 22 ------------
 .../docs/modules/ROOT/partials/component-nav.adoc  |  2 +-
 .../modules/ROOT/partials/module-nav/catalogs.adoc |  8 -----
 .../ROOT/partials/module-nav/components.adoc       | 13 +++----
 .../ROOT/partials/module-nav/extensions.adoc       | 38 ++++++++++++++++++++
 .../modules/ROOT/partials/module-nav/guides.adoc   |  3 ++
 .../modules/applib-classes/pages/value-types.adoc  |  2 +-
 .../applib-classes/partials/module-nav.adoc        |  1 -
 .../modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc |  2 +-
 .../modules/ROOT/partials/extensions.adoc          |  2 +-
 antora/supplemental-ui/index.html                  |  3 +-
 extensions/adoc/antora.yml                         |  2 +-
 extensions/adoc/modules/ROOT/pages/about.adoc      | 11 +++---
 .../shiro-realm-ldap/partials/module-nav.adoc      |  2 +-
 .../vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc   | 11 +++---
 .../adoc/modules/ROOT/partials/extensions.adoc     |  6 ++--
 .../adoc/modules/unittestsupport/pages/about.adoc  |  2 +-
 valuetypes/adoc/modules/ROOT/pages/about.adoc      |  2 +-
 .../pages/extending/replacing-page-elements.adoc   |  4 +--
 20 files changed, 104 insertions(+), 73 deletions(-)

diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index db30fa2743..1214e9fb7d 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -60,6 +60,10 @@ _Core_
 * *xref:testing:ROOT:about.adoc[Testing Guide]*
 * *xref:security:ROOT:about.adoc[Security Guide]*
 
+_For use in apps_
+
+* xref:valuetypes:ROOT:about.adoc[Value Types]
+
 _Development_
 
 * xref:setupguide:ROOT:about.adoc[Setup Guide]
@@ -69,6 +73,13 @@ _Development_
 [discrete]
 == Components
 
+_Security_
+
+* xref:security:bypass:about.adoc[Bypass]
+* xref:security:shiro:about.adoc[Shiro]
+* xref:security:spring:about.adoc[Spring]
+* xref:security:keycloak:about.adoc[Keycloak]
+
 _Viewers_
 
 * xref:vw:ROOT:about.adoc[Web UI (Wicket)]
@@ -79,25 +90,31 @@ _Persistence_
 * xref:pjpa:ROOT:about.adoc[JPA (EclipseLink)]
 * xref:pjdo:ROOT:about.adoc[JDO (DataNucleus)]
 
-_Security_
-
-* xref:security:bypass:about.adoc[Bypass]
-* xref:security:shiro:about.adoc[Shiro]
-* xref:security:spring:about.adoc[Spring]
-* xref:security:keycloak:about.adoc[Keycloak]
-
 
 |
 [discrete]
-== Catalogs
+== (Common) Extensions
+
+
+_Core_
+
+** *xref:userguide:commandlog:about.adoc[]*
+** xref:userguide:executionoutbox:about.adoc[]
+** *xref:userguide:flyway:about.adoc[]*
+
+
+_Security_
 
-_For Use in Domain Apps_
+** *xref:security:secman:about.adoc[SecMan]*
+** *xref:security:audittrail:about.adoc[]*
+** xref:security:spring-oauth2:about.adoc[]
+** xref:security:sessionlog:about.adoc[]
 
-* *xref:valuetypes:ROOT:about.adoc[Value Type Catalog]*
 
-_Extending the framework itself_
+_Web UI (Wicket)_
 
-* *xref:extensions:ROOT:about.adoc[Extensions Catalog]*
+** *xref:vw:exceldownload:about.adoc[]*
+** *xref:vw:pdfjs:about.adoc[]*
 
 
 |
diff --git a/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc b/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
deleted file mode 100644
index 27522a9468..0000000000
--- a/antora/components/docs/modules/ROOT/pages/landing-page/catalogs.adoc
+++ /dev/null
@@ -1,22 +0,0 @@
-= Catalogs
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-The framework includes two catalogs:
-
-* xref:valuetypes:ROOT:about.adoc[Value Type Catalog]
-+
-The modules in this catalog provide implementations of various value types, for example Markdown.
-They are intended to be consumed by your application.
-+
-Each will have an applib submodule (for use within the domain logic) as well as various extension modules to be made available to the framework itself (to teach it how to persist or render the value type).
-
-* xref:extensions:ROOT:about.adoc[Extensions Catalog]
-+
-These modules in this catalog extend the capabilities of the framework itself.
-They are generally not consumed directly by your application.
-For example, the "Excel Download" extension allows collections to be downloaded as an Excel `.xlsx` spreadsheet in the Wicket viewer.
-+
-That said, some extensions do also provide an applib.
-For example the xref:vw:fullcalendar:about.adoc[fullcalendar] extension provides an applib so that domain objects can expose a date (typically a Java interface to be implemented); this allows the extension to plot them on a calendar.
-
diff --git a/antora/components/docs/modules/ROOT/partials/component-nav.adoc b/antora/components/docs/modules/ROOT/partials/component-nav.adoc
index 0f1f5f94d2..5f0dcc61b5 100644
--- a/antora/components/docs/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/docs/modules/ROOT/partials/component-nav.adoc
@@ -4,7 +4,7 @@ include::docs:ROOT:partial$module-nav/demos-and-tutorials.adoc[]
 include::docs:ROOT:partial$module-nav/resources.adoc[]
 include::docs:ROOT:partial$module-nav/guides.adoc[]
 include::docs:ROOT:partial$module-nav/components.adoc[]
-include::docs:ROOT:partial$module-nav/catalogs.adoc[]
+include::docs:ROOT:partial$module-nav/extensions.adoc[]
 include::docs:support:partial$module-nav.adoc[]
 include::docs:ROOT:partial$module-nav/framework.adoc[]
 include::docs:ROOT:partial$module-nav/further-resources.adoc[]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc
deleted file mode 100644
index 4fd3b612f8..0000000000
--- a/antora/components/docs/modules/ROOT/partials/module-nav/catalogs.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-
-* Catalogs
-
-**  xref:valuetypes:ROOT:about.adoc[Value Type Catalog]
-**  xref:extensions:ROOT:about.adoc[Extensions Catalog]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
index 246b9c7725..b4e521a8e5 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/components.adoc
@@ -3,6 +3,13 @@
 
 * Components
 
+** Security
+
+*** xref:security:bypass:about.adoc[Bypass]
+*** xref:security:shiro:about.adoc[Shiro]
+*** xref:security:spring:about.adoc[Spring]
+*** xref:security:keycloak:about.adoc[Keycloak]
+
 ** Viewers
 
 *** xref:vw:ROOT:about.adoc[Web UI (Wicket)]
@@ -13,9 +20,3 @@
 *** xref:pjpa:ROOT:about.adoc[JPA (EclipseLink)]
 *** xref:pjdo:ROOT:about.adoc[JDO (DataNucleus)]
 
-** Security
-
-*** xref:security:bypass:about.adoc[Bypass]
-*** xref:security:shiro:about.adoc[Shiro]
-*** xref:security:spring:about.adoc[Spring]
-*** xref:security:keycloak:about.adoc[Keycloak]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc
new file mode 100644
index 0000000000..9848c8d9d6
--- /dev/null
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/extensions.adoc
@@ -0,0 +1,38 @@
+
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+
+* Extensions
+
+** Core
+
+*** xref:userguide:commandlog:about.adoc[]
+*** xref:userguide:executionlog:about.adoc[]
+*** xref:userguide:executionoutbox:about.adoc[]
+*** xref:userguide:executionrepublisher:about.adoc[]
+*** xref:userguide:excel:about.adoc[]
+*** xref:userguide:flyway:about.adoc[]
+
+
+** Security
+
+*** xref:security:secman:about.adoc[]
+*** xref:security:audittrail:about.adoc[]
+*** xref:security:spring-oauth2:about.adoc[Spring OAuth2]
+*** xref:security:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]
+*** xref:security:sessionlog:about.adoc[]
+
+
+
+** _Web UI (Wicket viewer)_
+
+*** xref:vw:exceldownload:about.adoc[Excel Download]
+*** xref:vw:fullcalendar:about.adoc[Full Calendar]
+*** xref:vw:pdfjs:about.adoc[PDF.js]
+*** xref:vw:sse:about.adoc[Server Side Events]
+
+
+** _REST API (Restful Objects)_
+
+*** xref:vro:cors:about.adoc[CORS]
+
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc
index cbeaa5eb79..5fa03d7ed6 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/guides.adoc
@@ -10,6 +10,9 @@
 *** xref:testing:ROOT:about.adoc[Testing Guide]
 *** xref:security:ROOT:about.adoc[Security Guide]
 
+** for use in apps
+***  xref:valuetypes:ROOT:about.adoc[Value Types]
+
 ** Development
 *** xref:setupguide:ROOT:about.adoc[Setup Guide]
 *** xref:conguide:ROOT:about.adoc[Contributors' Guide]
diff --git a/antora/components/refguide/modules/applib-classes/pages/value-types.adoc b/antora/components/refguide/modules/applib-classes/pages/value-types.adoc
index 2039158150..6baa60ebb5 100644
--- a/antora/components/refguide/modules/applib-classes/pages/value-types.adoc
+++ b/antora/components/refguide/modules/applib-classes/pages/value-types.adoc
@@ -53,4 +53,4 @@ The framework also defines a number of custom value types:
 * xref:refguide:applib:index/value/Password.adoc[Password]
 
 In addition, there are a number of non-core value types that can be brought in individually.
-These can be found in the xref:valuetypes:ROOT:about.adoc[Value Type Catalog].
+These can be found in the catalog of xref:valuetypes:ROOT:about.adoc[Value Types].
diff --git a/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc b/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
index 9a8805fd08..29f289228e 100644
--- a/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
+++ b/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
@@ -19,7 +19,6 @@
 
 ** xref:applib-classes:utility.adoc[Utility Classes]
 *** xref:applib:index/util/Enums.adoc[Enums]
-*** xref:applib:index/util/JaxbUtil.adoc[JaxbUtil]
 *** xref:applib:index/util/ObjectContracts.adoc[ObjectContracts]
 *** xref:applib:index/util/Reasons.adoc[Reasons]
 *** xref:applib:index/util/ReasonBuffer.adoc[ReasonBuffer]
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc
index 2dd4a0f542..9634365556 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/relnotes.adoc
@@ -28,7 +28,7 @@ This milestone also introduces a number of new features:
 * New extensions:
 ** xref:userguide:flyway:about.adoc[Flyway] (integrating with Spring Boot's support)
 ** xref:vro:cors:[CORS] for the REST API (xref:vro:ROOT:about.adoc[REST API (Restful Objects viewer)])
-** xref:vw:pdfjs:about.adoc[pdf.js] (for xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)])
+** xref:vw:pdfjs:about.adoc[PDF.js] (for xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)])
 ** xref:vw:fullcalendar:about.adoc[fullcalendar] (for xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)])
 ** xref:vw:exceldownload:about.adoc[excel download] (for xref:vw:ROOT:about.adoc[Web UI (Wicket viewer)])
 
diff --git a/antora/components/userguide/modules/ROOT/partials/extensions.adoc b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
index bbb33f79ee..b2e90c3368 100644
--- a/antora/components/userguide/modules/ROOT/partials/extensions.adoc
+++ b/antora/components/userguide/modules/ROOT/partials/extensions.adoc
@@ -1,7 +1,7 @@
 include::userguide:commandlog:partial$module-nav.adoc[]
-include::userguide:excel:partial$module-nav.adoc[]
 include::userguide:executionlog:partial$module-nav.adoc[]
 include::userguide:executionoutbox:partial$module-nav.adoc[]
 include::userguide:executionrepublisher:partial$module-nav.adoc[]
+include::userguide:excel:partial$module-nav.adoc[]
 include::userguide:flyway:partial$module-nav.adoc[]
 
diff --git a/antora/supplemental-ui/index.html b/antora/supplemental-ui/index.html
index 01fee003f8..1caedc266e 100644
--- a/antora/supplemental-ui/index.html
+++ b/antora/supplemental-ui/index.html
@@ -114,8 +114,9 @@
             <li><a href="docs/latest/about.html">Table of Contents</a></li>
             <li><hr/></li>
             <li><a href="docs/latest/landing-page/guides.html">Guides</a></li>
+            <li><a href="valuetypes/latest/about.html">Value Types</a></li>
             <li><a href="docs/latest/landing-page/components.html">Components</a></li>
-            <li><a href="docs/latest/landing-page/catalogs.html">Catalogs</a></li>
+            <li><a href="extensions/latest/about.html">Extensions</a></li>
           </ul>
         </li>
         <li class="menu-has-children">
diff --git a/extensions/adoc/antora.yml b/extensions/adoc/antora.yml
index 2dde8c1363..f8e2599875 100644
--- a/extensions/adoc/antora.yml
+++ b/extensions/adoc/antora.yml
@@ -16,7 +16,7 @@
 #  under the License.
 
 name: extensions
-title: "Extensions Catalog"
+title: "Extensions"
 version: latest
 start_page: ROOT:about.adoc
 nav:
diff --git a/extensions/adoc/modules/ROOT/pages/about.adoc b/extensions/adoc/modules/ROOT/pages/about.adoc
index c08acdef5b..62391a0d7c 100644
--- a/extensions/adoc/modules/ROOT/pages/about.adoc
+++ b/extensions/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
-= Extensions Catalog
+= Extensions
 
 
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
@@ -25,14 +25,15 @@ include::security:ROOT:partial$extensions.adoc[]
 
 
 
-|xref:vro::about.adoc[Restful Objects] extensions:
+|xref:vw::about.adoc[Wicket viewer] extensions:
 
-include::vro:ROOT:partial$extensions.adoc[]
+include::vw:ROOT:partial$extensions.adoc[]
 
 
-|xref:vw::about.adoc[Wicket viewer] extensions:
+|xref:vro::about.adoc[Restful Objects] extensions:
+
+include::vro:ROOT:partial$extensions.adoc[]
 
-include::vw:ROOT:partial$extensions.adoc[]
 
 |===
 
diff --git a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
index 7251f6367a..5afe011462 100644
--- a/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
+++ b/extensions/security/shiro-realm-ldap/adoc/modules/shiro-realm-ldap/partials/module-nav.adoc
@@ -1,4 +1,4 @@
 
 
 
-** xref:security:shiro-realm-ldap:about.adoc[Shiro LDAP Realm]
+** xref:security:shiro-realm-ldap:about.adoc[LDAP Realm for Shiro]
diff --git a/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
index a774e1c6bd..463d9d9fd7 100644
--- a/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
+++ b/extensions/vw/pdfjs/adoc/modules/pdfjs/pages/about.adoc
@@ -2,7 +2,7 @@
 
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The PDF.js module integrates with the xref:vw:ROOT:about.adoc[Wicket Viewer], rendering a `Blob` property containing a PDF using the link:https://mozilla.github.io/pdf.js/[pdf.js] library.
+The PDF.js module integrates with the xref:vw:ROOT:about.adoc[Wicket Viewer], rendering a `Blob` property containing a PDF using the link:https://mozilla.github.io/pdf.js/[PDF.js] library.
 
 
 == Usage
@@ -11,16 +11,17 @@ To use the extension, annotate an xref:refguide:applib:index/value/Blob.adoc[Blo
 
 For example:
 
-[source,xml]
-.pom.xml
+[source,java]
 ----
-@PdfJsViewer
+@PdfJsViewer            // <.>
 @Property()
 @PropertyLayout(fieldSetId = "content", sequence = "1")
 public Blob getAttachment() { ... }
 ----
 
-IMPORTANT: The `Blob` should only ever return a bytes that correspond to a PDF, with a mime type of "application/pdf".
+<.> indicates that the `Blob` returns a set of bytes that correspond to a PDF, and so should be rendered as such.
++
+NOTE: The `Blob` is expected also to have a mime type of `application/pdf`.
 
 Optionally, you can also provide an implementation of the xref:refguide:extensions:index/pdfjs/applib/spi/PdfJsViewerAdvisor.adoc[] SPI, which advises on the size of the viewer (and has callbacks to keep track of which page of the PDF is being viewed).
 The framework provides a fallback implementation that sets the height to 800px, and scaled to 75% normal size.
diff --git a/security/adoc/modules/ROOT/partials/extensions.adoc b/security/adoc/modules/ROOT/partials/extensions.adoc
index 4906738fd6..de7cb84bf0 100644
--- a/security/adoc/modules/ROOT/partials/extensions.adoc
+++ b/security/adoc/modules/ROOT/partials/extensions.adoc
@@ -1,6 +1,6 @@
-include::security:shiro-realm-ldap:partial$module-nav.adoc[]
-include::security:spring-oauth2:partial$module-nav.adoc[]
-include::security:secman:partial$module-nav.adoc[]
+** xref:security:secman:about.adoc[SecMan]
 include::security:audittrail:partial$module-nav.adoc[]
+include::security:spring-oauth2:partial$module-nav.adoc[]
+include::security:shiro-realm-ldap:partial$module-nav.adoc[]
 include::security:sessionlog:partial$module-nav.adoc[]
 
diff --git a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
index 43f08d3438..65997694f9 100644
--- a/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
+++ b/testing/unittestsupport/adoc/modules/unittestsupport/pages/about.adoc
@@ -231,7 +231,7 @@ As here, it is often sufficient to provide a single instance (as it is compared
 
 === XML Marshalling Support
 
-Apache Causeway' unit testing support provides the xref:refguide:testing:index/unittestsupport/applib/matchers/JaxbMatchers.adoc[JaxbMatchers] while the core applib also provides the useful xref:refguide:applib:index/util/JaxbUtil.adoc[JaxbUtil] class.
+Apache Causeway' unit testing support provides the xref:refguide:testing:index/unittestsupport/applib/matchers/JaxbMatchers.adoc[JaxbMatchers] while the core applib also provides xref:refguide:applib:index/services/jaxb/JaxbService.adoc[JaxbService.Simple] service implementation.
 
 These can be useful for example if you have example XML-serialized representations of the SOAP requests and response payloads and want to use these within your tests.
 
diff --git a/valuetypes/adoc/modules/ROOT/pages/about.adoc b/valuetypes/adoc/modules/ROOT/pages/about.adoc
index 7962428e6f..579e378fdf 100644
--- a/valuetypes/adoc/modules/ROOT/pages/about.adoc
+++ b/valuetypes/adoc/modules/ROOT/pages/about.adoc
@@ -1,4 +1,4 @@
-= Value Type Catalog
+= Value Types
 
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
index 4e41ef103e..dc26a12bc5 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/extending/replacing-page-elements.adoc
@@ -6,7 +6,7 @@
 
 
 Replacing elements of the page is the most powerful general-purpose way to customize the look-n-feel of the viewer.
-Examples include the xref:vw:fullcalendar:about.adoc[Fullcalendar], xref:vw:exceldownload:about.adoc[Excel Download] and xref:vw:pdfjs:about.adoc[pdf.js] components.
+Examples include the xref:vw:fullcalendar:about.adoc[Fullcalendar], xref:vw:exceldownload:about.adoc[Excel Download] and xref:vw:pdfjs:about.adoc[PDF.js] components.
 
 The pages generated by Apache Causeway' Wicket viewer are built up of numerous elements, from fine-grained widgets for property/parameter fields, to much larger components that take responsibility for rendering an entire entity, or a collection of entities.
 Under the covers these are all implementations of the the Apache Wicket `Component` API.
@@ -100,7 +100,7 @@ In the case of (either standalone or parented) collections, though, the viewer w
 For example, out-of-the-box Apache Causeway provides a table view, a summary view (totals/sums/averages of any data), and a collapsed view.
 These are selected by clicking on the toolbar by each collection.
 
-Additional views though could render the objects in the collection as a variety of ways; as illustrated by the xref:vw:pdfjs:about.adoc[pdf.js], xref:vw:fullcalendar:about.adoc[Fullcalendar] and xref:vw:exceldownload:about.adoc[Excel Download] extensions.
+Additional views though could render the objects in the collection as a variety of ways; as illustrated by the xref:vw:pdfjs:about.adoc[PDF.js], xref:vw:fullcalendar:about.adoc[Fullcalendar] and xref:vw:exceldownload:about.adoc[Excel Download] extensions.
 
 Wicket itself has lots of components available at its http://wicketstuff.org[wicketstuff.org] companion website; you might find some of these useful for your own customizations.