Closed Bug 348741 Opened 18 years ago Closed 18 years ago

add Firefox EULA v2

Categories

(Firefox :: General, defect)

Product:
Firefox
Component:
General
Version:
2.0 Branch
Platform:
x86
All
Type:
defect
Priority:
Not set
Severity:
normal

Tracking

()

Status:
RESOLVED FIXED
Milestone:
Firefox 2

People

(Reporter: cbeard, Assigned: robert.strong.bugs)

References

Details

(Keywords: fixed1.8.1)

Attachments

(6 files, 5 obsolete files)

Firefox EULA v2 (with proper spacing)
6.76 KB, text/plain
Details
screenshot
30.01 KB, image/png
Details
patch - rtf support
9.38 KB, patch
benjamin
: review+
beltzner
: approval1.8.1+
Details | Diff | Splinter Review
screenshots of rtf EULA
58.22 KB, image/png
Details
Mac branch patch
30.88 KB, patch
beltzner
: approval1.8.1+
Details | Diff | Splinter Review
Mac trunk patch
30.86 KB, patch
beltzner
: ui-review+
Details | Diff | Splinter Review
we have updated the Firefox EULA for Firefox 2 to include terms that make it more "distribution friendly" as well as inclusion of terms and links to the new Firefox Privacy Policy v2 of the EULA should be displayed and replay the existing version for Fx 2 on all platforms. it does not replace the EULA that ships with Fx 1.5 or Fx 1.0. this EULA must also be displayed and accepted (in the same way as the installer) for *major* product updates delivered through AUS. a separate EULA for Thunderbird will be provided.
Attached file Firefox EULA v2 (obsolete) —
Attachment #233796 - Attachment is obsolete: true
Flags: blocking-firefox2?
Blocks: 348389
Comment on attachment 233801 [details] Firefox EULA v2 (without funky characters) >9. MISCELLANEOUS. (a)This Agreement constitutes the entire agreement between Mozilla and you concerning the subject matter hereof, and it may only be modified by a written amendment signed by an authorized executive of Mozilla. (b) Except to the extent ... There should be a space between the "(a)" and "This" to match the other parts.
Attachment #233801 - Attachment is obsolete: true
Assignee: nobody → robert.bugzilla
Flags: blocking-firefox2? → blocking-firefox2+
Target Milestone: --- → Firefox 2
Attached image screenshot —
Attached patch patch - checked in (obsolete) — — Splinter Review
Attachment #233876 - Flags: review?(benjamin)
Whiteboard: [has patch][needs review bsmedberg]
Comment on attachment 233876 [details] [diff] [review] patch - checked in We're supposed to be removing the note about translations?
Attachment #233876 - Flags: review?(benjamin) → review+
Comment on attachment 233876 [details] [diff] [review] patch - checked in I will be following this up with a patch to provide an rtf EULA for the Win32 NSIS installer and this will still be needed by the installers that don't support rtf.
Attachment #233876 - Flags: approval1.8.1?
Comment on attachment 233876 [details] [diff] [review] patch - checked in Checked in to trunk - will follow up shortly with the rtf EULA patch
Attachment #233876 - Attachment description: patch → patch - checked in to trunk
Attachment #234062 - Flags: review?(benjamin)
Comment on attachment 234062 [details] [diff] [review] patch - rtf support We're going to keep EULA and EULA.rtf in sync, I presume?
Attachment #234062 - Flags: review?(benjamin) → review+
(In reply to comment #11) > We're going to keep EULA and EULA.rtf in sync, I presume? Yep, we are going to have to.
looks great!
Attachment #234062 - Flags: approval1.8.1?
Comment on attachment 233876 [details] [diff] [review] patch - checked in a=beltzner on behalf of drivers, for landing on the MOZILLA_1_8_BRANCH. Please mark fixed1.8.1 when it lands.
Attachment #233876 - Flags: approval1.8.1? → approval1.8.1+
Comment on attachment 234062 [details] [diff] [review] patch - rtf support a=beltzner on behalf of drivers, for landing on the MOZILLA_1_8_BRANCH. Please mark fixed1.8.1 when it lands.
Attachment #234062 - Flags: approval1.8.1? → approval1.8.1+
Checked in to MOZILLA_1_8_BRANCH. Leaving open for the remaining patch for the rtf EULA that needs to be landed on the trunk after it re-opens.
Keywords: fixed1.8.1
Whiteboard: [has patch][needs review bsmedberg]
Attachment #233876 - Attachment description: patch - checked in to trunk → patch - checked in
Attachment #233876 - Attachment is obsolete: true
Attachment 234062 [details] [diff] checked in to trunk. That's all folks!
Status: NEW → RESOLVED
Closed: 18 years ago
Resolution: --- → FIXED
Target Milestone: Firefox 2 → Firefox 2 beta2
Need to do the EULAs in the Mac disk images too, huh?
If it doesn't use browser/EULA it does need to be updated... can you add it or provide a pointer to the file that needs to be updated?
The files are in the tree as "license.r," but they contain a couple of byte offsets into the text for style information (to make the heading bold), and it looks like those are going to have to change.
Thanks Mark
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
--> Firefox 2, unless you think we should respin for this. Another thing to note here is that the URL for the privacy policy isn't using the new mozilla.com URI scheme. It should probably be pointing to: http://www.mozilla.com/en-US/firefox/privacy/ although I don't know what we'd do for non en-US locales. We don't translate the EULA, right? Chris?
Target Milestone: Firefox 2 beta2 → Firefox 2
the EULA itself will not be translated, the web content will be. we should update the URL to fit the scheme, but I don't view this as a blocker for b2 as there is no l10n impact.
OK. I filed bug 350091 to track the update to the privacy policy thing. Rob, if you want to handle that as part of this bug, just dupe the new one against this one.
just to clearify, what will the nav path be from say, the "de" installer license page? right now it shows english content and the top line says: For Translations of this License into selected languages please visit http://www.mozilla.org/foundation/licensing.html then the german user needs to read that page and pick the link to http://www.mozilla.com/legal/eula/ which has a line for and links to the EULA content for the locale German Deutsch HTML plain text are we shooting for the same basic navigation path (but just moving the content to mozilla.com, or will try to shorten?
Attached patch patch for Mac OS X (obsolete) — — Splinter Review
beltzner, could you take a look at this just to be sure. The previous EULA for Mac OS X appeared to call out Minefield on the trunk.
Attachment #235714 - Flags: ui-review?(beltzner)
Comment on attachment 235714 [details] [diff] [review] patch for Mac OS X The offsets in the styl resource haven't changed, so the wrong part of the header will be displayed in bold face. The "9. MISCELLANEOUS" line is really long and will probably cause the resource compiler to croak. If you don't have a Mac, I might have a few minutes today to do this. As for the "Minefield" text in browser/app/macbuild/license.r, that file is only used for unbranded builds. Since the Mac build treats the EULA as a branding file (unlike Win/Lin), we've never put "Firefox" in the non-trademarked-branding version of the license.
(In reply to comment #28) Mark, if you could do this I'd appreciate it. I can probably get a Mac to finish this up but it will take quite a bit more than a few minutes. Thanks
Attached patch Mac trunk patch (obsolete) — — Splinter Review
Attachment #235714 - Attachment is obsolete: true
Attachment #235949 - Flags: ui-review?
Attachment #235714 - Flags: ui-review?(beltzner)
Attachment #235949 - Flags: ui-review? → ui-review?(beltzner)
Attached patch Mac branch patch — — Splinter Review
Attachment #235950 - Flags: approval1.8.1?
Attached patch Mac trunk patch — — Splinter Review
(A file was missing from the trunk patch.)
Attachment #235949 - Attachment is obsolete: true
Attachment #235951 - Flags: ui-review?(beltzner)
Attachment #235949 - Flags: ui-review?(beltzner)
Attachment #235951 - Flags: ui-review?(beltzner) → ui-review+
Mac EULA checked in on the trunk, with URL change. Branch checkin needed.
Status: REOPENED → RESOLVED
Closed: 18 years ago → 18 years ago
Keywords: fixed1.8.1
Resolution: --- → FIXED
Comment on attachment 235950 [details] [diff] [review] Mac branch patch >http://www.mozilla.com/legal/privacy/firefox-en.html Should be checked in to branch as http://www.mozilla.com/firefox/privacy/ a=beltzner on behalf of 181drivers
Attachment #235950 - Flags: approval1.8.1? → approval1.8.1+
Mac patch checked in with fixed URL on the MOZILLA_1_8_BRANCH before 1.8.1rc1.
Keywords: fixed1.8.1
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: