Loc fixes per ja-jp 264, consolidation and style fixes (#3390)

* Loc issues raised in ja-jp-264

* consistency check

* More tweaks after review

Author: Colin Robertson

.openpublishing.redirection.json

@@ -865,6 +865,16 @@
       "redirect_url": "/cpp/cpp/attributes",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/cpp/bstr-t-member-functions.md",
+      "redirect_url": "/cpp/cpp/bstr-t-class",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/bstr-t-operators.md",
+      "redirect_url": "/cpp/cpp/bstr-t-class",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/cpp/character-sets2.md",
       "redirect_url": "/cpp/cpp/character-sets",

docs/cpp/bstr-t-assign.md

@@ -1,12 +1,11 @@
 ---
 description: "Learn more about: _bstr_t::Assign"
 title: "_bstr_t::Assign"
-ms.date: "11/04/2016"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t::Assign"]
 helpviewer_keywords: ["Assign method [C++]"]
-ms.assetid: 2e209bbe-77ca-4598-86d5-6c2ea213f43c
 ---
-# _bstr_t::Assign
+# _`bstr_t::Assign`
 
 **Microsoft Specific**
 
@@ -20,14 +19,14 @@ void Assign(
 );
 ```
 
-#### Parameters
+### Parameters
 
-*s*<br/>
+*`s`*\
 A `BSTR` to be copied into the `BSTR` wrapped by a `_bstr_t`.
 
 ## Remarks
 
-**Assign** does a binary copy, which means the entire length of the `BSTR` is copied, regardless of content.
+**`Assign`** does a binary copy of the entire length of the `BSTR`, whatever the content.
 
 ## Example
 
@@ -106,4 +105,4 @@ bstrWrapper2 = some text
 
 ## See also
 
-[_bstr_t Class](../cpp/bstr-t-class.md)
+[`_bstr_t` class](../cpp/bstr-t-class.md)

docs/cpp/bstr-t-attach.md

@@ -1,12 +1,11 @@
 ---
 description: "Learn more about: _bstr_t::Attach"
 title: "_bstr_t::Attach"
-ms.date: "11/04/2016"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t::Attach"]
 helpviewer_keywords: ["Attach method [C++]"]
-ms.assetid: 8cad867e-40fc-435b-841f-0d412c2f58d3
 ---
-# _bstr_t::Attach
+# `_bstr_t::Attach`
 
 **Microsoft Specific**
 
@@ -20,9 +19,9 @@ void Attach(
 );
 ```
 
-#### Parameters
+### Parameters
 
-*s*<br/>
+*`s`*\
 A `BSTR` to be associated with, or assigned to, the `_bstr_t` variable.
 
 ## Remarks
@@ -31,10 +30,10 @@ If the `_bstr_t` was previously attached to another `BSTR`, the `_bstr_t` will c
 
 ## Example
 
-See [_bstr_t::Assign](../cpp/bstr-t-assign.md) for an example using **Attach**.
+See [`_bstr_t::Assign`](../cpp/bstr-t-assign.md) for an example using **`Attach`**.
 
 **END Microsoft Specific**
 
 ## See also
 
-[_bstr_t Class](../cpp/bstr-t-class.md)
+[`_bstr_t` Class](../cpp/bstr-t-class.md)

docs/cpp/bstr-t-bstr-t.md

@@ -1,20 +1,19 @@
 ---
 description: "Learn more about: _bstr_t::_bstr_t"
 title: "_bstr_t::_bstr_t"
-ms.date: "11/04/2016"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t::_bstr_t"]
 helpviewer_keywords: ["BSTR object", "_bstr_t method [C++]", "_bstr_t class"]
-ms.assetid: 116d994e-5a72-4351-afbe-866c80b4c165
 ---
-# _bstr_t::_bstr_t
+# `_bstr_t::_bstr_t`
 
 **Microsoft Specific**
 
 Constructs a `_bstr_t` object.
 
 ## Syntax
 
-```
+```cpp
 _bstr_t( ) throw( );
 _bstr_t(
    const _bstr_t& s1
@@ -34,42 +33,51 @@ _bstr_t(
 );
 ```
 
-#### Parameters
+### Parameters
 
-*s1*<br/>
+*`s1`*\
 A `_bstr_t` object to be copied.
 
-*s2*<br/>
+*`s2`*\
 A multibyte string.
 
-*s3*<br/>
+*`s3`*\
 A Unicode string
 
-*var*<br/>
+*`var`*\
 A [_variant_t](../cpp/variant-t-class.md) object.
 
-*bstr*<br/>
+*`bstr`*\
 An existing `BSTR` object.
 
-*fCopy*<br/>
-If **`false`**, the *bstr* argument is attached to the new object without making a copy by calling `SysAllocString`.
+*`fCopy`*\
+If **`false`**, the *`bstr`* argument is attached to the new object without making a copy by calling `SysAllocString`.
 
 ## Remarks
 
-The following table describes the `_bstr_t` constructors.
+The `_bstr_t` class supplies several constructors:
+
+`_bstr_t( )`\
+Constructs a default `_bstr_t` object that encapsulates a null `BSTR` object.
+
+`_bstr_t( _bstr_t& s1 )`\
+Constructs a `_bstr_t` object as a copy of another. This constructor makes a *shallow* copy, which increments the reference count of the encapsulated `BSTR` object instead of creating a new one.
+
+`_bstr_t( char* s2 )`\
+Constructs a `_bstr_t` object by calling `SysAllocString` to create a new `BSTR` object and then encapsulates it. This constructor first performs a multibyte to Unicode conversion.
+
+`_bstr_t( wchar_t* s3 )`\
+Constructs a `_bstr_t` object by calling `SysAllocString` to create a new `BSTR` object and then encapsulates it.
+
+`_bstr_t( _variant_t& var )`\
+Constructs a `_bstr_t` object from a `_variant_t` object by first retrieving a `BSTR` object from the encapsulated `VARIANT` object.
 
-|Constructor|Description|
-|-----------------|-----------------|
-|`_bstr_t( )`|Constructs a default `_bstr_t` object that encapsulates a null `BSTR` object.|
-|`_bstr_t( _bstr_t&`  `s1`  `)`|Constructs a `_bstr_t` object as a copy of another.<br /><br /> This is a *shallow* copy, which increments the reference count of the encapsulated `BSTR` object instead of creating a new one.|
-|`_bstr_t( char*`  `s2`  `)`|Constructs a `_bstr_t` object by calling `SysAllocString` to create a new `BSTR` object and then encapsulates it.<br /><br /> This constructor first performs a multibyte to Unicode conversion.|
-|`_bstr_t( wchar_t*`  `s3`  `)`|Constructs a `_bstr_t` object by calling `SysAllocString` to create a new `BSTR` object and then encapsulates it.|
-|`_bstr_t( _variant_t&`  `var`  `)`|Constructs a `_bstr_t` object from a `_variant_t` object by first retrieving a `BSTR` object from the encapsulated VARIANT object.|
-|`_bstr_t( BSTR`  `bstr` `, bool`  `fCopy`  `)`|Constructs a `_bstr_t` object from an existing `BSTR` (as opposed to a `wchar_t*` string). If *fCopy* is false, the supplied `BSTR` is attached to the new object without making a new copy with `SysAllocString`.<br /><br /> This constructor is used by wrapper functions in the type library headers to encapsulate and take ownership of a `BSTR` that is returned by an interface method.|
+`_bstr_t( BSTR bstr, bool fCopy )`\
+Constructs a `_bstr_t` object from an existing `BSTR` (as opposed to a `wchar_t*` string). If *`fCopy`* is **`false`**, the supplied `BSTR` is attached to the new object without making a new copy by using `SysAllocString`. This constructor is used by wrapper functions in the type library headers to encapsulate and take ownership of a `BSTR` that's returned by an interface method.
 
 **END Microsoft Specific**
 
 ## See also
 
-[_bstr_t Class](../cpp/bstr-t-class.md)<br/>
-[_variant_t Class](../cpp/variant-t-class.md)
+[`_bstr_t` class](../cpp/bstr-t-class.md)\
+[`_variant_t` class](../cpp/variant-t-class.md)

docs/cpp/bstr-t-class.md

@@ -1,54 +1,55 @@
 ---
-description: "Learn more about: _bstr_t Class"
-title: "_bstr_t Class"
-ms.date: "11/04/2016"
+title: "_bstr_t class"
+description: "Learn more about: _bstr_t class"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t"]
 helpviewer_keywords: ["BSTR object", "_bstr_t class", "BSTR object [C++], COM encapsulation"]
-ms.assetid: 58841fef-fe21-4a84-aab9-780262b5201f
 ---
-# _bstr_t Class
+# `_bstr_t` class
 
 **Microsoft Specific**
 
-A `_bstr_t` object encapsulates the [BSTR data type](/previous-versions/windows/desktop/automat/bstr). The class manages resource allocation and deallocation through function calls to `SysAllocString` and `SysFreeString` and other `BSTR` APIs when appropriate. The **_bstr_t** class uses reference counting to avoid excessive overhead.
+A `_bstr_t` object encapsulates the [BSTR data type](/previous-versions/windows/desktop/automat/bstr). The class manages resource allocation and deallocation through function calls to [`SysAllocString`](/windows/win32/api/oleauto/nf-oleauto-sysallocstring) and [`SysFreeString`](/windows/win32/api/oleauto/nf-oleauto-sysfreestring) and other `BSTR` APIs when appropriate. The `_bstr_t` class uses reference counting to avoid excessive overhead.
+
+## Members
 
 ### Construction
 
 | Constructor | Description |
 |--|--|
-| [_bstr_t](../cpp/bstr-t-bstr-t.md) | Constructs a `_bstr_t` object. |
+| [`_bstr_t`](../cpp/bstr-t-bstr-t.md) | Constructs a `_bstr_t` object. |
 
 ### Operations
 
 | Function | Description |
 |--|--|
-| [Assign](../cpp/bstr-t-assign.md) | Copies a `BSTR` into the `BSTR` wrapped by a `_bstr_t`. |
-| [Attach](../cpp/bstr-t-attach.md) | Links a `_bstr_t` wrapper to a `BSTR`. |
-| [copy](../cpp/bstr-t-copy.md) | Constructs a copy of the encapsulated `BSTR`. |
-| [Detach](../cpp/bstr-t-detach.md) | Returns the `BSTR` wrapped by a `_bstr_t` and detaches the `BSTR` from the `_bstr_t`. |
-| [GetAddress](../cpp/bstr-t-getaddress.md) | Points to the `BSTR` wrapped by a `_bstr_t`. |
-| [GetBSTR](../cpp/bstr-t-getbstr.md) | Points to the beginning of the `BSTR` wrapped by the `_bstr_t`. |
-| [length](../cpp/bstr-t-length.md) | Returns the number of characters in the `_bstr_t`. |
+| [`Assign`](../cpp/bstr-t-assign.md) | Copies a `BSTR` into the `BSTR` wrapped by a `_bstr_t`. |
+| [`Attach`](../cpp/bstr-t-attach.md) | Links a `_bstr_t` wrapper to a `BSTR`. |
+| [`copy`](../cpp/bstr-t-copy.md) | Constructs a copy of the encapsulated `BSTR`. |
+| [`Detach`](../cpp/bstr-t-detach.md) | Returns the `BSTR` wrapped by a `_bstr_t` and detaches the `BSTR` from the `_bstr_t`. |
+| [`GetAddress`](../cpp/bstr-t-getaddress.md) | Points to the `BSTR` wrapped by a `_bstr_t`. |
+| [`GetBSTR`](../cpp/bstr-t-getbstr.md) | Points to the beginning of the `BSTR` wrapped by the `_bstr_t`. |
+| [`length`](../cpp/bstr-t-length.md) | Returns the number of characters in the `_bstr_t`. |
 
 ### Operators
 
 | Operator | Description |
 |--|--|
-| [operator =](../cpp/bstr-t-operator-equal.md) | Assigns a new value to an existing `_bstr_t` object. |
-| [operator +=](../cpp/bstr-t-operator-add-equal-plus.md) | Appends characters to the end of the `_bstr_t` object. |
-| [operator +](../cpp/bstr-t-operator-add-equal-plus.md) | Concatenates two strings. |
-| [operator !](../cpp/bstr-t-operator-logical-not.md) | Checks if the encapsulated `BSTR` is a NULL string. |
-| [operator ==, !=, \<, >, \<=, >=](../cpp/bstr-t-relational-operators.md) | Compares two `_bstr_t` objects. |
-| [operator wchar_t* &#124; char\*](../cpp/bstr-t-wchar-t-star-bstr-t-char-star.md) | Extract the pointers to the encapsulated Unicode or multibyte `BSTR` object. |
+| [`operator =`](../cpp/bstr-t-operator-equal.md) | Assigns a new value to an existing `_bstr_t` object. |
+| [`operator +=`](../cpp/bstr-t-operator-add-equal-plus.md) | Appends characters to the end of the `_bstr_t` object. |
+| [`operator +`](../cpp/bstr-t-operator-add-equal-plus.md) | Concatenates two strings. |
+| [`operator !`](../cpp/bstr-t-operator-logical-not.md) | Checks if the encapsulated `BSTR` is a NULL string. |
+| [`operator ==`](../cpp/bstr-t-relational-operators.md)<br/>[`operator !=`](../cpp/bstr-t-relational-operators.md)<br/>[`operator <`](../cpp/bstr-t-relational-operators.md)<br/>[`operator >`](../cpp/bstr-t-relational-operators.md)<br/>[`operator <=`](../cpp/bstr-t-relational-operators.md)<br/>[`operator >=`](../cpp/bstr-t-relational-operators.md) | Compares two `_bstr_t` objects. |
+| [`operator wchar_t*`](../cpp/bstr-t-wchar-t-star-bstr-t-char-star.md)<br/>[`operator char*`](../cpp/bstr-t-wchar-t-star-bstr-t-char-star.md)  | Extract the pointers to the encapsulated Unicode or multibyte `BSTR` object. |
 
 **END Microsoft Specific**
 
 ## Requirements
 
 **Header:** \<comutil.h>
 
-**Lib:** comsuppw.lib or comsuppwd.lib (see [/Zc:wchar_t (wchar_t Is Native Type)](../build/reference/zc-wchar-t-wchar-t-is-native-type.md) for more information)
+**Lib:** *`comsuppw.lib`* or *`comsuppwd.lib`* (For more information, see [`/Zc:wchar_t` (wchar_t is native type)](../build/reference/zc-wchar-t-wchar-t-is-native-type.md))
 
 ## See also
 
-[Compiler COM Support Classes](../cpp/compiler-com-support-classes.md)
+[Compiler COM support classes](../cpp/compiler-com-support-classes.md)

docs/cpp/bstr-t-copy.md

@@ -1,31 +1,30 @@
 ---
 description: "Learn more about: _bstr_t::copy"
 title: "_bstr_t::copy"
-ms.date: "11/04/2016"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t::copy"]
 helpviewer_keywords: ["Copy method [C++]", "BSTR object [C++], copy"]
-ms.assetid: 00ba7311-e82e-4a79-8106-5329fa2f869a
 ---
-# _bstr_t::copy
+# `_bstr_t::copy`
 
 **Microsoft Specific**
 
 Constructs a copy of the encapsulated `BSTR`.
 
 ## Syntax
 
-```
+```cpp
 BSTR copy( bool fCopy = true ) const;
 ```
 
-#### Parameters
+### Parameters
 
-*fCopy*<br/>
-If **`true`**, **copy** returns a copy of the contained `BSTR`, otherwise **copy** returns the actual BSTR.
+*`fCopy`*\
+If **`true`**, **`copy`** returns a copy of the contained `BSTR`, otherwise **`copy`** returns the actual `BSTR`.
 
 ## Remarks
 
-Returns a newly allocated copy of the encapsulated `BSTR` object.
+Returns a newly allocated copy of the encapsulated `BSTR` object, or the encapsulated object itself, depending on the parameter.
 
 ## Example
 
@@ -39,4 +38,4 @@ STDMETHODIMP CAlertMsg::get_ConnectionStr(BSTR *pVal){ //  m_bsConStr is _bstr_t
 
 ## See also
 
-[_bstr_t Class](../cpp/bstr-t-class.md)
+[`_bstr_t` class](../cpp/bstr-t-class.md)

docs/cpp/bstr-t-detach.md

@@ -1,33 +1,32 @@
 ---
 description: "Learn more about: _bstr_t::Detach"
 title: "_bstr_t::Detach"
-ms.date: "11/04/2016"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t::Detach"]
 helpviewer_keywords: ["Detach method [C++]"]
-ms.assetid: cc8284bd-f68b-4fff-b2e6-ce8354dabf8b
 ---
-# _bstr_t::Detach
+# `_bstr_t::Detach`
 
 **Microsoft Specific**
 
 Returns the `BSTR` wrapped by a `_bstr_t` and detaches the `BSTR` from the `_bstr_t`.
 
 ## Syntax
 
-```
+```cpp
 BSTR Detach( ) throw;
 ```
 
 ## Return Value
 
-The `BSTR` wrapped by the `_bstr_t`.
+Returns the `BSTR` encapsulated by the `_bstr_t`.
 
 ## Example
 
-See [_bstr_t::Assign](../cpp/bstr-t-assign.md) for a example using **Detach**.
+See [`_bstr_t::Assign`](../cpp/bstr-t-assign.md) for an example that uses **`Detach`**.
 
 **END Microsoft Specific**
 
 ## See also
 
-[_bstr_t Class](../cpp/bstr-t-class.md)
+[`_bstr_t` class](../cpp/bstr-t-class.md)

docs/cpp/bstr-t-getaddress.md

@@ -1,20 +1,19 @@
 ---
 description: "Learn more about: _bstr_t::GetAddress"
 title: "_bstr_t::GetAddress"
-ms.date: "11/04/2016"
+ms.date: 02/02/2021
 f1_keywords: ["_bstr_t::GetAddress"]
 helpviewer_keywords: ["GetAddress method [C++]"]
-ms.assetid: 09bc9180-867e-4ee5-b22a-8339dc663142
 ---
-# _bstr_t::GetAddress
+# `_bstr_t::GetAddress`
 
 **Microsoft Specific**
 
 Frees any existing string and returns the address of a newly allocated string.
 
 ## Syntax
 
-```
+```cpp
 BSTR* GetAddress( );
 ```
 
@@ -24,14 +23,14 @@ A pointer to the `BSTR` wrapped by the `_bstr_t`.
 
 ## Remarks
 
-**GetAddress** affects all `_bstr_t` objects that share a `BSTR`. More than one `_bstr_t` can share a `BSTR` through the use of the copy constructor and **operator=**.
+**`GetAddress`** affects all `_bstr_t` objects that share a `BSTR`. More than one `_bstr_t` can share a `BSTR` through the use of the copy constructor and **`operator=`**.
 
 ## Example
 
-See [_bstr_t::Assign](../cpp/bstr-t-assign.md) for a example using **GetAddress**.
+See [`_bstr_t::Assign`](../cpp/bstr-t-assign.md) for an example that uses **`GetAddress`**.
 
 **END Microsoft Specific**
 
 ## See also
 
-[_bstr_t Class](../cpp/bstr-t-class.md)
+[`_bstr_t` class](../cpp/bstr-t-class.md)