diff --git a/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc b/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
index f02ad80..776ebb9 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
@@ -3,6 +3,7 @@
 title=Frequently Asked Questions
 prev=specific-issues.html
 ~~~~~~
+
 Frequently Asked Questions
 ==========================
 
@@ -78,8 +79,7 @@
 
 [[ghvmc]][[GSTSG00256]][[where-can-i-find-more-information-about-eclipse-and-glassfish-server-integration]]
 
-Where Can I Find More Information About Eclipse and GlassFish Server
-Integration?
+Where Can I Find More Information About Eclipse and GlassFish Server Integration?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Eclipse is a development environment that provides a framework, tools,
@@ -133,8 +133,7 @@
 
 [[ghvnl]][[GSTSG00260]][[what-are-the-restrictions-and-optimizations-for-the-java-persistence-api]]
 
-What Are the Restrictions and Optimizations for the Java Persistence
-API?
+What Are the Restrictions and Optimizations for the Java Persistence API?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 See "link:../application-development-guide/jpa.html#GSDVG00139[Restrictions and Optimizations]" in GlassFish
@@ -161,17 +160,11 @@
 information about Update Tool, see "link:../administration-guide/toc.html#GSADG00701[Update Tool]" in
 Eclipse GlassFish Server Administration Guide.
 
-
-[width="100%",cols="<100%",]
-|=======================================================================
-a|
-Note:
-
+[NOTE]
+====
 To update or remove installed components, you must use the standalone
 graphical Update Tool, not the Administration Console Update Tool.
-
-|=======================================================================
-
+====
 
 A command-line interface is also available for Update Tool. This
 interface uses the `pkg` command and enables you to perform most of the
@@ -180,20 +173,14 @@
 GlassFish Server]" in Eclipse GlassFish Server
 Administration Guide.
 
-
-[width="100%",cols="<100%",]
-|=======================================================================
-a|
-Note:
-
+[NOTE]
+====
 Update Tool differs from Upgrade Tool, which is used to migrate the
 configuration and deployed applications from an earlier version of
 GlassFish Server to the current version. For more information about
 Upgrade Tool and upgrading, see the link:../upgrade-guide/toc.html#GSUPG[GlassFish Server Open
 Source Edition Upgrade Guide].
-
-|=======================================================================
-
+====
 
 [[gjjoq]][[GSTSG00262]][[how-do-i-turn-off-the-notifier]]
 
@@ -208,11 +195,12 @@
 To Turn Off the Notifier
 ++++++++++++++++++++++++
 
-1.  Launch the standalone graphical tool using the `updatetool` command: +
-[source,oac_no_warn]
+1. Launch the standalone graphical tool using the `updatetool` command:
++
+[source]
 ----
 as-install-parent/bin/updatetool
 ----
-2.  Click Preferences.
-3.  Click the Updates tab.
-4.  Deselect Automatically Check for Updates and click OK.
+2. Click Preferences.
+3. Click the Updates tab.
+4. Deselect Automatically Check for Updates and click OK.
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/overview.adoc b/docs/troubleshooting-guide/src/main/jbake/content/overview.adoc
index 1545f1c..86fa14f 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/overview.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/overview.adoc
@@ -4,6 +4,7 @@
 next=specific-issues.html
 prev=preface.html
 ~~~~~~
+
 Overview of Eclipse GlassFish Server Troubleshooting
 ====================================================
 
@@ -54,28 +55,26 @@
 ++++++++++++++++++++++++++++++++++++++++++++
 
 Ensure that your system meets the requirements listed in
-"link:../release-notes/release-notes.html#GSRLN00131[Hardware and Software Requirements]" in GlassFish
-Server Open Source Edition Release Notes. Problems are likely to arise
-if you attempt to install on a platform that is not supported or on a
-system that in some other way does not meet release requirements. Also
-see "link:../release-notes/release-notes.html#GSRLN00253[Known Issues]" in GlassFish Server Open Source
+"link:../release-notes/release-notes.html#GSRLN00131[Hardware and Software Requirements]"
+in GlassFish Server Open Source Edition Release Notes.
+Problems are likely to arise if you attempt to install on a platform that
+is not supported or on a system that in some other way does not meet release requirements.
+Also see "link:../release-notes/release-notes.html#GSRLN00253[Known Issues]"
+in GlassFish Server Open Source
 Edition Release Notes for known issues related to installation.
 
 Eclipse GlassFish Server requires JDK release 6. The minimum
 (and certified) version of the JDK that is required for GlassFish Server
 Open Source Edition depends on the operating system:
 
