another try at redirect and some edits in main file

mikeblome · mikeblome · commit 7a3ef0cbbce4 · 2019-12-10T18:22:14.000-08:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -730,76 +730,6 @@
       "redirect_url": "/cpp/cpp/character-sets",
       "redirect_document_id": false
     },
-    {
-      "source_path": "docs/cpp/using-wmain-instead-of-main.md",
-      "redirect_url": "/cpp/cpp/main-function-and-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_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/main-function-restrictions.md",
-      "redirect_url": "/cpp/cpp/main-function-and-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_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/wildcard-expansion.md",
-      "redirect_url": "/cpp/cpp/main-function-and-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_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/customizing-cpp-command-line-processing.md",
-      "redirect_url": "/cpp/cpp/main-function-and-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_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/argument-definitions.md",
-      "redirect_url": "/cpp/cpp/main-function-and-command-line-args",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/exit-function.md",
-      "redirect_url": "/cpp/cpp/program-termination",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/abort-function.md",
-      "redirect_url": "/cpp/cpp/program-termination",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/return-statement-in-program-termination-cpp.md",
-      "redirect_url": "/cpp/cpp/program-termination",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/using-exit-or-return.md",
-      "redirect_url": "/cpp/cpp/program-termination",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "docs/cpp/using-atexit.md",
-      "redirect_url": "/cpp/cpp/program-termination",
-      "redirect_document_id": false
-    },
     {
       "source_path": "docs/cpp/index.md",
       "redirect_url": "/cpp/cpp/cpp-language-reference",
diff --git a/docs/cpp/main-function-and-command-line-args.md b/docs/cpp/main-function-and-command-line-args.md
@@ -14,10 +14,6 @@ All C++ programs must have a `main` function. If you try to compile a C++ *.exe*
 - Cannot have its address taken.
 - Cannot be called.
 
-If your source files use Unicode wide characters, you can use `wmain`, which is the wide-character version of `main`.
-
-The `main` function is not predefined by the compiler. It must be supplied in the program text.
-
 The declaration syntax for `main` is as follows:
 
 ```cpp
@@ -27,7 +23,7 @@ int main(int argc, char *argv[], char *envp[]);
 
 **Microsoft Specific**
 
-The declaration syntax for `wmain` is as follows:
+If your source files use Unicode wide characters, you can use `wmain`, which is the wide-character version of `main`. The declaration syntax for `wmain` is as follows:
 
 ```cpp
 int wmain( );
@@ -42,14 +38,14 @@ If no return value is specified, the compiler supplies a return value of zero. A
 
 ## Command line arguments
 
-The arguments in the prototype
+The arguments for `main` or `wmain` allow convenient command-line parsing of arguments and, optionally, access to environment variables. The types for `argc` and `argv` are defined by the language. The names `argc`, `argv`, and `envp` are traditional, but you can name them whatever you like.
 
 ```cpp
 int main( int argc, char* argv[], char* envp[]);
 int wmain( int argc, wchar_t* argv[], wchar_t* envp[]);
 ```
 
-allow convenient command-line parsing of arguments and, optionally, access to environment variables. The types for `argc` and `argv` are defined by the language. The names `argc`, `argv`, and `envp` are traditional, but you can name them whatever you like. The argument definitions are as follows:
+The argument definitions are as follows:
 
 *argc*<br/>
 An integer that contains the count of arguments that follow in *argv*. The *argc* parameter is always greater than or equal to 1.
@@ -69,7 +65,7 @@ The *envp* array, which is a common extension in many UNIX systems, is used in M
 
 **END Microsoft Specific**
 
-## Example
+### Example
 
 The following example shows how to use the *argc*, *argv*, and *envp* arguments to `main`:
 
@@ -117,7 +113,7 @@ Microsoft C/C++ startup code uses the following rules when interpreting argument
 
 - If an odd number of backslashes is followed by a double quotation mark, one backslash is placed in the `argv` array for every pair of backslashes, and the double quotation mark is "escaped" by the remaining backslash, causing a literal double quotation mark (") to be placed in `argv`.
 
-## Example
+### Example
 
 The following program demonstrates how command-line arguments are passed:
 
