58702 - Terry's name misspelled on two pages

Status: VERIFIED FIXED

(Developer Documentation Graveyard :: General, defect, P3)

Description

[Jesse Ruderman]

Terry Weissman's name got cut off on these two pages:

www.mozilla.org/quality/help/beginning-duplicate-finding.html
www.mozilla.org/quality/help/screening-duplicates.html

Comment 1

[Sean Richardson]

Sorry, Terry. Fixed in my tree; will get patches ready shortly. 

Both of those documents should also point to 
http://www.mozilla.org/bugs/text-searching.html 
-- and beginning-duplicate-finding.html can be tightened up
somewhat now that it exists. I've got those updates half-done;
time to finish them.

I'll do that before making the diffs, to avoid following 
two 3-char diffs with two more involved diffs, all in a day.

Comment 2

[Sean Richardson]

For reference, the earlier history of these docs:
beginning-duplicate-finding.html - bug 30978
screening-duplicates.html - bug 30979

A patch for beginning-duplicate-finding.html is ready. Besides fixing 
Terry's name and ading a reference to text-searching.html,
I've tightened up the prose in a few places and removed some
idiomatic phrases. The patch is clean and readable, though.

Jesse, Gerv: would it be a worthwhile improvement to include
snippets of the query form in this doc, as in text-searching.html,
to show as well as tell how it should be filled out?

A patch for screening-duplicates.html will follow tonight.

Comment 3

[Sean Richardson]

Attachment: CVS diff -u: beginning-duplicate-finding.html.diff

Comment 4

[Sean Richardson]

Attachment: CVS diff -u: screening-duplicates.html.diff

Comment 5

[Sean Richardson]

OK, the diff for screening-duplicates.html is attached now; both are ready
for application and check-in. Over to you, Gerv.

Comment 6

[Gervase Markham [:gerv]]

I have no idea what to do with these diffs - GNU patch (from Cygwin) fails on 
all 9 hunks, and cvs doesn't seem to have a patch command to match its diff. Can 
someone enlighten me?

Gerv

Comment 7

[Sean Richardson]

Gerv: I'm using CVS version 1.10 under cmd.exe on WinNT, downloaded as
cvs-1.10-win.zip back in June. I tested both diffs, and they patched
cleanly against the checked-out files.

On my system CVS is installed on F:, and the following commands were all I 
needed to do the patch against version 1.2 of beginning-duplicate-finding.html:
  cd f:\cvs\mozilla-org\html\quality\help
  f:\cvs\patch < beginning-duplicate-finding.html.diff

(Of course, it's only this simple if the diff has been put in the same directory
as the file it's meant to patch.)

If your CVS package doesn't have a patch.exe in the same directory as cvs.exe,
I'd say it's incomplete. (Depending on your path, you may need to use an
absolute filename for patch.exe. I've got cygwin too, and it was faster for 
me to type f:\cvs\patch than to check the path...)

In any case, if you're still stuck, just holler and I'll mirror a bit of my
CVS tree onto a webserver for you.

Comment 8

[Gervase Markham [:gerv]]

I have a patch.exe, but running it bombs out with:
patch: **** can't create /tmp/patchp092861: No such file or directory
Where the filename has different numbers in each time - a temp file.

Larry Wall's patch works, but it fails on all 9 hunks - do they use different 
formats?

The easiest thing would probably be for you to post the full versions, either 
here or on a webserver, and I'll check them in.

Gerv

Comment 9

[Sean Richardson]

OK, you can find them at
http://www.albedo.net/~sidr/mozilla/html/quality/help/

Grab beginning-duplicate-finding.html & screening-duplicates.html -- they've
already had the patches applied (literally) :->

Also, try "set HOME=C:\TEMP" (or any other reasonable existing temp dir) 
before doing the CVS login, or possibly create a \TMP on the same drive.
One or the other will probably get you past the 
  patch: **** can't create /tmp/patchp092861: No such file or directory
error. 

Comment 10

[Gervase Markham [:gerv]]

New versions checked in.

Gerv

Comment 11

[Jesse Ruderman]

verif fixed