-* For supported operating systems except Mac OS, the minimum required
-version is 1.6.0_17.
-* For the Mac OS X operating system, the minimum required version is
-1.6.0_15.
+* For supported operating systems except Mac OS, the minimum required version is 1.6.0_17.
+* For the Mac OS X operating system, the minimum required version is 1.6.0_15.
 
 If necessary, download and install the required JDK software.
 
-On Solaris, Linux, and Windows systems, JDK software is available from
-the
-http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java
-SE downloads page]
+On Solaris, Linux, and Windows systems, JDK software is available from the
+http://www.oracle.com/technetwork/java/javase/downloads/index.html[
+Java SE downloads page]
 (`http://www.oracle.com/technetwork/java/javase/downloads/index.html`).
 
 For Mac OS X systems, Eclipse GlassFish Server uses the JDK
@@ -116,12 +115,11 @@
 
 The following books will be especially helpful for troubleshooting:
 
-* link:../release-notes/toc.html#GSRLN[Eclipse GlassFish Server Release Notes], which
-provides the latest information regarding known issues and possible
-workarounds.
-* link:../error-messages-reference/toc.html#GSEMR[Eclipse GlassFish Server Error Message
-Reference], which lists error messages you might encounter when using
-GlassFish Server.
+* link:../release-notes/toc.html#GSRLN[Eclipse GlassFish Server Release Notes],
+  which provides the latest information regarding known issues and possible workarounds.
+* link:../error-messages-reference/toc.html#GSEMR[
+  Eclipse GlassFish Server Error Message Reference],
+  which lists error messages you might encounter when using GlassFish Server.
 
 Use the product documentation to learn more about GlassFish Server Open
 Source Edition. The more you know about the product the easier it might
@@ -132,11 +130,10 @@
 Search the GlassFish Mailing Lists and Forums
 +++++++++++++++++++++++++++++++++++++++++++++
 
-Lists and forums are extremely helpful resources, and are accessed as
-follows:
+Lists and forums are extremely helpful resources, and are accessed as follows:
 
 * GlassFish mailing lists (start with users@glassfish.java.net and
-search the archives): `http://java.net/projects/glassfish/lists/`
+  search the archives): `http://java.net/projects/glassfish/lists/`
 * GlassFish user forum: `http://www.java.net/forums/glassfish/glassfish`
 
 [[ghuvf]][[GSTSG00172]][[gathering-information]]
@@ -250,8 +247,8 @@
 Edition server instance is captured in a `server.log` file. That is,
 each instance, including the domain administration server (DAS), has an
 individual log file. By default, the log file for the DAS is located in
