Merge pull request #556 from dotnet/master

Update live with current master

Author: mairaw

snippets/csharp/VS_Snippets_CLR_System/system.io.directory.enumeratefiles/cs/program.cs

@@ -9,7 +9,11 @@ static void Main(string[] args)
     {
         try
         {
-            var files = from file in Directory.EnumerateFiles(@"c:\", "*.txt", SearchOption.AllDirectories)
+            // Set a variable to the My Documents path.
+            string docPath =
+            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+
+            var files = from file in Directory.EnumerateFiles(docPath, "*.txt", SearchOption.AllDirectories)
                         from line in File.ReadLines(file)
                         where line.Contains("Microsoft")
                         select new
@@ -22,7 +26,7 @@ where line.Contains("Microsoft")
             {
                 Console.WriteLine("{0}\t{1}", f.File, f.Line);
             }
-			Console.WriteLine("{0} files found.", files.Count().ToString());
+            Console.WriteLine("{0} files found.", files.Count().ToString());
         }
         catch (UnauthorizedAccessException UAEx)
         {
@@ -34,4 +38,4 @@ where line.Contains("Microsoft")
         }
     }
 }
-// </Snippet1>
+// </Snippet1>

snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumdirs/cs/program.cs

@@ -1,4 +1,5 @@
-using System;
+// <Snippet1>
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,23 +11,25 @@ class Program
     {
         static void Main(string[] args)
         {
-// <Snippet1>
-DirectoryInfo dirPrograms = new DirectoryInfo(@"c:\program files");
-DateTime StartOf2009 = new DateTime(2009, 01, 01);
+            // Set a variable to the My Documents path.
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
 
-var dirs = from dir in dirPrograms.EnumerateDirectories()
-            where dir.CreationTimeUtc < StartOf2009
-            select new
-            {
-                ProgDir = dir,
-            };
+            DirectoryInfo dirPrograms = new DirectoryInfo(docPath);
+            DateTime StartOf2009 = new DateTime(2009, 01, 01);
 
-foreach (var di in dirs)
-{
-    Console.WriteLine("{0}", di.ProgDir.Name);
-}
-// </Snippet1>
+            var dirs = from dir in dirPrograms.EnumerateDirectories()
+                where dir.CreationTimeUtc > StartOf2009
+                select new
+                {
+                    ProgDir = dir,
+                };
+
+            foreach (var di in dirs)
+            {
+                Console.WriteLine("{0}", di.ProgDir.Name);
+            }
 
         }
     }
 }
+// </Snippet1>

snippets/csharp/VS_Snippets_CLR_System/system.io.directoryinfo.enumeratedirectories/cs/program.cs

@@ -6,7 +6,11 @@ class Program
 {
     static void Main(string[] args)
     {
-        DirectoryInfo diTop = new DirectoryInfo(@"d:\");
+        // Set a variable to the My Documents path.
+        string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+
+        DirectoryInfo diTop = new DirectoryInfo(docPath);
+
         try
         {
             foreach (var fi in diTop.EnumerateFiles())
@@ -66,4 +70,3 @@ static void Main(string[] args)
     }
 }
 // </Snippet1>
-

snippets/csharp/VS_Snippets_CLR_System/system.io.enumdirs1/cs/program.cs

@@ -10,9 +10,10 @@ private static void Main(string[] args)
     {
         try
         {
-            string dirPath = @"\\archives\2009\reports";
+            // Set a variable to the My Documents path.
+            string docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
 
-            List<string> dirs = new List<string>(Directory.EnumerateDirectories(dirPath));
+            List<string> dirs = new List<string>(Directory.EnumerateDirectories(docPath));
 
             foreach (var dir in dirs)
             {

snippets/csharp/language-reference/keywords/in-ref-out-modifier/OutParameterModifier.cs

@@ -43,6 +43,12 @@ void Method(out int answer, out string message, out string stillNull)
             Console.WriteLine(argNumber);
             Console.WriteLine(argMessage);
             Console.WriteLine(argDefault == null);
+            
+            // The example displays the following output:
+            //      44
+            //      I've been returned
+            //      True
+            
             // </Snippet3>
         }
 

snippets/csharp/language-reference/keywords/in-ref-out-modifier/RefParameterModifier.cs

@@ -40,6 +40,16 @@ public Product(string name, int newID)
             public int ItemID { get; set; }
         }
 
+        private static void ChangeByReference(ref Product itemRef)
+        {
+            // Change the address that is stored in the itemRef parameter.   
+            itemRef = new Product("Stapler", 99999);
+
+            // You can change the value of one of the properties of
+            // itemRef. The change happens to item in Main as well.
+            itemRef.ItemID = 12345;
+        }
+
         private static void ModifyProductsByReference()
         {
             // Declare an instance of Product and display its initial values.
@@ -52,16 +62,11 @@ private static void ModifyProductsByReference()
             System.Console.WriteLine("Back in Main.  Name: {0}, ID: {1}\n",
                 item.ItemName, item.ItemID);
         }
-
-        private static void ChangeByReference(ref Product itemRef)
-        {
-            // Change the address that is stored in the itemRef parameter.   
-            itemRef = new Product("Stapler", 99999);
-
-            // You can change the value of one of the properties of
-            // itemRef. The change happens to item in Main as well.
-            itemRef.ItemID = 12345;
-        }
+        
+        // This method displays the following output:
+        // Original values in Main.  Name: Fasteners, ID: 54321
+        // Back in Main.  Name: Stapler, ID: 12345        
+        
         // </Snippet3>
 
         private static void BookCollectionExample()