changed title and made small edits to linkage topic

mikeblome · mikeblome · commit 6c275bf36531 · 2019-12-11T07:31:24.000-08:00
diff --git a/docs/cpp/extern-cpp.md b/docs/cpp/extern-cpp.md
@@ -7,7 +7,7 @@ ms.assetid: 1e2f0ae3-ae98-4410-85b5-222d6abc865a
 ---
 # extern (C++)
 
-The **extern** keyword is applied to a global variable, function or template declaration to specify that the name of that thing has *external linkage*. For background information on linkage and why the use of global variables is discouraged, see [Program and linkage](program-and-linkage-cpp.md).
+The **extern** keyword is applied to a global variable, function or template declaration to specify that the name of that thing has *external linkage*. For background information on linkage and why the use of global variables is discouraged, see [Translation units and linkage](program-and-linkage-cpp.md).
 
 The **extern** keyword has four meanings depending on the context:
 
@@ -124,7 +124,7 @@ extern "C" int CFunc2(); // Error: not the first declaration of
 ## See also
 
 [Keywords](../cpp/keywords-cpp.md)<br/>
-[Program and linkage](program-and-linkage-cpp.md)<br/>
+[Translation units and linkage](program-and-linkage-cpp.md)<br/>
 [extern Storage-Class Specifier in C](../c-language/extern-storage-class-specifier.md)<br/>
 [Behavior of Identifiers in C](../c-language/behavior-of-identifiers.md)<br/>
 [Linkage in C](../c-language/linkage.md)
diff --git a/docs/cpp/function-call-operator-parens.md b/docs/cpp/function-call-operator-parens.md
@@ -161,7 +161,7 @@ int main() {
 }
 ```
 
-Functions can be called recursively. For more information about function declarations, see [Functions](functions-cpp.md). Related material is in [Program and Linkage](../cpp/program-and-linkage-cpp.md).
+Functions can be called recursively. For more information about function declarations, see [Functions](functions-cpp.md). Related material is in [Translation units and linkage](../cpp/program-and-linkage-cpp.md).
 
 ## See also
 
diff --git a/docs/cpp/functions-cpp.md b/docs/cpp/functions-cpp.md
@@ -80,7 +80,7 @@ Optional parts of a function declaration are:
 
     ```
 
-   For more information, see [Program and Linkage](../cpp/program-and-linkage-cpp.md).
+   For more information, see [Translation units and linkage](../cpp/program-and-linkage-cpp.md).
 
 1. **inline**, which instructs the compiler to replace every call to the function with the function code itself. inlining can help performance in scenarios where a function executes quickly and is invoked repeatedly in a performance-critical section of code.
 
diff --git a/docs/cpp/lexical-conventions.md b/docs/cpp/lexical-conventions.md
@@ -31,4 +31,4 @@ This section introduces the fundamental elements of a C++ program. You use these
 ## See also
 
 [C++ Language Reference](../cpp/cpp-language-reference.md)<br/>
-[Program and linkage](program-and-linkage-cpp.md)
+[Translation units and linkage](program-and-linkage-cpp.md)
diff --git a/docs/cpp/program-and-linkage-cpp.md b/docs/cpp/program-and-linkage-cpp.md
@@ -1,24 +1,29 @@
 ---
-title: "Programs and Linkage  (C++)"
-ms.date: "04/09/2018"
+title: "Translation units and linkage (C++)"
+ms.date: "12/11/2019"
 ms.assetid: a6493ba0-24e2-4c89-956e-9da1dea660cb
 ---
-# Program and Linkage (C++)
+# Translation units and Linkage
 
-In a C++ program, a *symbol*, for example a variable or function name, can be declared any number of times within its scope, but it can only be defined once. This is the One Definition Rule (ODR). A *declaration* introduces (or re-introduces) a name into the program. A *definition* introduces a name and, in the case of a variable, explicitly initializes it. A *function definition* consists of the signature plus the function body.
+In a C++ program, a *symbol*, for example a variable or function name, can be declared any number of times within its scope, but it can only be defined once. This is the One Definition Rule (ODR). A *declaration* introduces (or re-introduces) a name into the program. A *definition* introduces a name and, in the case of a variable, explicitly initializes it. A *function definition* consists of the signature plus the function body. A class definition consists of the class name followed by a block that lists all the class members. (The bodies of member functions may optionally be defined separately in another file.)
 
 These are declarations:
 
 ```cpp
 int i;
 int f(int x);
+class C;
 ```
 
 These are definitions:
 
 ```cpp
 int i{42};
 int f(int x){ return x * i; }
+class C {
+public:
+   void DoSomething();
+};
 ```
 
 A program consists of one or more *translation units*. A translation unit consists of an implementation file (.cpp, .cxx, etc.) and all the headers (.h, .hpp, etc.) that it includes directly or indirectly. Each translation unit is compiled independently by the compiler, after which the linker merges the compiled translation units into a single *program*. Violations of the ODR rule typically show up as linker errors when the same name has two different definitions in different translation units.
diff --git a/docs/toc.yml b/docs/toc.yml
@@ -3727,13 +3727,8 @@
                   href: cpp/scope-visual-cpp.md
                 - name: Header files
                   href: cpp/header-files-cpp.md
-                - name: Program and linkage
-                  expanded: false
-                  items: 
-                    - name: Program and linkage
-                      href: cpp/program-and-linkage-cpp.md
-                    - name: extern
-                      href: cpp/using-extern-to-specify-linkage.md
+                - name: Translation units and linkage
+                  href: cpp/program-and-linkage-cpp.md
                 - name: Startup and termination
                   expanded: false
                   items: 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ int main() {`
`161`	`161`	`}`
`162`	`162`	```
`163`	`163`
`164`		`-Functions can be called recursively. For more information about function declarations, see [Functions](functions-cpp.md). Related material is in [Program and Linkage](../cpp/program-and-linkage-cpp.md).`
	`164`	`+Functions can be called recursively. For more information about function declarations, see [Functions](functions-cpp.md). Related material is in [Translation units and linkage](../cpp/program-and-linkage-cpp.md).`
`165`	`165`
`166`	`166`	`## See also`
`167`	`167`