-domain-dir`/logs`, and the log file for each instance is located in
-instance-dir`/logs`.
+domain-dir``/logs``, and the log file for each instance is located in
+instance-dir``/logs`.
 
 In addition, for domains that use clustering, GlassFish Server Open
 Source Edition captures log information for each cluster instance in a
@@ -356,7 +353,7 @@
 
 Type the following command:
 
-[source,oac_no_warn]
+[source]
 ----
 asadmin generate-jvm-report --type=thread
 ----
@@ -409,8 +406,7 @@
 debug server. Remote clients such as `jstack`, `jmap`, and `jinfo` can
 attach to the server using Java Remote Invocation Method (RMI).
 * `jhat`: Enables Java heap dumps to be browsed using a web browser.
-* `jstat`: Displays performance statistics for an instrumented HotSpot
-JVM.
+* `jstat`: Displays performance statistics for an instrumented HotSpot JVM.
 * `jps`: Lists the instrumented HotSpot JVMs on the target system
 
 [[ghuyv]][[GSTSG00041]][[where-to-go-for-more-information]]
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc b/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
index 37bee42..75791b6 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
@@ -4,6 +4,7 @@
 next=overview.html
 prev=title.html
 ~~~~~~
+
 Preface
 =======
 
@@ -15,18 +16,17 @@
 -------
 
 [NOTE]
-========================================================================
-
-This documentation is part of the Java Enterprise Edition contribution 
-to the Eclipse Foundation and is not intended for use in relation to 
-Java Enterprise Edition or Orace GlassFish. The documentation is in the 
-process of being revised to reflect the new Jakarta EE branding. 
-Additional changes will be made as requirements and procedures evolve 
-for Jakarta EE. Where applicable, references to Java EE or Java 
-Enterprise Edition should be considered references to Jakarta EE. 
+====
+This documentation is part of the Java Enterprise Edition contribution
+to the Eclipse Foundation and is not intended for use in relation to
+Java Enterprise Edition or Orace GlassFish. The documentation is in the
+process of being revised to reflect the new Jakarta EE branding.
+Additional changes will be made as requirements and procedures evolve
+for Jakarta EE. Where applicable, references to Java EE or Java
+Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
-========================================================================
+====
 
 This guide describes common problems that you might encounter when using
 GlassFish Server Open Source Edition and how to solve them.
@@ -65,7 +65,7 @@
 the books in the order in which they are listed in the following table.
 
 [width="100%",cols="<30%,<70%",options="header",]
-|=======================================================================
+|===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
 the software and the documentation and includes a comprehensive,
@@ -153,7 +153,7 @@
 Message Queue who want to use the C language binding to the Message
 Queue messaging service to send, receive, and process Message Queue
 messages.
-|=======================================================================
+|===
 
 
 [[GSTSG00032]][[giprl]]
@@ -222,33 +222,36 @@
 this book.
 
 [width="100%",cols="<14%,<37%,<49%",options="header",]
-|=======================================================================
+|===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+a|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+a|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized
+(note that some emphasized items appear bold online)
+a|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
-|=======================================================================
+|===
 
 
 [[GSTSG00034]][[fquvc]]
@@ -261,7 +264,7 @@
 The following table explains symbols that might be used in this book.
 
 [width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
-|=======================================================================
+|===
 |Symbol |Description |Example |Meaning
 |`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
 `-l` option is not required.
@@ -282,7 +285,7 @@
 |> |Indicates menu item selection in a graphical user interface. |File >
 New > Templates |From the File menu, choose New. From the New submenu,
 choose Templates.
-|=======================================================================
+|===
 
 
 [[GSTSG00035]][[ghpfg]]
@@ -296,48 +299,50 @@
 used in this book.
 
 [width="100%",cols="<14%,<34%,<52%",options="header",]
-|=======================================================================
+|===
 |Placeholder |Description |Default Value
-|as-install + a|
-Represents the base installation directory for GlassFish Server.
+
+|as-install
+a|Represents the base installation directory for GlassFish Server.
 
 In configuration files, as-install is represented as follows:
 
 `${com.sun.aas.installRoot}`
 
- a|
-Installations on the Oracle Solaris operating system, Linux operating
+a|Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
 
-user's-home-directory`/glassfish3/glassfish`
+user's-home-directory``/glassfish3/glassfish``
 
 Installations on the Windows operating system:
 
-SystemDrive`:\glassfish3\glassfish`
+SystemDrive``:\glassfish3\glassfish``
 
-|as-install-parent + |Represents the parent of the base installation
-directory for GlassFish Server. a|
-Installations on the Oracle Solaris operating system, Linux operating
+|as-install-parent
+|Represents the parent of the base installation directory for GlassFish Server.
+a|Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
 
-user's-home-directory`/glassfish3`
+user's-home-directory``/glassfish3``
 
 Installations on the Windows operating system:
 
-SystemDrive`:\glassfish3`
+SystemDrive``:\glassfish3``
 
-|domain-root-dir + |Represents the directory in which a domain is
-created by default. |as-install`/domains/`
+|domain-root-dir
+|Represents the directory in which a domain is created by default.
+|as-install``/domains/``
 
-|domain-dir + a|
-Represents the directory in which a domain's configuration is stored.
+|domain-dir
+a|Represents the directory in which a domain's configuration is stored.
 
 In configuration files, domain-dir is represented as follows:
 
 `${com.sun.aas.instanceRoot}`
 
- |domain-root-dir`/`domain-name
+|domain-root-dir``/``domain-name
 
