Merge branch 'master' into release-2.11.0

apollographql · Feb 26, 2020 · 8b70079 · 8b70079
2 parents 062e6a3 + 256bbf1
commit 8b70079
Show file tree

Hide file tree

Showing 10 changed files with 691 additions and 498 deletions.
diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -38,8 +38,8 @@ module.exports = {
           'Apollo Federation': [
             'federation/introduction',
             'federation/implementing',
-            'federation/core-concepts',
-            'federation/advanced-features',
+            'federation/entities',
+            'federation/value-types',
             'federation/errors',
             'federation/metrics',
             'federation/migrating-from-stitching',

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -7,7 +7,7 @@
   },
   "dependencies": {
     "gatsby": "2.19.19",
-    "gatsby-theme-apollo-docs": "4.0.6",
+    "gatsby-theme-apollo-docs": "4.0.7",
     "react": "16.12.0",
     "react-dom": "16.12.0"
   }

diff --git a/docs/source/federation/advanced-features.md b/docs/source/federation/advanced-features.md
diff --git a/docs/source/federation/core-concepts.md b/docs/source/federation/core-concepts.md