diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-26 20:08:56 -0800 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-26 20:08:56 -0800 |
commit | ad0228798a1f32a5da40c2f73dd82f37f4494c45 (patch) | |
tree | 29971d7e06a41ab6f7a40d08d4a493f13b774662 /samples/OpenIdProviderWebForms | |
parent | 8ccb2f51d3222431cfea9defddc6a99e4c50b38b (diff) | |
parent | 21d77c90dcf5e65a9c9c8999db119168cdc43828 (diff) | |
download | DotNetOpenAuth-ad0228798a1f32a5da40c2f73dd82f37f4494c45.zip DotNetOpenAuth-ad0228798a1f32a5da40c2f73dd82f37f4494c45.tar.gz DotNetOpenAuth-ad0228798a1f32a5da40c2f73dd82f37f4494c45.tar.bz2 |
Merge branch 'v3.1' into v3.2
Conflicts:
src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
src/DotNetOpenAuth/OpenId/ChannelElements/ReturnToNonceBindingElement.cs
Diffstat (limited to 'samples/OpenIdProviderWebForms')
-rw-r--r-- | samples/OpenIdProviderWebForms/Site.Master | 4 | ||||
-rw-r--r-- | samples/OpenIdProviderWebForms/Web.config | 4 | ||||
-rw-r--r-- | samples/OpenIdProviderWebForms/server.aspx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/samples/OpenIdProviderWebForms/Site.Master b/samples/OpenIdProviderWebForms/Site.Master index 8780550..4df9e0a 100644 --- a/samples/OpenIdProviderWebForms/Site.Master +++ b/samples/OpenIdProviderWebForms/Site.Master @@ -9,9 +9,9 @@ </head> <body> <form id="form1" runat="server"> - <div><a href="http://dotnetopenid.googlecode.com"> + <div><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> </div> + alt="DotNetOpenAuth" border='0' /></a> </div> <div> <asp:ContentPlaceHolder ID="Main" runat="server" /> </div> diff --git a/samples/OpenIdProviderWebForms/Web.config b/samples/OpenIdProviderWebForms/Web.config index 159dcd1..3aba822 100644 --- a/samples/OpenIdProviderWebForms/Web.config +++ b/samples/OpenIdProviderWebForms/Web.config @@ -43,7 +43,7 @@ </settings> </system.net> - <!-- this is an optional configuration section where aspects of dotnetopenid can be customized --> + <!-- this is an optional configuration section where aspects of DotNetOpenAuth can be customized --> <dotNetOpenAuth> <openid> <provider> @@ -125,7 +125,7 @@ </authorization> </system.web> </location> - <!-- 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="Provider.log"/> diff --git a/samples/OpenIdProviderWebForms/server.aspx b/samples/OpenIdProviderWebForms/server.aspx index d3ce78d..a874ccd 100644 --- a/samples/OpenIdProviderWebForms/server.aspx +++ b/samples/OpenIdProviderWebForms/server.aspx @@ -25,7 +25,7 @@ <table> <tr> <td> - <a href="http://dotnetopenid.googlecode.com/">http://dotnetopenid.googlecode.com/</a> + <a href="http://dotnetopenauth.net/">http://dotnetopenauth.net/</a> </td> <td> Home of this library |