-|instance-dir + |Represents the directory for a server instance.
-|domain-dir`/`instance-name
-|=======================================================================
+|instance-dir
+|Represents the directory for a server instance.
+|domain-dir``/``instance-name
+|===
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc b/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
index a2ad951..c4e5fbf 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
@@ -4,6 +4,7 @@
 next=faqs.html
 prev=overview.html
 ~~~~~~
+
 Specific Issues
 ===============
 
@@ -59,7 +60,7 @@
 If the console window is already closed, check for messages in the log
 file. This is the default location:
 
-[source,oac_no_warn]
+[source]
 ----
 domain-dir/logs/server.log
 ----
@@ -68,9 +69,10 @@
 the console, and appears at the end of the log file.
 
 For more information about starting a domain, see
-"link:../administration-guide/domains.html#GSADG00537[Starting and Stopping a Domain]" in GlassFish Server
-Open Source Edition Administration Guide. To easily determine if a
-domain is running, use the `asadmin list-domains` command.
+"link:../administration-guide/domains.html#GSADG00537[
+Starting and Stopping a Domain]"
+in GlassFish Server Open Source Edition Administration Guide.
+To easily determine if a domain is running, use the `asadmin list-domains` command.
 
 [[abgcd]][[GSTSG00180]][[was-the-server-started-at-the-expected-port]]
 
@@ -93,27 +95,25 @@
 
 Follow this procedure.
 
-1.  Examine the server's configuration file: +
-[source,oac_no_warn]
+1. Examine the server's configuration file:
++
+[source]
 ----
 domain-dir/config/domain.xml
 ----
-2.  Find the `network-listener` element.
-3.  Inspect the value of the `port` attribute. +
-Be sure to enter the correct port number when invoking the server. +
-
-[width="100%",cols="<100%",]
-|=======================================================================
-a|
-Note:
-
+2. Find the `network-listener` element.
+3. Inspect the value of the `port` attribute.
++
+Be sure to enter the correct port number when invoking the server.
++
+[NOTE]
+====
 The server's default port number is `8080`, however, there are a number
 of ways in which the expected value can change:
 
 * A different port number was specified during installation.
 * A previous installation exists.
-
-|=======================================================================
+====
 
 
 [[gjjpn]][[GSTSG00181]][[is-a-personal-firewall-enabled]]
@@ -163,10 +163,10 @@
 
 Follow this procedure.
 
-1.  Log on to the host where the server is running.
-2.  Go to the local web page. For example, if `8080` is the default
-port, go to: +
-[source,oac_no_warn]
+1. Log on to the host where the server is running.
+2. Go to the local web page. For example, if `8080` is the default port, go to:
++
+[source]
 ----
 http://localhost:8080/
 ----
@@ -187,7 +187,7 @@
 The server should be accessible directly from the host on which it is
 running (`localhost`); for example, using the default port `8080`:
 
-[source,oac_no_warn]
+[source]
 ----
 http://localhost:8080/
 ----
@@ -203,9 +203,9 @@
 
 * Set the browser to bypass the proxy server when accessing `localhost`.
 Refer to the browser's help system for information about how to do this.
-* Use the fully-qualified host name or IP address of your system; for
-example: +
-[source,oac_no_warn]
+* Use the fully-qualified host name or IP address of your system; for example:
++
+[source]
 ----
 http://myhost.mydomain.com:8080/
 ----
@@ -213,15 +213,10 @@
 `127.0.0.1` to `localhost`; `127.0.0.1` is not proxied).
 
 
-[width="100%",cols="<100%",]
-|=======================================================================
-a|
-Note:
-
-To determine the host name for the `localhost` machine, type `hostname`
-at the command prompt.
-
-|=======================================================================
+[NOTE]
+====
+To determine the host name for the `localhost` machine, type `hostname` at the command prompt.
+====
 
 
 [[abgcm]][[GSTSG00045]][[cannot-access-the-administration-console]]
@@ -339,8 +334,9 @@
 Verify that the application was successfully deployed. There are several
 ways to do this:
 
-* Check the server's log file for related entries: +
-[source,oac_no_warn]
+* Check the server's log file for related entries:
++
+[source]
 ----
 domain-dir/server.log
 ----
@@ -393,10 +389,8 @@
 The minimum (and certified) version of the JDK software that is required
 for GlassFish Server depends on the operating system:
 
