Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/Atom10ItemFormatter.cs

@@ -64,8 +64,8 @@ namespace System.ServiceModel.Syndication
 		{
 		}
 
-		public Atom10ItemFormatter (SyndicationItem feedToWrite)
-			: base (feedToWrite)
+		public Atom10ItemFormatter (SyndicationItem itemToWrite)
+			: base (itemToWrite)
 		{
 		}
 

mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationContent.cs

@@ -75,9 +75,9 @@ namespace System.ServiceModel.Syndication
 			return new XmlSyndicationContent (null, xmlSerializerObject, serializer);
 		}
 
-		public static XmlSyndicationContent CreateXmlContent (XmlReader reader)
+		public static XmlSyndicationContent CreateXmlContent (XmlReader xmlReader)
 		{
-			return new XmlSyndicationContent (reader);
+			return new XmlSyndicationContent (xmlReader);
 		}
 
 		#endregion

mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/SyndicationItem.cs

@@ -62,24 +62,24 @@ namespace System.ServiceModel.Syndication
 		{
 		}
 
-		public SyndicationItem (string title, string content, Uri feedAlternateLink)
-			: this (title, content, feedAlternateLink, null, default (DateTimeOffset))
+		public SyndicationItem (string title, string content, Uri itemAlternateLink)
+			: this (title, content, itemAlternateLink, null, default (DateTimeOffset))
 		{
 		}
 
-		public SyndicationItem (string title, string content, Uri feedAlternateLink, string id,
+		public SyndicationItem (string title, string content, Uri itemAlternateLink, string id,
 					DateTimeOffset lastUpdatedTime)
-			: this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, feedAlternateLink, id, lastUpdatedTime)
+			: this (title, content != null ? SyndicationContent.CreatePlaintextContent (content) : null, itemAlternateLink, id, lastUpdatedTime)
 		{
 		}
 
-		public SyndicationItem (string title, SyndicationContent content, Uri feedAlternateLink, string id,
+		public SyndicationItem (string title, SyndicationContent content, Uri itemAlternateLink, string id,
 					DateTimeOffset lastUpdatedTime)
 		{
 			Title = title != null ? new TextSyndicationContent (title) : null;
 			Content = content;
-			if (feedAlternateLink != null)
-				AddPermalink (feedAlternateLink);
+			if (itemAlternateLink != null)
+				AddPermalink (itemAlternateLink);
 			Id = id;
 			LastUpdatedTime = lastUpdatedTime;
 		}
@@ -210,11 +210,11 @@ namespace System.ServiceModel.Syndication
 			set { title = value; }
 		}
 
-		public void AddPermalink (Uri link)
+		public void AddPermalink (Uri permalink)
 		{
-			if (link == null)
-				throw new ArgumentNullException ("link");
-			Links.Add (SyndicationLink.CreateAlternateLink (link));
+			if (permalink == null)
+				throw new ArgumentNullException ("permalink");
+			Links.Add (SyndicationLink.CreateAlternateLink (permalink));
 		}
 
 		public virtual SyndicationItem Clone ()

mcs/class/System.ServiceModel.Web/System.ServiceModel.Syndication/XmlSyndicationContent.cs

@@ -119,9 +119,9 @@ namespace System.ServiceModel.Syndication
 			return extension.GetObject<TContent> ();
 		}
 
-		public TContent ReadContent<TContent> (XmlObjectSerializer serializer)
+		public TContent ReadContent<TContent> (XmlObjectSerializer dataContractSerializer)
 		{
-			return extension.GetObject<TContent> (serializer);
+			return extension.GetObject<TContent> (dataContractSerializer);
 		}
 
 		public TContent ReadContent<TContent> (XmlSerializer serializer)

mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebChannelFactory.cs

@@ -56,13 +56,13 @@ namespace System.ServiceModel.Web
 		}
 #endif
 
-		public WebChannelFactory(Type serviceType)
-			: base (serviceType)
+		public WebChannelFactory(Type channelType)
+			: base (channelType)
 		{
 		}
 
-		public WebChannelFactory (string configurationName)
-			: base (configurationName)
+		public WebChannelFactory (string endpointConfigurationName)
+			: base (endpointConfigurationName)
 		{
 		}
 

mcs/class/System.ServiceModel.Web/System.ServiceModel.Web/WebOperationContext.cs

@@ -68,15 +68,15 @@ namespace System.ServiceModel.Web
 		OutgoingWebRequestContext outgoing_request;
 		OutgoingWebResponseContext outgoing_response;
 
-		public WebOperationContext (OperationContext operation)
+		public WebOperationContext (OperationContext operationContext)
 		{
-			if (operation == null)
-				throw new ArgumentNullException ("operation");
+			if (operationContext == null)
+				throw new ArgumentNullException ("operationContext");
 
 			outgoing_request = new OutgoingWebRequestContext ();
-			incoming_response = new IncomingWebResponseContext (operation);
+			incoming_response = new IncomingWebResponseContext (operationContext);
 #if !MOBILE
-			incoming_request = new IncomingWebRequestContext (operation);
+			incoming_request = new IncomingWebRequestContext (operationContext);
 			outgoing_response = new OutgoingWebResponseContext ();
 #endif
 		}
@@ -101,12 +101,12 @@ namespace System.ServiceModel.Web
 		}
 #endif
 
-		public void Attach (OperationContext context)
+		public void Attach (OperationContext owner)
 		{
 			// do nothing
 		}
 
-		public void Detach (OperationContext context)
+		public void Detach (OperationContext owner)
 		{
 			// do nothing
 		}

mcs/class/System.ServiceModel.Web/System.ServiceModel/WebHttpBinding.cs

@@ -45,9 +45,9 @@ namespace System.ServiceModel
 		{
 		}
 
-		public WebHttpBinding (WebHttpSecurityMode mode)
+		public WebHttpBinding (WebHttpSecurityMode securityMode)
 		{
-			Initialize (mode);
+			Initialize (securityMode);
 		}
 
 		public WebHttpBinding (string configurationName)

mcs/class/System.ServiceModel.Web/System/UriTemplateMatchException.cs

@@ -35,8 +35,8 @@ namespace System
 	public class UriTemplateMatchException : SystemException
 	{
 		public UriTemplateMatchException () : base () {}
-		public UriTemplateMatchException (string msg) : base (msg) {}
-		public UriTemplateMatchException (string msg, Exception inner) : base (msg, inner) {}
+		public UriTemplateMatchException (string message) : base (message) {}
+		public UriTemplateMatchException (string message, Exception innerException) : base (message, innerException) {}
 		protected UriTemplateMatchException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 	}