Merge pull request #947 from dotnet/master

Update live with current master

Author: mairaw

snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.DataGridView.RowOperations/CS/rowoperations.cs

@@ -279,7 +279,7 @@ private Boolean IsTrackGood(DataGridViewCell cell)
     {
         Int32 cellValueAsInt;
         if (cell.Value.ToString().Length == 0)
-		{
+        {
             cell.ErrorText = "Please enter a track";
             songsDataGridView.Rows[cell.RowIndex].ErrorText = 
                 "Please enter a track";
@@ -305,7 +305,7 @@ private Boolean IsTrackGood(DataGridViewCell cell)
     private Boolean IsDateGood(DataGridViewCell cell) 
     {
         if (cell.Value == null)
-		{
+        {
             cell.ErrorText = "Missing date";
             songsDataGridView.Rows[cell.RowIndex].ErrorText = 
                 "Missing date";
@@ -347,4 +347,4 @@ private void RemoveAnnotations(Object sender,
     }
     //</snippet10>
     #endregion
-}
+}

snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.HtmlWindow/CS/Form1.cs

@@ -48,7 +48,7 @@ private void GetLinksFromFrames()
 					Hashtable docLinksHash = new Hashtable();
 					linksTable.Add(webBrowser1.Document.Url.ToString(), docLinksHash);
 
-                    foreach (HtmlElement hrefElement in webBrowser1.Document.Links)
+					foreach (HtmlElement hrefElement in webBrowser1.Document.Links)
 					{
 						docLinksHash.Add(hrefElement.GetAttribute("HREF"), "Url");
 					}

snippets/csharp/VS_Snippets_Winforms/System.Windows.Forms.ListView3/CS/form1.cs

@@ -69,7 +69,7 @@ private void InitializeComponent()
 	}
 
 	//<snippet1>
-   	private void ListView1_BeforeLabelEdit(object sender, 
+	private void ListView1_BeforeLabelEdit(object sender, 
 		System.Windows.Forms.LabelEditEventArgs e)
 	{
 		// Allow all but the first two items of the list to 

snippets/fsharp/azure/blob-storage.fsx

@@ -1,8 +1,8 @@
 open System
 open System.IO
 open Microsoft.Azure // Namespace for CloudConfigurationManager
-open Microsoft.WindowsAzure.Storage // Namespace for CloudStorageAccount
-open Microsoft.WindowsAzure.Storage.Blob // Namespace for Blob storage types
+open Microsoft.Azure.Storage // Namespace for CloudStorageAccount
+open Microsoft.Azure.Storage.Blob // Namespace for Blob storage types
 
 //
 // Get your connection string.

snippets/fsharp/azure/file-storage.fsx

@@ -1,8 +1,8 @@
 open System
 open System.IO
 open Microsoft.Azure // Namespace for CloudConfigurationManager
-open Microsoft.WindowsAzure.Storage // Namespace for CloudStorageAccount
-open Microsoft.WindowsAzure.Storage.File // Namespace for File storage types
+open Microsoft.Azure.Storage // Namespace for CloudStorageAccount
+open Microsoft.Azure.Storage.File // Namespace for File storage types
 
 //
 // Get your connection string.
@@ -123,8 +123,8 @@ destBlob.StartCopy(sasUri2)
 // Troubleshooting File storage using metrics.
 //
 
-open Microsoft.WindowsAzure.Storage.File.Protocol
-open Microsoft.WindowsAzure.Storage.Shared.Protocol
+open Microsoft.Azure.Storage.File.Protocol
+open Microsoft.Azure.Storage.Shared.Protocol
 
 let props =
     FileServiceProperties(

snippets/fsharp/azure/queue-storage.fsx

@@ -1,6 +1,6 @@
 open Microsoft.Azure // Namespace for CloudConfigurationManager 
-open Microsoft.WindowsAzure.Storage // Namespace for CloudStorageAccount
-open Microsoft.WindowsAzure.Storage.Queue // Namespace for Queue storage types
+open Microsoft.Azure.Storage // Namespace for CloudStorageAccount
+open Microsoft.Azure.Storage.Queue // Namespace for Queue storage types
 
 //
 // Get your connection string.

snippets/fsharp/azure/table-storage.fsx

@@ -1,8 +1,8 @@
 open System
 open System.IO
 open Microsoft.Azure // Namespace for CloudConfigurationManager
-open Microsoft.WindowsAzure.Storage // Namespace for CloudStorageAccount
-open Microsoft.WindowsAzure.Storage.Table // Namespace for Table storage types
+open Microsoft.Azure.Storage // Namespace for CloudStorageAccount
+open Microsoft.Azure.Storage.Table // Namespace for Table storage types
 
 //
 // Get your connection string.

snippets/fsharp/tour.fs

@@ -130,7 +130,7 @@ module BasicFunctions =
     let result3 = sampleFunction3 (6.5 + 4.5)
 
     // This line uses '%f' to print the result as a float.  As with '%d' above, this is type-safe.
-    printfn "The result of applying the 2nd sample function to (6.5 + 4.5) is %f" result3
+    printfn "The result of applying the 3rd sample function to (6.5 + 4.5) is %f" result3
 
 
 /// Booleans are fundamental data types in F#.  Here are some examples of Booleans and conditional logic.