-* For supported operating systems except Mac OS, the minimum required
-version is 1.6.0_17.
-* For the Mac OS X operating system, the minimum required version is
-1.6.0_15.
+* For supported operating systems except Mac OS, the minimum required version is 1.6.0_17.
+* For the Mac OS X operating system, the minimum required version is 1.6.0_15.
 
 Ensure that the required JDK software is installed and that the
 `JAVA_HOME` environment variable points to the JDK installation
@@ -414,7 +408,7 @@
 GlassFish Server on Microsoft Windows, a server port conflict has
 occurred:
 
-[source,oac_no_warn]
+[source]
 ----
 Address already in use
 ----
@@ -426,8 +420,7 @@
 You might also check the following:
 
 * link:#abgdj[Is Another Application Running on the Server's Port?]
-* link:#abgdk[Has an Ungraceful Shutdown Occurred on a Previously
-Running Server?]
+* link:#abgdk[Has an Ungraceful Shutdown Occurred on a Previously Running Server?]
 
 [[abgdj]][[GSTSG00190]][[is-another-application-running-on-the-servers-port]]
 
@@ -458,7 +451,7 @@
 If GlassFish Server is installed in an OpenSolaris zone, an attempt to
 start a domain might fail with the following error message:
 
-[source,oac_no_warn]
+[source]
 ----
 Waiting for DAS to start ..Error starting domain: domain.
 The server exited prematurely with exit code 6.
@@ -476,9 +469,10 @@
 Resolution: To Enable GlassFish Server to Run in an OpenSolaris Zone
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-1.  Install the package that provides language and encoding support for
-your locale. +
-[source,oac_no_warn]
+1. Install the package that provides language and encoding support for
+your locale.
++
+[source]
 ----
 $ pkg install package-name
 ----
@@ -487,7 +481,8 @@
   for your locale. For example, the name of the package that provides
   language and encoding support for the US English locale is
   `SUNWlang-enUS`.
-2.  Set the `LANG` environment variable to the code for your locale. +
+2. Set the `LANG` environment variable to the code for your locale.
++
 For example, if your locale is US English, set the `LANG` environment
 variable to `en_US.UTF-8`.
 
@@ -509,7 +504,7 @@
 created using the same port number for the `instanceport` option; for
 example:
 
-[source,oac_no_warn]
+[source]
 ----
 asadmin create-domain -adminport 5001 options -instanceport 6001 domain
 asadmin create-domain -adminport 5002 options -instanceport 6001 domain
@@ -551,14 +546,14 @@
 Solution
 ^^^^^^^^
 
-[[ghylc]][[GSTSG00027]][[to-obtain-a-server-thread-dump]]
+[[ghylc]][[GSTSG00027]][[to-obtain-a-server-thread-dump-specific-issues]]
 
 To Obtain a Server Thread Dump
 ++++++++++++++++++++++++++++++
 
 Type the following command:
 
-[source,oac_no_warn]
+[source]
 ----
 asadmin generate-jvm-report --type=thread
 ----
@@ -576,8 +571,7 @@
 
 [[abgee]][[GSTSG00197]][[cannot-undeploy-or-redeploy-application-with-open-streams-to-jar-files-windows]]
 
-Cannot Undeploy or Redeploy Application With Open Streams to `jar` Files
-(Windows)
+Cannot Undeploy or Redeploy Application With Open Streams to `jar` Files (Windows)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 [[abgef]][[GSTSG00099]][[description-12]]
@@ -701,7 +695,7 @@
 
 The command `asadmin start-domain` fails with the following error:
 
-[source,oac_no_warn]
+[source]
 ----
 There is more than one domain...
 ----
@@ -724,14 +718,14 @@
 
 Specify the domain when issuing the `start-domain` command:
 
-[source,oac_no_warn]
+[source]
 ----
 asadmin start-domain domain-name
 ----
 
 For example:
 
-[source,oac_no_warn]
+[source]
 ----
 asadmin start-domain mycustomdomain
 ----
@@ -753,8 +747,7 @@
 Solution
 ++++++++
 
-Look for error messages that display in the console when you issue the
-command.
+Look for error messages that display in the console when you issue the command.
 
 Search the `server.log` file for error messages related to your
 inability to stop the domain.
