Modified first-time dialog when visiting a secure page, to mention the

2007-06-07  Diego Escalante Urrelo  <diegoe@gnome.org>

        * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
        * help/C/epiphany.xml:

        Modified first-time dialog when visiting a secure page, to mention
        the color and padlock icon in the address entry.
        Patch by Jared Moore. Fixes bug #346243.


svn path=/trunk/; revision=7085

3 files changed, 17 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index e05c2b7a5..35dfea360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-07  Diego Escalante Urrelo  <diegoe@gnome.org>
+
+	* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
+	* help/C/epiphany.xml:
+
+	Modified first-time dialog when visiting a secure page, to mention
+	the color and padlock icon in the address entry. 
+	Patch by Jared Moore. Fixes bug #346243.
+
 2007-06-16  Christian Persch  <chpe@gnome.org>
 
 	* doc/Makefile.am:
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index 3d9ee5962..b50b3762a 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -94,7 +94,10 @@ GtkNSSSecurityWarningDialogs::ConfirmEnteringSecure (nsIInterfaceRequestor *aCon
 		  GTK_RESPONSE_OK,
 		  _("Security Notice"),
 		  _("This page is loaded over a secure connection"),
-		  _("The padlock icon in the statusbar indicates whether a page is secure."),
+		  _("For secure pages, the address entry has a distinct "
+		    "color and a locked padlock icon is displayed.\n\n"
+		    "The padlock icon in the statusbar also indicates "
+		    "whether a page is secure."),
 		  nsnull, _retval);
 
 	*_retval = PR_TRUE;
diff --git a/help/C/epiphany.xml b/help/C/epiphany.xml
index 3ff6c4641..d8e627bdb 100644
--- a/help/C/epiphany.xml
+++ b/help/C/epiphany.xml
@@ -1689,13 +1689,8 @@ GNOME -> GNOME developers home page</programlisting>
 	<sect2 id="identifying-secure-sites">
 	  <title>Identifying Secure Sites</title>
 	  <para>
-		When viewing web pages, &fr; displays a padlock icon 
-		which shows you whether the current site is secure. When the 
-		statusbar is visible, this icon will appear there, otherwise it
-		will be shown in the right-hand side of the address entry. In 
-		Fullscreen mode when the toolbar is hidden, the lock icon 
-		will be shown in the top right corner of the window on secure 
-		sites.
+		When viewing web pages, &fr; displays a padlock icon in the
+		statusbar which shows you whether the current site is secure. 
 	  </para>
 	  <variablelist>
 		<varlistentry>
@@ -1725,8 +1720,8 @@ GNOME -> GNOME developers home page</programlisting>
 		</varlistentry>
 	  </variablelist>
 	  <para>
-	  In addition, &fr; displays the address entry using a yellow background 
-	  to show you that the current site is secure.
+		For secure sites, there is an additional locked padlock icon in the address
+		entry, and the address entry has a different background color.
 	  </para>
 	</sect2>
 	<sect2 id="using-certificate-viewer">