Address 1850 part 1

Colin Robertson · Colin Robertson · commit 917a020e67b4 · 2020-01-22T03:23:25.000-08:00
diff --git a/docs/build/reference/zc-inline-remove-unreferenced-comdat.md b/docs/build/reference/zc-inline-remove-unreferenced-comdat.md
@@ -59,7 +59,7 @@ void Example::normal_call() {
 // Compile by using: cl /W4 /EHsc /O2 zcinline.cpp example.cpp
 #include "example.h"
 
-void main() {
+int main() {
    Example example;
    example.inline_call(); // normal call when definition unavailable
 }
@@ -101,7 +101,7 @@ void Example2::normal_call() {
 // Compile by using: cl /W4 /EHsc /O2 zcinline2.cpp example2.cpp
 #include "example2.h"
 
-void main() {
+int main() {
    Example2 example2;
    example2.inline_call(); // normal call when definition unavailable
 }
diff --git a/docs/build/reference/zc-referencebinding-enforce-reference-binding-rules.md b/docs/build/reference/zc-referencebinding-enforce-reference-binding-rules.md
@@ -35,7 +35,7 @@ S g() {
     return S{};
 }
 
-void main() {
+int main() {
     S& s = g();         // warning C4239 at /W4
     const S& cs = g();  // okay, bound to const ref
     f(g());             // Extension: error C2664 only if /Zc:referenceBinding
diff --git a/docs/build/walkthrough-compiling-a-native-cpp-program-on-the-command-line.md b/docs/build/walkthrough-compiling-a-native-cpp-program-on-the-command-line.md
@@ -68,7 +68,7 @@ Before you can build a C or C++ program on the command line, you must verify tha
    ```cpp
    #include <iostream>
    using namespace std;
-   void main()
+   int main()
    {
        cout << "Hello, world, from Visual C++!" << endl;
    }
diff --git a/docs/c-runtime-library/reference/wcsrtombs-s.md b/docs/c-runtime-library/reference/wcsrtombs-s.md
@@ -114,7 +114,7 @@ The **wcsrtombs_s** function is multithread safe as long as no function in the c
 
 #define MB_BUFFER_SIZE 100
 
-void main()
+int main()
 {
     const wchar_t   wcString[] =
                     {L"Every good boy does fine."};
diff --git a/docs/cpp/attributes.md b/docs/cpp/attributes.md
@@ -57,7 +57,7 @@ Attributes represent a standardized alternative to vendor-specific extensions su
 - `[[gsl::suppress(rules)]]` This Microsoft-specific attribute is used for suppressing warnings from checkers that enforce [Guidelines Support Library (GSL)](https://github.com/Microsoft/GSL) rules in code. For example, consider this code snippet:
 
     ```cpp
-    void main()
+    int main()
     {
         int arr[10]; // GSL warning 26494 will be fired
         int* p = arr; // GSL warning 26485 will be fired
@@ -77,4 +77,5 @@ Attributes represent a standardized alternative to vendor-specific extensions su
 
   - 26481 (Bounds Rule 1: Don't use pointer arithmetic. Use span instead.)
 
-  The first two warnings fire when you compile this code with the CppCoreCheck code analysis tool installed and activated. But the third warning doesn't fire because of the attribute. You can suppress the entire bounds profile by writing [[gsl::suppress(bounds)]] without including a specific rule number. The C++ Core Guidelines are designed to help you write better and safer code. The suppress attribute makes it easy to turn off the warnings when they are not wanted.
+  The first two warnings fire when you compile this code with the CppCoreCheck code analysis tool installed and activated. But the third warning doesn't fire because of the attribute. You can suppress the entire bounds profile by writing [[gsl::suppress(bounds)]] without including a specific rule number. The C++ Core Guidelines are designed to help you write better and safer code. The suppress attribute makes it easy to turn off the warnings when they are not wanted.
+  
diff --git a/docs/cpp/import-export-module.md b/docs/cpp/import-export-module.md
@@ -48,7 +48,7 @@ Non-exported names are not visible to code that imports the module:
 
 import module ModuleA;
 
-void main() {
+int main() {
   Bar::f(); // OK
   Bar::d(); // OK
   Bar::internal_f(); // Ill-formed: error C2065: 'internal_f': undeclared identifier
diff --git a/docs/error-messages/compiler-errors-1/compiler-error-c2346.md b/docs/error-messages/compiler-errors-1/compiler-error-c2346.md
@@ -37,7 +37,7 @@ struct S
    virtual __clrcall ~S() { }
 };
 
-void main()
+int main()
 {
    S s;
 }
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-1-c4789.md b/docs/error-messages/compiler-warnings/compiler-warning-level-1-c4789.md
@@ -70,9 +70,9 @@ The following sample also generates C4789.
 // processor: x86
 short G;
 
-void main()
+int main()
 {
    int * p = (int *)&G;
    *p = 3;   // C4789 - writes an int through a pointer to short
 }
-```
+```
diff --git a/docs/error-messages/compiler-warnings/compiler-warning-level-3-c4373.md b/docs/error-messages/compiler-warnings/compiler-warning-level-3-c4373.md
@@ -37,7 +37,7 @@ struct Derived : Base
     }
 };
 
-void main()
+int main()
 {
     Derived d;
     Base* p = &d;
@@ -47,4 +47,4 @@ void main()
 
 ```Output
 derived
-```
+```

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ S g() {`
`35`	`35`	`return S{};`
`36`	`36`	`}`
`37`	`37`
`38`		`-void main() {`
	`38`	`+int main() {`
`39`	`39`	`S& s = g(); // warning C4239 at /W4`
`40`	`40`	`const S& cs = g(); // okay, bound to const ref`
`41`	`41`	`f(g()); // Extension: error C2664 only if /Zc:referenceBinding`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ Before you can build a C or C++ program on the command line, you must verify tha`
`68`	`68`	```cpp
`69`	`69`	`#include <iostream>`
`70`	`70`	`using namespace std;`
`71`		`- void main()`
	`71`	`+ int main()`
`72`	`72`	`{`
`73`	`73`	`cout << "Hello, world, from Visual C++!" << endl;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ The wcsrtombs_s function is multithread safe as long as no function in the c`
`114`	`114`
`115`	`115`	`#define MB_BUFFER_SIZE 100`
`116`	`116`
`117`		`-void main()`
	`117`	`+int main()`
`118`	`118`	`{`
`119`	`119`	`const wchar_t wcString[] =`
`120`	`120`	`{L"Every good boy does fine."};`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct S`
`37`	`37`	`virtual __clrcall ~S() { }`
`38`	`38`	`};`
`39`	`39`
`40`		`-void main()`
	`40`	`+int main()`
`41`	`41`	`{`
`42`	`42`	`S s;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ The following sample also generates C4789.`
`70`	`70`	`// processor: x86`
`71`	`71`	`short G;`
`72`	`72`
`73`		`-void main()`
	`73`	`+int main()`
`74`	`74`	`{`
`75`	`75`	`int * p = (int *)&G;`
`76`	`76`	`*p = 3; // C4789 - writes an int through a pointer to short`
`77`	`77`	`}`
`78`		-```
	`78`	+```
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ struct Derived : Base`
`37`	`37`	`}`
`38`	`38`	`};`
`39`	`39`
`40`		`-void main()`
	`40`	`+int main()`
`41`	`41`	`{`
`42`	`42`	`Derived d;`
`43`	`43`	`Base* p = &d;`
`@@ -47,4 +47,4 @@ void main()`
`47`	`47`
`48`	`48`	```Output
`49`	`49`	`derived`
`50`		-```
	`50`	+```