Merge branch 'develop' into content/rs-eprs-6.2

EnterpriseDB · Mar 19, 2021 · fc286cb · fc286cb
2 parents 60b5d8b + 0698a8e
commit fc286cb
Show file tree

Hide file tree

Showing 86 changed files with 2,761 additions and 4,116 deletions.
diff --git a/.husky/.gitignore b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn pretty-quick --staged --pattern 'src/**/*.js' --pattern 'gatsby-*.js'
diff --git a/advocacy_docs/supported-open-source/postgresql/installer/index.mdx b/advocacy_docs/supported-open-source/postgresql/installer/index.mdx
@@ -1,6 +1,8 @@
 ---
 title: "EDB Installers"
 description: "The PostgreSQL installers created by EnterpriseDB are designed to make it quick and simple to install PostgreSQL on your computer."
+legacyRedirects:
+  - "/edb-docs/d/postgresql/installation-getting-started/installation-guide/13.0/index.html"
 ---
 
 The PostgreSQL installers created by EnterpriseDB are designed to make it quick and simple to install PostgreSQL on your computer. The installer provides:

diff --git a/gatsby-config.js b/gatsby-config.js
@@ -131,10 +131,6 @@ const indexQuery = `
 
 /********** Gatsby config *********/
 module.exports = {
-  flags: {
-    PRESERVE_WEBPACK_CACHE: true,
-    FAST_REFRESH: true,
-  },
   pathPrefix: '/docs',
   siteMetadata: {
     title: 'EDB Docs',

diff --git a/gatsby-node.js b/gatsby-node.js
@@ -340,7 +340,7 @@ const createAdvocacy = (navTree, prevNext, doc, learn, actions) => {
       );
     }
 
-    const path = `${doc.fields.path}/${katacodaPage.scenario}`;
+    const path = `${doc.fields.path}${katacodaPage.scenario}`;
     actions.createPage({
       path: path,
       component: require.resolve('./src/templates/katacoda-page.js'),

diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "format": "prettier --write src/**/*.js gatsby-*.js",
     "build": "gatsby build --prefix-paths",
     "serve-build": "gatsby serve --prefix-paths",
+    "prepare": "husky install",
     "update-icons": "git submodule update --init --remote && node scripts/createIconTypes.js && node scripts/createIconNames.js",
     "build-pdf": "docker-compose -f docker/docker-compose.build-pdf.yaml run --rm --entrypoint scripts/pdf/generate_pdf.py pdf-builder",
     "build-all-pdfs": "for i in product_docs/docs/**/*/ ; do echo \"$i\"; yarn build-pdf ${i%} || exit 1; done",
@@ -23,43 +24,37 @@
     "heroku-postbuild": "gatsby build",
     "build-legacy-redirects-nginx": "gatsby clean && gatsby build --prefix-paths && python3 scripts/legacy_redirects/clean_up_output.py"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "pretty-quick --staged --pattern 'src/**/*.js' --pattern 'gatsby-*.js'"
-    }
-  },
   "dependencies": {
     "@mdx-js/mdx": "^1.6.1",
     "@mdx-js/react": "^1.6.1",
     "algoliasearch": "^4.2.0",
     "balance-text": "^3.3.0",
-    "bl": "4.0.3",
+    "bl": "4.1.0",
     "bootstrap": "4.6.0",
-    "gatsby": "^2.31.1",
-    "gatsby-cli": "^2.12.93",
-    "gatsby-image": "^2.4.1",
-    "gatsby-plugin-algolia": "^0.16.3",
-    "gatsby-plugin-catch-links": "^2.6.0",
+    "gatsby": "^3.1.0",
+    "gatsby-cli": "^3.1.0",
+    "gatsby-plugin-algolia": "^0.17.0",
+    "gatsby-plugin-catch-links": "^3.0.0",
     "gatsby-plugin-google-fonts": "^1.0.1",
-    "gatsby-plugin-google-tagmanager": "^2.10.0",
-    "gatsby-plugin-manifest": "^2.4.10",
-    "gatsby-plugin-mdx": "^1.2.6",
+    "gatsby-plugin-google-tagmanager": "^3.0.0",
+    "gatsby-plugin-manifest": "^3.0.0",
+    "gatsby-plugin-mdx": "^2.0.1",
     "gatsby-plugin-meta-redirect": "^1.1.1",
-    "gatsby-plugin-netlify": "^2.3.13",
+    "gatsby-plugin-netlify": "^3.0.1",
     "gatsby-plugin-nginx-redirect": "^0.0.11",
-    "gatsby-plugin-react-helmet": "^3.3.1",
+    "gatsby-plugin-react-helmet": "^4.0.0",
     "gatsby-plugin-react-svg": "^3.0.0",
     "gatsby-plugin-remove-fingerprints": "^0.0.2",
-    "gatsby-plugin-sass": "^3.1.0",
-    "gatsby-plugin-sharp": "^2.13.2",
-    "gatsby-plugin-sitemap": "^2.4.13",
-    "gatsby-remark-autolink-headers": "^2.3.1",
-    "gatsby-remark-images": "^3.10.0",
-    "gatsby-remark-prismjs": "^3.5.4",
-    "gatsby-source-filesystem": "^2.3.1",
-    "gatsby-transformer-json": "^2.4.3",
-    "gatsby-transformer-remark": "^2.8.15",
-    "gatsby-transformer-sharp": "^2.5.1",
+    "gatsby-plugin-sass": "^4.0.2",
+    "gatsby-plugin-sharp": "^3.0.1",
+    "gatsby-plugin-sitemap": "^3.0.0",
+    "gatsby-remark-autolink-headers": "^3.0.0",
+    "gatsby-remark-images": "4.0.0",
+    "gatsby-remark-prismjs": "^4.0.0",
+    "gatsby-source-filesystem": "^3.0.0",
+    "gatsby-transformer-json": "^3.0.0",
+    "gatsby-transformer-remark": "^3.0.0",
+    "gatsby-transformer-sharp": "^3.0.0",
     "graceful-fs": "^4.2.4",
     "is-absolute-url": "^3.0.3",
     "markdown-to-jsx": "^7.0.0",
@@ -77,7 +72,7 @@
     "fast-glob": "^3.2.5",
     "hast-util-is-element": "^1.1.0",
     "hast-util-to-text": "^2.0.1",
-    "husky": "^4.3.5",
+    "husky": "^5.1.3",
     "prettier": "^2.2.1",
     "pretty-quick": "^3.1.0",
     "react-refresh": "^0.9.0",
@@ -88,6 +83,7 @@
     "remark-frontmatter": "^2.0.0",
     "remark-mdx": "^1.6.22",
     "remark-stringify": "^8.1.1",
+    "semver-compare": "^1.0.0",
     "to-vfile": "^6.1.0",
     "typescript": "^4.1.3"
   },

diff --git a/product_docs/docs/ark/3.5/ark_v3.5_documentation.pdf b/product_docs/docs/ark/3.5/ark_v3.5_documentation.pdf
diff --git a/product_docs/docs/bart/2.4/bart_v2.4_documentation.pdf b/product_docs/docs/bart/2.4/bart_v2.4_documentation.pdf
diff --git a/product_docs/docs/bart/2.5.1/bart_v2.5.1_documentation.pdf b/product_docs/docs/bart/2.5.1/bart_v2.5.1_documentation.pdf
diff --git a/product_docs/docs/bart/2.5.2/bart_v2.5.2_documentation.pdf b/product_docs/docs/bart/2.5.2/bart_v2.5.2_documentation.pdf
diff --git a/product_docs/docs/bart/2.5.3/bart_v2.5.3_documentation.pdf b/product_docs/docs/bart/2.5.3/bart_v2.5.3_documentation.pdf
diff --git a/product_docs/docs/bart/2.5.4/bart_v2.5.4_documentation.pdf b/product_docs/docs/bart/2.5.4/bart_v2.5.4_documentation.pdf
diff --git a/product_docs/docs/bart/2.5.5/bart_v2.5.5_documentation.pdf b/product_docs/docs/bart/2.5.5/bart_v2.5.5_documentation.pdf
diff --git a/product_docs/docs/bart/2.5.7/bart_v2.5.7_documentation.pdf b/product_docs/docs/bart/2.5.7/bart_v2.5.7_documentation.pdf
diff --git a/product_docs/docs/bart/2.6.1/bart_v2.6.1_documentation.pdf b/product_docs/docs/bart/2.6.1/bart_v2.6.1_documentation.pdf
diff --git a/product_docs/docs/bart/2.6/bart_v2.6_documentation.pdf b/product_docs/docs/bart/2.6/bart_v2.6_documentation.pdf
diff --git a/product_docs/docs/efm/3.10/efm_v3.10_documentation.pdf b/product_docs/docs/efm/3.10/efm_v3.10_documentation.pdf
diff --git a/product_docs/docs/efm/3.5/efm_v3.5_documentation.pdf b/product_docs/docs/efm/3.5/efm_v3.5_documentation.pdf
diff --git a/product_docs/docs/efm/3.6/efm_v3.6_documentation.pdf b/product_docs/docs/efm/3.6/efm_v3.6_documentation.pdf
diff --git a/product_docs/docs/efm/3.7/efm_v3.7_documentation.pdf b/product_docs/docs/efm/3.7/efm_v3.7_documentation.pdf
diff --git a/product_docs/docs/efm/3.8/efm_v3.8_documentation.pdf b/product_docs/docs/efm/3.8/efm_v3.8_documentation.pdf
diff --git a/product_docs/docs/efm/3.9/efm_v3.9_documentation.pdf b/product_docs/docs/efm/3.9/efm_v3.9_documentation.pdf
diff --git a/product_docs/docs/efm/4.0/efm_v4.0_documentation.pdf b/product_docs/docs/efm/4.0/efm_v4.0_documentation.pdf
diff --git a/product_docs/docs/efm/4.1/efm_v4.1_documentation.pdf b/product_docs/docs/efm/4.1/efm_v4.1_documentation.pdf
diff --git a/product_docs/docs/epas/10/epas_v10_documentation.pdf b/product_docs/docs/epas/10/epas_v10_documentation.pdf
diff --git a/product_docs/docs/epas/11/epas_v11_documentation.pdf b/product_docs/docs/epas/11/epas_v11_documentation.pdf
diff --git a/product_docs/docs/epas/12/epas_v12_documentation.pdf b/product_docs/docs/epas/12/epas_v12_documentation.pdf
diff --git a/product_docs/docs/epas/13/epas_v13_documentation.pdf b/product_docs/docs/epas/13/epas_v13_documentation.pdf
diff --git a/product_docs/docs/epas/9.5/epas_v9.5_documentation.pdf b/product_docs/docs/epas/9.5/epas_v9.5_documentation.pdf
diff --git a/product_docs/docs/epas/9.6/epas_v9.6_documentation.pdf b/product_docs/docs/epas/9.6/epas_v9.6_documentation.pdf
diff --git a/product_docs/docs/hadoop_data_adapter/2.0.5/hadoop_data_adapter_v2.0.5_documentation.pdf b/product_docs/docs/hadoop_data_adapter/2.0.5/hadoop_data_adapter_v2.0.5_documentation.pdf
diff --git a/product_docs/docs/hadoop_data_adapter/2.0.7/hadoop_data_adapter_v2.0.7_documentation.pdf b/product_docs/docs/hadoop_data_adapter/2.0.7/hadoop_data_adapter_v2.0.7_documentation.pdf
diff --git a/product_docs/docs/hadoop_data_adapter/2.0/hadoop_data_adapter_v2.0_documentation.pdf b/product_docs/docs/hadoop_data_adapter/2.0/hadoop_data_adapter_v2.0_documentation.pdf
diff --git a/product_docs/docs/jdbc_connector/42.2.12.1/jdbc_connector_v42.2.12.1_documentation.pdf b/product_docs/docs/jdbc_connector/42.2.12.1/jdbc_connector_v42.2.12.1_documentation.pdf
diff --git a/product_docs/docs/jdbc_connector/42.2.12.3/jdbc_connector_v42.2.12.3_documentation.pdf b/product_docs/docs/jdbc_connector/42.2.12.3/jdbc_connector_v42.2.12.3_documentation.pdf
diff --git a/product_docs/docs/jdbc_connector/42.2.8.1/jdbc_connector_v42.2.8.1_documentation.pdf b/product_docs/docs/jdbc_connector/42.2.8.1/jdbc_connector_v42.2.8.1_documentation.pdf
diff --git a/product_docs/docs/jdbc_connector/42.2.9.1/jdbc_connector_v42.2.9.1_documentation.pdf b/product_docs/docs/jdbc_connector/42.2.9.1/jdbc_connector_v42.2.9.1_documentation.pdf
diff --git a/product_docs/docs/migration_portal/3.0.1/migration_portal_v3.0.1_documentation.pdf b/product_docs/docs/migration_portal/3.0.1/migration_portal_v3.0.1_documentation.pdf
diff --git a/product_docs/docs/migration_toolkit/53.0.1/migration_toolkit_v53.0.1_documentation.pdf b/product_docs/docs/migration_toolkit/53.0.1/migration_toolkit_v53.0.1_documentation.pdf
diff --git a/product_docs/docs/migration_toolkit/53.0.2/migration_toolkit_v53.0.2_documentation.pdf b/product_docs/docs/migration_toolkit/53.0.2/migration_toolkit_v53.0.2_documentation.pdf
diff --git a/product_docs/docs/migration_toolkit/54.0.0/migration_toolkit_v54.0.0_documentation.pdf b/product_docs/docs/migration_toolkit/54.0.0/migration_toolkit_v54.0.0_documentation.pdf
diff --git a/product_docs/docs/mongo_data_adapter/5.2.8/mongo_data_adapter_v5.2.8_documentation.pdf b/product_docs/docs/mongo_data_adapter/5.2.8/mongo_data_adapter_v5.2.8_documentation.pdf
diff --git a/product_docs/docs/mysql_data_adapter/2.5.5/mysql_data_adapter_v2.5.5_documentation.pdf b/product_docs/docs/mysql_data_adapter/2.5.5/mysql_data_adapter_v2.5.5_documentation.pdf
diff --git a/product_docs/docs/net_connector/4.0.10.1/net_connector_v4.0.10.1_documentation.pdf b/product_docs/docs/net_connector/4.0.10.1/net_connector_v4.0.10.1_documentation.pdf
diff --git a/product_docs/docs/net_connector/4.0.10.2/net_connector_v4.0.10.2_documentation.pdf b/product_docs/docs/net_connector/4.0.10.2/net_connector_v4.0.10.2_documentation.pdf
diff --git a/product_docs/docs/net_connector/4.0.6.1/net_connector_v4.0.6.1_documentation.pdf b/product_docs/docs/net_connector/4.0.6.1/net_connector_v4.0.6.1_documentation.pdf
diff --git a/product_docs/docs/net_connector/4.1.3.1/net_connector_v4.1.3.1_documentation.pdf b/product_docs/docs/net_connector/4.1.3.1/net_connector_v4.1.3.1_documentation.pdf
diff --git a/product_docs/docs/net_connector/4.1.5.1/net_connector_v4.1.5.1_documentation.pdf b/product_docs/docs/net_connector/4.1.5.1/net_connector_v4.1.5.1_documentation.pdf
diff --git a/product_docs/docs/net_connector/4.1.6.1/net_connector_v4.1.6.1_documentation.pdf b/product_docs/docs/net_connector/4.1.6.1/net_connector_v4.1.6.1_documentation.pdf
diff --git a/product_docs/docs/ocl_connector/12.1.2.1/ocl_connector_v12.1.2.1_documentation.pdf b/product_docs/docs/ocl_connector/12.1.2.1/ocl_connector_v12.1.2.1_documentation.pdf
diff --git a/product_docs/docs/ocl_connector/13.1.4.1/ocl_connector_v13.1.4.1_documentation.pdf b/product_docs/docs/ocl_connector/13.1.4.1/ocl_connector_v13.1.4.1_documentation.pdf
diff --git a/product_docs/docs/ocl_connector/13.1.4.2/ocl_connector_v13.1.4.2_documentation.pdf b/product_docs/docs/ocl_connector/13.1.4.2/ocl_connector_v13.1.4.2_documentation.pdf
diff --git a/product_docs/docs/odbc_connector/12.0.0.1/odbc_connector_v12.0.0.1_documentation.pdf b/product_docs/docs/odbc_connector/12.0.0.1/odbc_connector_v12.0.0.1_documentation.pdf
diff --git a/product_docs/docs/odbc_connector/12.0.0.2/odbc_connector_v12.0.0.2_documentation.pdf b/product_docs/docs/odbc_connector/12.0.0.2/odbc_connector_v12.0.0.2_documentation.pdf
diff --git a/product_docs/docs/odbc_connector/12.2.0.1/odbc_connector_v12.2.0.1_documentation.pdf b/product_docs/docs/odbc_connector/12.2.0.1/odbc_connector_v12.2.0.1_documentation.pdf
diff --git a/product_docs/docs/odbc_connector/12.2.0.2/odbc_connector_v12.2.0.2_documentation.pdf b/product_docs/docs/odbc_connector/12.2.0.2/odbc_connector_v12.2.0.2_documentation.pdf
diff --git a/product_docs/docs/pem/7.10/pem_v7.10_documentation.pdf b/product_docs/docs/pem/7.10/pem_v7.10_documentation.pdf
diff --git a/product_docs/docs/pem/7.11/pem_v7.11_documentation.pdf b/product_docs/docs/pem/7.11/pem_v7.11_documentation.pdf
diff --git a/product_docs/docs/pem/7.12/pem_v7.12_documentation.pdf b/product_docs/docs/pem/7.12/pem_v7.12_documentation.pdf
diff --git a/product_docs/docs/pem/7.13/pem_v7.13_documentation.pdf b/product_docs/docs/pem/7.13/pem_v7.13_documentation.pdf
diff --git a/product_docs/docs/pem/7.14/pem_v7.14_documentation.pdf b/product_docs/docs/pem/7.14/pem_v7.14_documentation.pdf
diff --git a/product_docs/docs/pem/7.15/pem_v7.15_documentation.pdf b/product_docs/docs/pem/7.15/pem_v7.15_documentation.pdf
diff --git a/product_docs/docs/pem/7.16/pem_v7.16_documentation.pdf b/product_docs/docs/pem/7.16/pem_v7.16_documentation.pdf
diff --git a/product_docs/docs/pem/7.6/pem_v7.6_documentation.pdf b/product_docs/docs/pem/7.6/pem_v7.6_documentation.pdf
diff --git a/product_docs/docs/pem/7.7/pem_v7.7_documentation.pdf b/product_docs/docs/pem/7.7/pem_v7.7_documentation.pdf
diff --git a/product_docs/docs/pem/7.8/pem_v7.8_documentation.pdf b/product_docs/docs/pem/7.8/pem_v7.8_documentation.pdf
diff --git a/product_docs/docs/pem/7.9/pem_v7.9_documentation.pdf b/product_docs/docs/pem/7.9/pem_v7.9_documentation.pdf
diff --git a/product_docs/docs/pem/8.0.1/pem_v8.0.1_documentation.pdf b/product_docs/docs/pem/8.0.1/pem_v8.0.1_documentation.pdf
diff --git a/product_docs/docs/pem/8.0/pem_v8.0_documentation.pdf b/product_docs/docs/pem/8.0/pem_v8.0_documentation.pdf
diff --git a/product_docs/docs/pgbouncer/1.0/index.mdx b/product_docs/docs/pgbouncer/1.0/index.mdx
@@ -21,20 +21,5 @@ EnterpriseDB enhancements for the PgBouncer project are available via RPM Packag
 
 For more information about PgBouncer, including reference and usage information, please visit the [PgBouncer project site](https://www.pgbouncer.org).
 
-<div class="note">
-
-<div class="title">
-
 !!! Note
-
-    </div>
-
     If you are using the pdf version of this document, using cut/paste to copy command may result in extra spaces or carriage returns in the pasted command. If a command fails, check the command carefully for additional characters.
-
-    </div>
-
-<div class="toctree" maxdepth="2">
-
-installation configuration\_and\_usage uninstallation conclusion
-
-</div>
diff --git a/product_docs/docs/pgbouncer/1.0/pgbouncer_v1.0_documentation.pdf b/product_docs/docs/pgbouncer/1.0/pgbouncer_v1.0_documentation.pdf
diff --git a/product_docs/docs/pgpool/1.0/pgpool_v1.0_documentation.pdf b/product_docs/docs/pgpool/1.0/pgpool_v1.0_documentation.pdf
diff --git a/product_docs/docs/postgis/1.0/postgis_v1.0_documentation.pdf b/product_docs/docs/postgis/1.0/postgis_v1.0_documentation.pdf
diff --git a/product_docs/docs/slony/1.0/slony_v1.0_documentation.pdf b/product_docs/docs/slony/1.0/slony_v1.0_documentation.pdf
diff --git a/scripts/createIconNames.js b/scripts/createIconNames.js
@@ -10,9 +10,10 @@ const toScreamingSnakeCase = (string) => string.replace(/-/g, '_').toUpperCase()
 const icons = readdirSync('static/edb-icons').filter(isSVG).map(removeExtension);
 
 const IconNamesContent = [
-  'export default {',
+  'const iconNames = {',
   icons.map((icon) => `  ${toScreamingSnakeCase(icon)}: '${toSingleLowerCase(icon)}',`).join('\n'),
-  '};\n',
+  '};',
+  'export default iconNames;\n',
 ].join('\n');
 
 writeFileSync(`src/components/icon/iconNames.js`, IconNamesContent);

diff --git a/scripts/normalize/lib/note-rerewriter.js b/scripts/normalize/lib/note-rerewriter.js
diff --git a/scripts/normalize/lib/note-rewriter.js b/scripts/normalize/lib/note-rewriter.js
@@ -1,4 +1,4 @@
-// Rewrite the not-very-well-converted RST alerts to markdown quotes with titles in bold
+// Rewrite the not-very-well-converted RST alerts to admonitions
 
 const visit = require('unist-util-visit')
 const mdast2string = require('mdast-util-to-string')
@@ -21,10 +21,19 @@ function transformer(tree, file) {
       });
 
       replacement = {
-        type: "blockquote",
+        type: "admonition",
+        keyword: "Note",
+        quoted: false,
+        "indentSize": 4,
         children: [
-          { type: "strong", children: [{type: 'text', value: mdast2string({children: title}) + ':'}], },
-          ...node.children.filter(node => !node.type.startsWith("jsx")),
+          { 
+            type: "admonition-heading",
+            children: [{ type: "text", value: mdast2string({children: title})}]
+          },
+          { 
+            type: "admonition-content",
+            children: node.children.filter(node => !node.type.startsWith("jsx")),
+          },
         ],
       };
     });

diff --git a/scripts/normalize/lib/relativelinks.js b/scripts/normalize/lib/relativelinks.js
@@ -130,7 +130,7 @@ const index = {
 
   keyId: (id) => 
   {
-    return '#' + slugger.slug(id.replace(/^[^#]*#+/, '')
+    return '#' + slugger.slug(decodeURIComponent(id.replace(/^[^#]*#+/, ''))
         .replace(/[_-]/g, "")
         .replace(/\s+/g, ""))
       .toLowerCase();

diff --git a/scripts/normalize/lib/strip-image-alt.js b/scripts/normalize/lib/strip-image-alt.js
@@ -0,0 +1,11 @@
+const visit = require('unist-util-visit')
+const mdast2string = require('mdast-util-to-string')
+
+module.exports = () => transformer;
+
+function transformer(tree, file) {
+
+  visit(tree, "image", (node, index, parent) => {
+    node.alt = node.alt.replace(/^ ?\*|\* ?$/g, '');
+  });
+}
diff --git a/scripts/normalize/markdown.js b/scripts/normalize/markdown.js
@@ -13,10 +13,12 @@ const remarkMdxEmbeddedHast = require('./lib/mast-embedded-hast')
 const {linkTargetIndexer, relativeLinkRewriter, index} = require('./lib/relativelinks')
 const remarkStringify = require('remark-stringify')
 const noEscapeImageAlt = require('./lib/no-escape-image-alt')
+//const stripImageAlt = require('./lib/strip-image-alt')
 const tableFormatter = require('./lib/table-formatter')
 const {docs1LinkRewriter, linkStats} = require('./lib/docs1-link-rewriter')
-const noteRewriter = require('./lib/note-rerewriter.js')
+const noteRewriter = require('./lib/note-rewriter.js')
 const codeInTables = require('../../src/plugins/code-in-tables.js')
+const admonitions = require('remark-admonitions')
 
 ;(async () => {
 
@@ -33,6 +35,7 @@ example:
 
   const parser = unified()
     .use(remarkParse)
+    .use(admonitions, { tag: '!!!', icons: 'none', infima: true })
     .use(mdx)
     .use(remarkFrontmatter)
   const indexing = unified()
@@ -45,13 +48,15 @@ example:
     .use(relativeLinkRewriter)
     .use(tableFormatter)
     .use(codeInTables)
-    .use(docs1LinkRewriter);
+    .use(docs1LinkRewriter)
+//    .use(stripImageAlt)
   const compiler = unified()
     .use(remarkParse)
     .use(remarkStringify, {emphasis: '*', bullet: '-', fences: true})
     .use(mdx)
     .use(remarkFrontmatter)
     .use(remarkMdxEmbeddedHast)
+    .use(admonitions, { tag: '!!!', icons: 'none', infima: true })
     .use(noteRewriter)
     .use(codeInTables)
     .use(noEscapeImageAlt)

diff --git a/src/components/back-button.js b/src/components/back-button.js
@@ -2,31 +2,18 @@ import React from 'react';
 import { Link } from './';
 import Icon, { iconNames } from './icon/';
 
-const BackButton = ({ path, currentPath }) => {
-  let url = path;
-  if (!url && currentPath) {
-    const splitPath = currentPath.split('/');
-    url =
-      splitPath.length > 4
-        ? splitPath.slice(0, splitPath.length - 2).join('/') + '/'
-        : '/';
-  } else if (!url) {
-    url = '/';
-  }
-
-  return (
-    <li className="ml-0 mb-3">
-      <Link to={url} className="d-block py-1 align-middle small text-dark">
-        <Icon
-          iconName={iconNames.ARROW_LEFT}
-          className="fill-black mt-n1 mr-1"
-          width="12"
-          height="12"
-        />
-        Back
-      </Link>
-    </li>
-  );
-};
+const BackButton = () => (
+  <li className="ml-0 mb-3">
+    <Link to="/" className="d-block py-1 align-middle small text-dark">
+      <Icon
+        iconName={iconNames.ARROW_LEFT}
+        className="fill-black mt-n1 mr-1"
+        width="12"
+        height="12"
+      />
+      Back
+    </Link>
+  </li>
+);
 
 export default BackButton;
diff --git a/src/components/icon/iconNames.js b/src/components/icon/iconNames.js
@@ -1,4 +1,4 @@
-export default {
+const iconNames = {
   ALERT: 'alert',
   ANGULARJS_COLOR: 'angularjscolor',
   ANNOUNCE: 'announce',
@@ -183,3 +183,4 @@ export default {
   WEBINAR: 'webinar',
   WINDOWS_COLOR: 'windowscolor',
 };
+export default iconNames;
diff --git a/src/components/left-nav.js b/src/components/left-nav.js
@@ -71,7 +71,7 @@ const LeftNav = ({
 }) => {
   return (
     <ul className="list-unstyled mt-0">
-      <BackButton currentPath={pagePath} />
+      <BackButton />
       {versionArray ? (
         <SectionHeadingWithVersions
           navTree={navTree}