Merge pull request #1260 from mikeblome/mb-350

TrishaMc · web-flow · commit 5f56d9895e07 · 2018-08-20T15:38:27.000-07:00
removed dupe topic
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -235,6 +235,11 @@
             "redirect_url": "/cpp/cpp/program-and-linkage-cpp",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/cpp/template-friends.md",
+            "redirect_url": "/cpp/cpp/templates-cpp",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/cpp/using-extern-to-specify-linkage.md",
             "redirect_url": "/cpp/cpp/extern-cpp",
diff --git a/docs/cpp/TOC.md b/docs/cpp/TOC.md
@@ -275,7 +275,6 @@
 ## [Templates](templates-cpp.md)
 ### [typename](typename.md)
 ### [Class Templates](class-templates.md)
-### [Template Friends](template-friends.md)
 ### [Function Templates](function-templates.md)
 #### [Function Template Instantiation](function-template-instantiation.md)
 #### [Explicit Instantiation](explicit-instantiation.md)
diff --git a/docs/cpp/template-friends.md b/docs/cpp/template-friends.md
