fixes per edit pass

Author: mikeblome

.openpublishing.redirection.json

@@ -737,47 +737,47 @@
     },
     {
       "source_path": "docs/cpp/using-wmain-instead-of-main.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/main-program-startup.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/main-function-restrictions.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/additional-startup-considerations.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/wildcard-expansion.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/parsing-cpp-command-line-arguments.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/customizing-cpp-command-line-processing.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/startup-and-termination-cpp.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {
       "source_path": "docs/cpp/argument-definitions.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
       "redirect_document_id": false
     },
     {

docs/cpp/main-function-and-command-line-args.md renamed to docs/cpp/main-function-command-line-args.md

@@ -3735,7 +3735,7 @@
                     - name: extern
                       href: cpp/using-extern-to-specify-linkage.md
                 - name: main function and command-line arguments
-                  href: cpp/main-function-and-command-line-args.md
+                  href: cpp/main-function-command-line-args.md
                 - name: Program termination
                   href: cpp/program-termination.md
                 - name: Lvalues and rvalues