@@ -774,8 +767,7 @@
 Description
 +++++++++++
 
-Installation hangs more than five minutes during Update Tool
-configuration.
+Installation hangs more than five minutes during Update Tool configuration.
 
 [[giqle]][[GSTSG00108]][[solution-13]]
 
@@ -791,18 +783,14 @@
 Source Edition Installation Guide].
 
 
-[width="100%",cols="<100%",]
-|=======================================================================
-a|
-Note:
-
+[NOTE]
+====
 Update Tool differs from Upgrade Tool, which is used to migrate the
 configuration and deployed applications from an earlier version of
-GlassFish Server to the current version. For more information about
-Upgrade Tool and upgrading, see the link:../upgrade-guide/toc.html#GSUPG[GlassFish Server Open
-Source Edition Upgrade Guide].
-
-|=======================================================================
+GlassFish Server to the current version.
+For more information about Upgrade Tool and upgrading, see the
+link:../upgrade-guide/toc.html#GSUPG[GlassFish Server Open Source Edition Upgrade Guide].
+====
 
 
 [[gjjob]][[GSTSG00202]][[glassfish-server-components-not-removed-during-uninstallation]]
@@ -851,7 +839,7 @@
 The following error occurs from an application client, or appears in the
 `server.log` file:
 
-[source,oac_no_warn]
+[source]
 ----
 java.security.AccessControlException: access denied
 (java.util.PropertyPermission name write...)
@@ -876,7 +864,7 @@
 codebase directory, add or append the following to `client.policy` or
 `server.policy`:
 
-[source,oac_no_warn]
+[source]
 ----
 grant codeBase "file:/.../build/sparc_SunOS/sec/-" {
    permission java.util.PropertyPermission "*", "read,write";
@@ -903,7 +891,7 @@
 
 Set the following properties on the JVM:
 
-[source,oac_no_warn]
+[source]
 ----
 javax.net.ssl.keyStore=
 <keystore-file-path>;javax.net.ssl.trustStore=<truststore-file-path>
@@ -912,7 +900,7 @@
 To use the application client, set the environment variable `VMARGS` to
 the following value:
 
-[source,oac_no_warn]
+[source]
 ----
 -Djavax.net.ssl.keyStore=${admin.domain.dir}/${admin.domain}/config/keystore.jks
 -Djavax.net.ssl.trustStore=${admin.domain.dir}/${admin.domain}/config/cacerts.jks
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/title.adoc b/docs/troubleshooting-guide/src/main/jbake/content/title.adoc
index f19ded6..8369f64 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/title.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/title.adoc
@@ -4,8 +4,9 @@
 next=preface.html
 prev=toc.html
 ~~~~~~
+
 Eclipse GlassFish Server Troubleshooting Guide, Release 7
-===========================================================
+=========================================================
 
 [[eclipse-glassfish-server]]
 Eclipse GlassFish Server
@@ -28,18 +29,18 @@
 
 Copyright © 2013, 2019 Oracle and/or its affiliates. All rights reserved.
 
-This program and the accompanying materials are made available under the 
-terms of the Eclipse Public License v. 2.0, which is available at 
-http://www.eclipse.org/legal/epl-2.0. 
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v. 2.0, which is available at
+http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
 
-Oracle and Java are registered trademarks of Oracle and/or its 
-affiliates. Other names may be trademarks of their respective owners. 
+Oracle and Java are registered trademarks of Oracle and/or its
+affiliates. Other names may be trademarks of their respective owners.
 
-Intel and Intel Xeon are trademarks or registered trademarks of Intel 
-Corporation. All SPARC trademarks are used under license and are 
-trademarks or registered trademarks of SPARC International, Inc. AMD, 
-Opteron, the AMD logo, and the AMD Opteron logo are trademarks or 
-registered trademarks of Advanced Micro Devices. UNIX is a registered 
-trademark of The Open Group. 
+Intel and Intel Xeon are trademarks or registered trademarks of Intel
+Corporation. All SPARC trademarks are used under license and are
+trademarks or registered trademarks of SPARC International, Inc. AMD,
+Opteron, the AMD logo, and the AMD Opteron logo are trademarks or
+registered trademarks of Advanced Micro Devices. UNIX is a registered
+trademark of The Open Group.