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 2015/11/26 20:27:14 UTC

isis git commit: ISIS-1243: renaming troubleshooting to FAQ, and adding some additional answers

Repository: isis
Updated Branches:
  refs/heads/master 7798ab807 -> 0845ef63e


ISIS-1243: renaming troubleshooting to FAQ, and adding some additional answers


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0845ef63
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0845ef63
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0845ef63

Branch: refs/heads/master
Commit: 0845ef63eab9f9c79106edfc636ecdf36100b34c
Parents: 7798ab8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Nov 26 19:27:08 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Nov 26 19:27:08 2015 +0000

----------------------------------------------------------------------
 .../main/asciidoc/guides/_cg_ide_agilej.adoc    |  9 +--
 .../main/asciidoc/guides/_cg_ide_eclipse.adoc   |  9 +--
 .../main/asciidoc/guides/_cg_ide_intellij.adoc  | 11 ++--
 .../_rg_classes_value-types_manpage-Blob.adoc   |  2 +-
 .../_rg_classes_value-types_manpage-Clob.adoc   |  2 +-
 .../_rg_classes_value-types_manpage-Color.adoc  |  3 +-
 .../_rg_classes_value-types_manpage-Money.adoc  |  2 +-
 .../src/main/asciidoc/guides/_ug_faqs.adoc      | 15 +++++
 .../guides/_ug_faqs_enabling-logging.adoc       | 39 ++++++++++++
 .../guides/_ug_faqs_restful-image-property.adoc | 20 ++++++
 ...faqs_subtype-entity-not-fully-populated.adoc | 67 ++++++++++++++++++++
 .../asciidoc/guides/_ug_troubleshooting.adoc    | 14 ----
 .../_ug_troubleshooting_enabling-logging.adoc   | 39 ------------
 .../src/main/asciidoc/guides/ug.adoc            |  3 +-
 14 files changed, 160 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_cg_ide_agilej.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_agilej.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_agilej.adoc
index 9c4d5a7..c041d9b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_agilej.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_agilej.adoc
@@ -6,6 +6,11 @@
 :toc: right
 
 
+[NOTE]
+====
+This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way.
+====
+
 link:http://www.agilej.com/[AgileJ Structure Views] is a commercial product to reverse engineer and visualize Java classes from source code.
 
 The key to using the tool is in developing a suitable filter script, a DSL.  You can use the following script as a starting point for visualizing Apache Isis domain models:
@@ -47,8 +52,4 @@ hide method lines
 
 For more information on AgileJ, see Paul Wells' 8-part tutorial series on Youtube; the first can be found link:https://www.youtube.com/watch?v=YrZQ7lMSsH0[here] (view the "show more" comments to click through to other parts).
 
-[NOTE]
-====
-This material does not constitute an endorsement; AgileJ is not affiliated to Apache Software Foundation in any way.
-====
 

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
index dac1f93..793d27c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
@@ -6,6 +6,11 @@
 :toc: right
 
 
+[NOTE]
+====
+This material does not constitute an endorsement; Eclipse foundation is not affiliated to Apache Software Foundation in any way.
+====
+
 If you are an http://www.eclipse.org[Eclipse] user, then we recommend you download the "Eclipse JEE package" configuration.
 
 When running an Apache Isis application, it's necessary to setup the development environment so that the Java bytecode can be enhanced by the link:http://www.datanucleus.org[DataNucleus] enhancer.  If working in Eclipse, then JDO enhancement is most easily done by installing the http://www.datanucleus.org/products/datanucleus/jdo/guides/eclipse.html[DataNucleus' Eclipse plugin].  This hooks the bytecode enhancement of your domain objects into Eclipse's normal incremental compilation.
