Merge branch 'v3.2' into mono2origin/mono2

Conflicts:
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs

5 files changed, 5 insertions, 15 deletions

diff --git a/samples/OpenIdRelyingPartyWebForms/Site.Master b/samples/OpenIdRelyingPartyWebForms/Site.Master
index 9630f78..cf8c507 100644
--- a/samples/OpenIdRelyingPartyWebForms/Site.Master
+++ b/samples/OpenIdRelyingPartyWebForms/Site.Master
@@ -27,9 +27,9 @@
 		<asp:LoginStatus ID="LoginStatus1" runat="server" OnLoggedOut="LoginStatus1_LoggedOut" />
 	</span>
 	<div>
-		<a href="http://dotnetopenid.googlecode.com">
+		<a href="http://dotnetopenauth.net">
 			<img runat="server" src="~/images/dotnetopenid_tiny.gif" title="Jump to the project web site."
-				alt="DotNetOpenId" border='0' /></a>
+				alt="DotNetOpenAuth" border='0' /></a>
 	</div>
 	<div>
 		<asp:ContentPlaceHolder ID="Main" runat="server" />
diff --git a/samples/OpenIdRelyingPartyWebForms/Web.config b/samples/OpenIdRelyingPartyWebForms/Web.config
index 536294a..7c35f74 100644
--- a/samples/OpenIdRelyingPartyWebForms/Web.config
+++ b/samples/OpenIdRelyingPartyWebForms/Web.config
@@ -73,7 +73,7 @@
 		<trust level="Medium" originUrl=".*"/>
 	</system.web>
 
-	<!-- log4net is a 3rd party (free) logger library that dotnetopenid will use if present but does not require. -->
+	<!-- log4net is a 3rd party (free) logger library that DotNetOpenAuth will use if present but does not require. -->
 	<log4net>
 		<appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender">
 			<file value="RelyingParty.log" />
diff --git a/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
index ffaf6f0..de44e35 100644
--- a/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
@@ -18,7 +18,7 @@
 		}
 
 		protected void OpenIdAjaxTextBox1_LoggedIn(object sender, OpenIdEventArgs e) {
-			Label label = ((Label)this.commentSubmitted.FindControl("emailLabel"));
+			Label label = (Label)this.commentSubmitted.FindControl("emailLabel");
 			label.Text = e.Response.FriendlyIdentifierForDisplay;
 
 			// We COULD get the sreg extension response here for the email, but since we let the user
diff --git a/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
index 78179f7..a00eccd 100644
--- a/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
@@ -12,5 +12,4 @@
 		Visible="False" />
 	<asp:Label ID="loginCanceledLabel" runat="server" EnableViewState="False" Text="Login canceled"
 		Visible="False" />
-	<asp:CheckBox ID="noLoginCheckBox" runat="server" Text="Extensions only (no login) -- most OPs don't yet support this" />
 </asp:Content>
\ No newline at end of file
diff --git a/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
index 239d7b8..088e305 100644
--- a/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4918
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -66,14 +66,5 @@ namespace OpenIdRelyingPartyWebForms {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label loginCanceledLabel;
-        
-        /// <summary>
-        /// noLoginCheckBox control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.CheckBox noLoginCheckBox;
     }
 }