Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/referencesource/System.Web.Mobile/UI/MobileControls/Design/AppliedDeviceFiltersDialog.cs

@@ -1115,7 +1115,7 @@ namespace System.Web.UI.Design.MobileControls
                 Debug.Assert(
                     (_choicePropertyFilter == null)
                     || (_runtimeChoice == _choicePropertyFilter.RuntimeChoice),
-                    "Local runtime choice object out of [....]."
+                    "Local runtime choice object out of sync."
                 );
                 return _runtimeChoice;
             }

mcs/class/referencesource/System.Web.Mobile/UI/MobileControls/Design/Util/GenericUI.cs

@@ -168,7 +168,7 @@ namespace System.Web.UI.Design.MobileControls.Util
         }
     }
 
-    // Copied from ndp\fx\src\Designer\[....]\System\[....]\Design\RTLAwareMessageBox.cs
+    // Copied from ndp\fx\src\Designer\Microsoft\System\Microsoft\Design\RTLAwareMessageBox.cs
     [Obsolete("The System.Web.Mobile.dll assembly has been deprecated and should no longer be used. For information about how to develop ASP.NET mobile applications, see http://go.microsoft.com/fwlink/?LinkId=157231.")]
     internal sealed class RTLAwareMessageBox {
 

mcs/class/referencesource/System.Web.Mobile/UI/MobileControls/Design/Util/MSHTMLHost.cs

@@ -6,7 +6,7 @@
 
 // MSHTMLHost.cs
 //
-// 12/17/98: Created: [....]
+// 12/17/98: Created: Microsoft
 //
 
 namespace System.Web.UI.Design.MobileControls.Util {
@@ -210,7 +210,7 @@ namespace System.Web.UI.Design.MobileControls.Util {
         }
 
         public virtual void OnUIDeactivate(int fUndoable) {
-            // NOTE, [....], 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
+            // NOTE, Microsoft, 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
             //    fixes trident hosting in Win2000.
         }
 
@@ -245,7 +245,7 @@ namespace System.Web.UI.Design.MobileControls.Util {
         }
 
         public virtual void SetActiveObject(NativeMethods.IOleInPlaceActiveObject pActiveObject, string pszObjName) {
-            // NOTE, [....], 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
+            // NOTE, Microsoft, 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
             //    fixes trident hosting in Win2000.
             // throw new COMException(String.Empty, NativeMethods.E_NOTIMPL);
         }

mcs/class/referencesource/System.Web.Mobile/UI/MobileControls/MobilePage.cs

@@ -1290,7 +1290,7 @@ namespace System.Web.UI.MobileControls
             }
         }
 
-        // NOTE: Make sure this stays in [....] with Page.PageRegisteredControlsThatRequirePostBackKey
+        // NOTE: Make sure this stays in sync with Page.PageRegisteredControlsThatRequirePostBackKey
         private const string PageRegisteredControlsThatRequirePostBackKey = "__ControlsRequirePostBackKey__";
         private bool CheckEmptyViewState(Object viewState)
         {
@@ -1441,7 +1441,7 @@ namespace System.Web.UI.MobileControls
 
         private byte[] GetMacKeyModifier()
         {
-            //NOTE:  duplicate of the version in objectstateformatter.cs, keep in [....]
+            //NOTE:  duplicate of the version in objectstateformatter.cs, keep in sync
 
             // Use the page's directory and class name as part of the key (ASURT 64044)
             // We need to make sure that the hash is case insensitive, since the file system

mcs/class/referencesource/System.Web.Mobile/UI/MobileControls/ObjectList.cs

@@ -948,7 +948,7 @@ namespace System.Web.UI.MobileControls
             if (IsTrackingViewState)
             {
                 _items = null;
-                // avoid view state being out of [....] with fields.
+                // avoid view state being out of sync with fields.
                 _ignoreFieldsItemsViewModeViewState = true;
                 if (fieldAddedOrRemoved)
                 {

mcs/class/referencesource/System.Web.Mobile/UI/MobileControls/SessionViewState.cs

@@ -27,7 +27,7 @@ namespace System.Web.UI.MobileControls
      * arise. The core issue behind most of these is how to handle the user 
      * clicking the Back button. When the user does this, there is no corresponding
      * notification to the server, and the client and server session state are thrown
-     * out of [....]. 
+     * out of sync. 
      *
      * This class attempts to alleviate this by storing a small history of view states
      * in session data.