@@ -16,10 +21,6 @@ This plugin needs to be configured for each of your domain modules (usually just
 * configure the DataNucleus enhancer
 * run the app from the `.launch` file
 
-[NOTE]
-====
-This material does not constitute an endorsement; Eclipse foundation is not affiliated to Apache Software Foundation in any way.
-====
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_cg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_intellij.adoc
index f912828..fd63312 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_intellij.adoc
@@ -6,24 +6,21 @@
 :toc: right
 
 
-This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.
-
 
 [NOTE]
 ====
 This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.
 ====
 
+This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.
+
 
 
 == Installing and Setting up
 
-This section covers installation and setup.
+This section covers installation and setup. These notes relates to IntelliJ Community Edition 14.1.x, with
+screenshots taken for Windows.
 
-[NOTE]
-====
-These notes relates to IntelliJ Community Edition 14.1.x, with screenshots taken for Windows.
-====
 
 === Download and Install
 

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Blob.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Blob.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Blob.adoc
index 44fc409..6e8c67f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Blob.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Blob.adoc
@@ -5,4 +5,4 @@
 :_imagesdir: images/
 
 
-NOTE: TODO
+NOTE: TODO - the `org.apache.isis.applib.value.Blob` class.

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Clob.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Clob.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Clob.adoc
index 233c852..de43105 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Clob.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Clob.adoc
@@ -5,4 +5,4 @@
 :_imagesdir: images/
 
 
-NOTE: TODO
+NOTE: TODO - the `org.apache.isis.applib.value.Clob` class.

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Color.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Color.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Color.adoc
index 0952c8f..4bcdd63 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Color.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Color.adoc
@@ -5,5 +5,4 @@
 :_imagesdir: images/
 
 
-NOTE: TODO
-
+NOTE: TODO - the `org.apache.isis.applib.value.Color` class.

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Money.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Money.adoc b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Money.adoc
index c6d1c67..16c0192 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Money.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rg_classes_value-types_manpage-Money.adoc
@@ -5,4 +5,4 @@
 :_imagesdir: images/
 
 
-NOTE: TODO
+NOTE: TODO - the `org.apache.isis.applib.value.Money` class.

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_ug_faqs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_faqs.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs.adoc
new file mode 100644
index 0000000..73611c7
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs.adoc
@@ -0,0 +1,15 @@
+[[_ug_faqs]]
+= FAQs
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+
+This chapter has FAQs (with solutions) for problems we've encountered ourselves or have been raised on the
+Apache Isis mailing lists.
+
+
+include::_ug_faqs_enabling-logging.adoc[leveloffset=+1]
+include::_ug_faqs_subtype-entity-not-fully-populated.adoc[leveloffset=+1]
+include::_ug_faqs_restful-image-property.adoc[leveloffset=+1]
+

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_enabling-logging.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_enabling-logging.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_enabling-logging.adoc
new file mode 100644
index 0000000..a1e212e
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_enabling-logging.adoc
@@ -0,0 +1,39 @@
+[[_ug_faqs_enabling-logging]]
+= Enabling Logging
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+Sometimes you just need to see what is going on. There are various ways in which logging can be enabled, here are the ones we tend to use.
+
+* In Apache Isis +
++
+Modify `WEB-INF/logging.properties` (a log4j config file)
+
+* In DataNucleus +
++
+As per the http://www.datanucleus.org/products/accessplatform/logging.html[DN logging page]
+
+* In the JDBC Driver +
++
+Configure `log4jdbc` JDBC rather than the vanilla driver (see `WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see `WEB-INF/logging.properties`).  There are examples of both in the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
+
+* In the database +
++
+Details below.
+
+
+Database logging can be configured:
+
+* for HSQLDB +
++
+by adding`;sqllog=3` to the end of the JDBC URL.
+
+* for PostgreSQL: +
++
+Can change `postgresql\9.2\data\postgresql.conf`; see link:http://www.postgresql.org/docs/9.2/static/runtime-config-logging.html[this article] for details.
+
+* for MS SQL Server Logging: +
++
+We like to use the excellent SQL Profiler tool.
+

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_restful-image-property.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_restful-image-property.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_restful-image-property.adoc
new file mode 100644
index 0000000..0c5a0db
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_restful-image-property.adoc
@@ -0,0 +1,20 @@
+[[_ug_faqs_restful-image-property]]
+= How parse image properties from Restful Objects?
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+
+ref: link:http://markmail.org/message/4kcu7sml4ufdsah3[mailing list thread]
+
+The RO viewer returns the image as a string, in the form:
+
+    "Tacos.jpg:image/jpeg:/9j//4AAQSkZJRgABAQEAlgCWAAD/  ...."
+
+This is in the form:
+
+    (filename):(mime type):(binary data in base64)
+
+This is basically the xref:rg.adoc#_rg_classes_value-types_manpage-Blob[`Blob`] value type, in string form.
+
+To use, split the parts then format the mime type and base64 data correctly before using as source in an `<img>` tag.

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_subtype-entity-not-fully-populated.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_subtype-entity-not-fully-populated.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_subtype-entity-not-fully-populated.adoc
new file mode 100644
index 0000000..2448556
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/_ug_faqs_subtype-entity-not-fully-populated.adoc
@@ -0,0 +1,67 @@
+[[_ug_troubleshooting_faqs]]
+= (Subtype) entity not fully populated
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+
+ref: link:http://markmail.org/message/ovgai56uqgfgnrx7[mailing list thread]
+
+If it seems that Apache Isis (or rather DataNucleus) isn't fully populating domain entities (ie leaving some properties
+as `null`), then check that your actions are not accessing the fields directly.  Use getters instead.  that is:
+
+[WARNING]
+====
+Properties of domain entities should always be accessed using getters.  The only code that should access to fields
+should be the getters themselves.
+====
+
+Why so? Because DataNucleus will potentially lazy load some properties, but to do this it needs to know that the
+field is being requested.  This is the purpose of the enhancement phase: the bytecode of the original getter method is
+actually wrapped in code that does the lazy loading checking.  But hitting the field directly means that the lazy
+loading code does not run.
+
+This error can be subtle: sometimes "incorrect" code that accesses the fields will seem to work.  But that will be
+because the field has been populated already, for whatever reason.
+
+One case where you will find the issue highlighted is for subtype tables that have been mapped using an inheritance
+strategy of `NEW_TABLE`, eg:
+
+[source,java]
+----
+@javax.jdo.annotations.PersistenceCapable
+@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
+public class SupertypeEntity {
+    ...
+}
+----
+
+and then:
+
+[source,java]
+----
+@javax.jdo.annotations.PersistenceCapable
+@javax.jdo.annotations.Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
+public class SubtypeEntity extends SupertypeEntity {
+    ...
+}
+----
+
+This will generate two tables in the database, with the primary key of the supertype table propagated as a foreign key
+(also primary key) of the subtype table (sometimes called "table per type" strategy).  This means that DataNucleus
+might retrieve data from only the supertype table, and the lazily load the subtype fields only as required.  This is
+preferable to doing a left outer join from the super- to the subtype tables to retrieve data that might not be needed.
+
+On the other hand, if the `SUPERCLASS_TABLE` strategy (aka "table per hierarchy" or roll-up) or the `SUBCLASS_TABLE`
+strategy (roll-down) was used, then the problem is less likely to occur because DataNucleus would obtain all the data
+for any given instance from a single table.
+
+Final note: references to other objects (either scalar references or in collections) in particular require that getters
+rather than fields to be used to obtain them: it's hopefully obvious that DataNucleus (like all ORMs) should not and
+will not resolve such references (otherwise, where to stop... and the whole database would be loaded into memory).
+
+In summary, there's just one rule: *always use the getters, never the fields*.
+
+
+
+

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting.adoc
deleted file mode 100644
index a522221..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-[[_ug_troubleshooting]]
-= Troubleshooting
-: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-:_basedir: ../
-:_imagesdir: images/
-
-NOTE: TODO
-
-## Logging
-
-include::_ug_troubleshooting_enabling-logging.adoc[leveloffset=+1]
-
-
-

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting_enabling-logging.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting_enabling-logging.adoc b/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting_enabling-logging.adoc
deleted file mode 100644
index 712ea17..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/_ug_troubleshooting_enabling-logging.adoc
+++ /dev/null
@@ -1,39 +0,0 @@
-[[_ug_troubleshooting_enabling-logging]]
-= Enabling Logging
-: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-:_basedir: ../
-:_imagesdir: images/
-
-Sometimes you just need to see what is going on. There are various ways in which logging can be enabled, here are the ones we tend to use.
-
-== In Apache Isis
-
-Modify `WEB-INF/logging.properties` (a log4j config file)
-
-== In DataNucleus
-
-As per the http://www.datanucleus.org/products/accessplatform/logging.html[DN logging page]
-
-== In the JDBC Driver
-
-Configure log4jdbc JDBC rather than the vanilla driver (see `WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see `WEB-INF/logging.properties`).
-
-There are examples of both in the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
-
-== In the Database
-
-=== HSQLDB Logging
-
-Add `;sqllog=3` to the end of the JDBC URL.
-
-=== PostgreSQL Logging
-
-In `postgresql\9.2\data\postgresql.conf`:
-
-Will then log to `postgresql\9.2\data\pg_log` directory.
-
-Note that you must restart the service for this to be picked up.
-
-=== MS SQL Server Logging
-
-Use the excellent SQL Profiler tool.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/0845ef63/adocs/documentation/src/main/asciidoc/guides/ug.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ug.adoc b/adocs/documentation/src/main/asciidoc/guides/ug.adoc
index 155b507..0ca52ac 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ug.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ug.adoc
@@ -34,6 +34,5 @@ include::_ug_testing.adoc[leveloffset=+1]
 include::_ug_deployment.adoc[leveloffset=+1]
 include::_ug_headless-access.adoc[leveloffset=+1]
 include::_ug_extending.adoc[leveloffset=+1]
-include::_ug_troubleshooting.adoc[leveloffset=+1]
-
+include::_ug_faqs.adoc[leveloffset=+1]