Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master) (MicrosoftDocs#508)

openpublishbuild · Colin Robertson · commit 0b885b22c181 · 2018-01-08T17:41:31.000-08:00
* Update cricheditctrl-class.md

LineLength is a wrapper of EM_LINELENGTH, which returns length in characters not bytes.

* Update csettingsstore-class.md

contraction between the meaning of bAdmin in the parameters and remarks section of CSettingsStore::CSettingsStore

* Update clistbox-class_23.cpp

the buffer required by later code would be 16 bytes in ANSI and 32 bytes in Unicode, preallocating 10 bytes is useless.

* Fix unwind opcode values

* Update algorithm.md

Fix minor typo in Remarks section

* Undesired indentation in CFile.

Fix for undesired indentation in CFile constructor documentation.

* Update cricheditctrl-class.md

clarify that length is in TCHARs, add situations when index is out of bound, and when there's a carriage return based on EM_LINELENGTH docs
diff --git a/docs/mfc/codesnippet/CPP/clistbox-class_23.cpp b/docs/mfc/codesnippet/CPP/clistbox-class_23.cpp
@@ -1,6 +1,6 @@
    // Initialize the storage of the list box to be 256 strings with
    // about 10 characters per string, performance improvement.
-   int n = m_myListBox.InitStorage(256, 10);
+   int n = m_myListBox.InitStorage(256, 16*sizeof(TCHAR));
    ASSERT(n != LB_ERRSPACE);
 
    // Add 256 items to the list box.
@@ -9,4 +9,4 @@
    {
       str.Format(_T("item string %d"), i);
       m_myListBox.AddString( str );
-   }
+   }
diff --git a/docs/mfc/reference/cfile-class.md b/docs/mfc/reference/cfile-class.md
@@ -123,7 +123,7 @@ virtual void Abort();
 ```  
 CFile();  
 CFile(CAtlTransactionManager* pTM);  
-  CFile(HANDLE hFile);
+CFile(HANDLE hFile);
 
  
 CFile(
diff --git a/docs/mfc/reference/cricheditctrl-class.md b/docs/mfc/reference/cricheditctrl-class.md
@@ -1058,7 +1058,7 @@ int LineLength(int nLine = -1) const;
  Specifies the character index of a character in the line whose length is to be retrieved. If this parameter is -1, the length of the current line (the line that contains the caret) is returned, not including the length of any selected text within the line. When `LineLength` is called for a single-line edit control, this parameter is ignored.  
   
 ### Return Value  
- When `LineLength` is called for a multiple-line edit control, the return value is the length (in bytes) of the line specified by `nLine`. When `LineLength` is called for a single-line edit control, the return value is the length (in bytes) of the text in the edit control.  
+ When `LineLength` is called for a multiple-line edit control, the return value is the length (in `TCHAR`) of the line specified by `nLine`.  It does not include the carriage-return character at the end of the line. When `LineLength` is called for a single-line edit control, the return value is the length (in `TCHAR`) of the text in the edit control. If nLine is greater than the number of characters in the control, the return value is zero.
   
 ### Remarks  
  Use the [LineIndex](#lineindex) member function to retrieve a character index for a given line number within this `CRichEditCtrl` object.  
diff --git a/docs/mfc/reference/csettingsstore-class.md b/docs/mfc/reference/csettingsstore-class.md
@@ -106,7 +106,7 @@ CSettingsStore(
  Boolean parameter that specifies whether the `CSettingsStore` object is created in read-only mode.  
   
 ### Remarks  
- If `bAdmin` is set to `false`, the `m_hKey` member variable is set to `HKEY_LOCAL_MACHINE`. If you set `bAdmin` to `true`, `m_hKey` is set to `HKEY_CURRENT_USER`.  
+ If `bAdmin` is set to `true`, the `m_hKey` member variable is set to `HKEY_LOCAL_MACHINE`. If you set `bAdmin` to `false`, `m_hKey` is set to `HKEY_CURRENT_USER`.  
   
  The security access depends on the `bReadOnly` parameter. If `bReadonly` is `false`, the security access will be set to `KEY_ALL_ACCESS`. If `bReadyOnly` is `true`, the security access will be set to a combination of `KEY_QUERY_VALUE, KEY_NOTIFY` and `KEY_ENUMERATE_SUB_KEYS`. For more information about security access together with the registry, see [Registry Key Security and Access Rights](http://msdn.microsoft.com/library/windows/desktop/ms724878).  
   
diff --git a/docs/standard-library/algorithm.md b/docs/standard-library/algorithm.md
@@ -37,7 +37,7 @@ Defines C++ Standard Library container template functions that perform algorithm
   
 -   The _copy suffix indicates that the algorithm not only manipulates the values of the elements but also copies the modified values into a destination range. The `reverse` algorithm reverses the order of the elements within a range, and the `reverse_copy` algorithm also copies the result into a destination range.  
   
- C++ Standard Library algorithms are often classified into groups that indicate something about their purpose or requirements. These include modifying algorithms that change the value of elements as compared with non-modifying algorithms that do not. Mutating algorithms change the order of elements, but not the values of their elements. Removing algorithms can eliminate elements from a range or a copy of a range. Sorting algorithms reorder the elements in a range in various ways and sorted range algorithms only act on algorithms whose elements have been sorted in a particular way.  
+ C++ Standard Library algorithms are often classified into groups that indicate something about their purpose or requirements. These include modifying algorithms that change the value of elements as compared with non-modifying algorithms that do not. Mutating algorithms change the order of elements, but not the values of their elements. Removing algorithms can eliminate elements from a range or a copy of a range. Sorting algorithms reorder the elements in a range in various ways and sorted range algorithms only act on ranges whose elements have been sorted in a particular way.  
   
  The C++ Standard Library numeric algorithms that are provided for numerical processing have their own header file [\<numeric>](../standard-library/numeric.md), and function objects and adaptors are defined in the header [\<functional>](../standard-library/functional.md) Function objects that return Boolean values are known as predicates. The default binary predicate is the comparison `operator<`. In general, the elements being ordered need to be less than comparable so that, given any two elements, it can be determined either that they are equivalent (in the sense that neither is less than the other) or that one is less than the other. This results in an ordering among the nonequivalent elements.  
   
