diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index f20c144ebc5e..32d2bfdc7363 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -105,7 +105,8 @@
     "eng/**/*.json",
     "eng/*.txt",
     "eng/tox/tox.ini",
-    "./eng/tox/*.py"
+    "eng/common/docgeneration/Generate-DocIndex.ps1",
+    "eng/tox/*.py"
   ],
   "words": [
     "adls",
@@ -193,7 +194,9 @@
     "vmwarecloudsimple",
     "vnet",
     "vsts",
-    "westus"
+    "westus",
+    "docfx",
+    "Docfx"
   ],
   "overrides": [
     {
diff --git a/eng/common/docgeneration/Generate-DocIndex.ps1 b/eng/common/docgeneration/Generate-DocIndex.ps1
index 3c41d7e867bc..461b15ce01ff 100644
--- a/eng/common/docgeneration/Generate-DocIndex.ps1
+++ b/eng/common/docgeneration/Generate-DocIndex.ps1
@@ -119,7 +119,9 @@ function GenerateDocfxTocContent([Hashtable]$tocContent, [String]$lang, [String]
         $serviceName = $serviceMapping.Value[0]
         $displayName = $serviceMapping.Value[1]
 
-        $fileName = ($serviceName -replace '\s', '').ToLower().Trim()
+        # handle spaces in service name, EG "Confidential Ledger"
+        # handle / in service name, EG "Database for MySQL/PostgreSQL". Leaving a "/" present will generate a bad link location.
+        $fileName = ($serviceName -replace '\s', '').Replace("/","").ToLower().Trim()
         if ($visitedService.ContainsKey($serviceName)) {
             if ($displayName) {
                 Add-Content -Path "$($YmlPath)/${fileName}.md" -Value "#### $artifact`n##### ($displayName)"