From alex@kapran.bitmcnit.bryansk.su  Sun Apr 29 00:19:49 2001
Return-Path: <alex@kapran.bitmcnit.bryansk.su>
Received: from rbn-gw.bgtu.debryansk.ru (rbn-gw.bgtu.debryansk.ru [62.76.89.2])
	by hub.freebsd.org (Postfix) with ESMTP id 286AC37B424
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Apr 2001 00:19:43 -0700 (PDT)
	(envelope-from alex@kapran.bitmcnit.bryansk.su)
Received: from server.bitmcnit.bryansk.su (root@bitmcnit.bryansk.su [192.168.121.2])
	by rbn-gw.bgtu.debryansk.ru (8.11.2/8.11.2) with ESMTP id f3T7IFm28415
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Apr 2001 11:18:15 +0400
Received: (from uucp@localhost)
	by server.bitmcnit.bryansk.su (8.9.3/8.9.3) with UUCP id LAA21933
	for FreeBSD-gnats-submit@freebsd.org; Sun, 29 Apr 2001 11:08:55 +0400
Received: (from alex@localhost)
	by kapran.bitmcnit.bryansk.su (8.11.3/8.11.3) id f3T6t8H00999;
	Sun, 29 Apr 2001 10:55:09 +0400 (MSD)
	(envelope-from alex)
Message-Id: <200104290655.f3T6t8H00999@kapran.bitmcnit.bryansk.su>
Date: Sun, 29 Apr 2001 10:55:09 +0400 (MSD)
From: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>
Reply-To: alex@kapran.bitmcnit.bryansk.su
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] description of :C modifier is misplaced in make.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         26943
>Category:       docs
>Synopsis:       [patch] description of :C modifier is misplaced in make.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    keramida
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 29 00:20:01 PDT 2001
>Closed-Date:    Sun Jul 18 02:28:24 GMT 2004
>Last-Modified:  Sun Jul 18 02:28:24 GMT 2004
>Originator:     Alex Kapranoff
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Inner Mongolia
>Environment:
System: FreeBSD kapran.bitmcnit.bryansk.su 5.0-CURRENT FreeBSD 5.0-CURRENT #3: Wed Apr 25 21:16:35 MSD 2001 root@kapran.bitmcnit.bryansk.su:/usr/src/sys/compile/KAPRAN i386


>Description:
	make.1 manpage describes :C modifier in comparison to :S, but
	before :S. That brings some inconvenience for first-time
	readers.  The first patch moves :C section just below :S (cut-n-paste
	only, no semantic changes) and the second adds some
	insignificant markup to the section.

>How-To-Repeat:
	
>Fix:
--- /usr/src/usr.bin/make/make.1	Wed Apr 25 20:50:37 2001
+++ make.1	Sun Apr 29 10:34:32 2001
@@ -584,34 +584,6 @@
 The colon may be escaped with a backslash
 .Pq Ql \e .
 .Bl -tag -width Cm
-.Sm off
-.It Cm C No \&/ Ar pattern Xo
-.No \&/ Ar replacement
-.No \&/ Op Cm 1g
-.Xc
-.Sm on
-The 
-.Cm C
-modifier is just like the
-.Cm S
-modifier except that the old and new strings, instead of being
-simple strings, are a regular expression (see
-.Xr regex 3 )
-and an
-.Xr ed 1 Ns \-style
-replacement string.  Normally, the first occurrence of the pattern in
-each word of the value is changed.  The
-.Ql 1
-modifier causes the substitution to apply to at most one word; the
-.Ql g
-modifier causes the substitution to apply to as many instances of the
-search pattern as occur in the word or words it is found in.  Note that
-.Ql 1
-and
-.Ql g
-are orthogonal; the former specifies whether multiple words are
-potentially affected, the latter whether multiple substitutions can
-potentially occur within each affected word.
 .It Cm E
 Replaces each word in the variable with its suffix.
 .It Cm H
@@ -685,6 +657,34 @@
 of a dollar sign
 .Pq Ql \&$ ,
 not a preceding dollar sign as is usual.
+.Sm off
+.It Cm C No \&/ Ar pattern Xo
+.No \&/ Ar replacement
+.No \&/ Op Cm 1g
+.Xc
+.Sm on
+The 
+.Cm C
+modifier is just like the
+.Cm S
+modifier except that the old and new strings, instead of being
+simple strings, are a regular expression (see
+.Xr regex 3 )
+and an
+.Xr ed 1 Ns \-style
+replacement string.  Normally, the first occurrence of the pattern in
+each word of the value is changed.  The
+.Ql 1
+modifier causes the substitution to apply to at most one word; the
+.Ql g
+modifier causes the substitution to apply to as many instances of the
+search pattern as occur in the word or words it is found in.  Note that
+.Ql 1
+and
+.Ql g
+are orthogonal; the former specifies whether multiple words are
+potentially affected, the latter whether multiple substitutions can
+potentially occur within each affected word.
 .It Cm T
 Replaces each word in the variable with its last component.
 .It Ar old_string=new_string

--- make.1.orig	Sun Apr 29 10:34:32 2001
+++ make.1	Sun Apr 29 10:22:00 2001
@@ -672,13 +672,16 @@
 .Xr regex 3 )
 and an
 .Xr ed 1 Ns \-style
-replacement string.  Normally, the first occurrence of the pattern in
-each word of the value is changed.  The
+replacement string.  Normally, the first occurrence of the
+.Ar pattern
+in each word of the value is changed.  The
 .Ql 1
 modifier causes the substitution to apply to at most one word; the
 .Ql g
 modifier causes the substitution to apply to as many instances of the
-search pattern as occur in the word or words it is found in.  Note that
+search
+.Ar pattern
+as occur in the word or words it is found in.  Note that
 .Ql 1
 and
 .Ql g
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-docs 
Responsible-Changed-By: dd 
Responsible-Changed-When: Mon Apr 30 16:09:29 PDT 2001 
Responsible-Changed-Why:  
docs problem. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=26943 
Responsible-Changed-From-To: freebsd-docs->will 
Responsible-Changed-By: alex 
Responsible-Changed-When: Mon May 14 13:27:55 PDT 2001 
Responsible-Changed-Why:  
make is will's foo. 
Will, you added the :C modifier, could you please consider this 
update to the manpage? 


http://www.FreeBSD.org/cgi/query-pr.cgi?pr=26943 
Responsible-Changed-From-To: will->freebsd-bugs 
Responsible-Changed-By: will 
Responsible-Changed-When: Wed Aug 29 16:26:59 PDT 2001 
Responsible-Changed-Why:  
I don't have time for make(1) anymore... 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=26943 
Responsible-Changed-From-To: freebsd-bugs->freebsd-doc 
Responsible-Changed-By: cjc 
Responsible-Changed-When: Wed Feb 20 08:42:11 PST 2002 
Responsible-Changed-Why:  
The docs guys can take care of this, please? 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=26943 

From: Giorgos Keramidas <keramida@freebsd.org>
To: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>
Cc: bug-followup@freebsd.org
Subject: Re: docs/26943: [patch] description of :C modifier is misplaced in make.1
Date: Sun, 12 May 2002 05:44:56 +0300

 On 2001-04-29 10:55, Alex Kapranoff wrote:
 > 	make.1 manpage describes :C modifier in comparison to :S, but
 > 	before :S. That brings some inconvenience for first-time
 > 	readers.  The first patch moves :C section just below :S (cut-n-paste
 > 	only, no semantic changes) and the second adds some
 > 	insignificant markup to the section.
 
 > Responsible-Changed-From-To: freebsd-bugs->freebsd-doc
 > Responsible-Changed-By: cjc
 > Responsible-Changed-When: Wed Feb 20 08:42:11 PST 2002
 > Responsible-Changed-Why: 
 > The docs guys can take care of this, please?
 
 I think that the idea behind this was that a lot of the stuff that is
 relevant to :C is already described in the section of :S, but since :C
 came second the text was left at :S.  The modifiers are sorted
 alphabetically, so it makes more sense to keep :C in the proper place
 than move it under :S just to save a few page-down keys.
 
 Of course this is MHO.  The second diff, that is part of this PR which
 adds .Ar macros in a couple of places, looks fine to me.  I'd like
 this (the second diff only) to be committed if nobody objects.
 
 Comments, anyone else?
 
 - Giorgos
 

From: Peter Pentchev <roam@ringlet.net>
To: Giorgos Keramidas <keramida@freebsd.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: docs/26943: [patch] description of :C modifier is misplaced in make.1
Date: Mon, 13 May 2002 13:49:48 +0300

 On Sat, May 11, 2002 at 07:50:04PM -0700, Giorgos Keramidas wrote:
 > The following reply was made to PR docs/26943; it has been noted by GNATS.
 >  On 2001-04-29 10:55, Alex Kapranoff wrote:
 >  > 	make.1 manpage describes :C modifier in comparison to :S, but
 >  > 	before :S. That brings some inconvenience for first-time
 >  > 	readers.  The first patch moves :C section just below :S (cut-n-paste
 >  > 	only, no semantic changes) and the second adds some
 >  > 	insignificant markup to the section.
 >  
 >  > Responsible-Changed-From-To: freebsd-bugs->freebsd-doc
 >  > Responsible-Changed-By: cjc
 >  > Responsible-Changed-When: Wed Feb 20 08:42:11 PST 2002
 >  > Responsible-Changed-Why: 
 >  > The docs guys can take care of this, please?
 >  
 >  I think that the idea behind this was that a lot of the stuff that is
 >  relevant to :C is already described in the section of :S, but since :C
 >  came second the text was left at :S.  The modifiers are sorted
 >  alphabetically, so it makes more sense to keep :C in the proper place
 >  than move it under :S just to save a few page-down keys.
 
 Moving the documentation to the description of :C looks like a good
 thing to me.
 
 >  Of course this is MHO.  The second diff, that is part of this PR which
 >  adds .Ar macros in a couple of places, looks fine to me.  I'd like
 >  this (the second diff only) to be committed if nobody objects.
 
 Fine by me, too.
 
 G'luck,
 Peter
 
 -- 
 Peter Pentchev	roam@ringlet.net	roam@FreeBSD.org
 PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
 Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
 This sentence was in the past tense.

From: Giorgos Keramidas <keramida@ceid.upatras.gr>
To: Peter Pentchev <roam@ringlet.net>
Cc: bug-followup@freebsd.org
Subject: Re: docs/26943: [patch] description of :C modifier is misplaced in make.1
Date: Mon, 13 May 2002 14:59:10 +0300

 On 2002-05-13 13:49, Peter Pentchev wrote:
 > On Sat, May 11, 2002 at 07:50:04PM -0700, Giorgos Keramidas wrote:
 > > I think that the idea behind this was that a lot of the stuff that is
 > > relevant to :C is already described in the section of :S, but since :C
 > > came second the text was left at :S.  The modifiers are sorted
 > > alphabetically, so it makes more sense to keep :C in the proper place
 > > than move it under :S just to save a few page-down keys.
 >
 > Moving the documentation to the description of :C looks like a good
 > thing to me.
 
 Yep.  I started trying to write a complete :C entry after merging
 stuff from :S last night.  Now I have :C done, and all that remains is
 to rewrite the :S part to avoid repeating stuff.
 
 -- 
 Giorgos Keramidas    - http://www.FreeBSD.org
 keramida@FreeBSD.org - The Power to Serve

From: Giorgos Keramidas <keramida@freebsd.org>
To: Peter Pentchev <roam@ringlet.net>
Cc: bug-followup@freebsd.org
Subject: Re: docs/26943: [patch] description of :C modifier is misplaced in make.1
Date: Mon, 13 May 2002 15:25:50 +0300

 On 2002-05-13 13:49, Peter Pentchev wrote:
 > Moving the documentation to the description of :C looks like a good
 > thing to me.
 
 Silly me, I meant to include the new :C entry I made until now, and I
 forgot the patch.  Here it is.  I have moved most of the stuff from
 the description of :S to this paragraph.  If I've forgotten anything
 please let me know.
 
 %%%
 Index: make.1
 ===================================================================
 RCS file: /home/ncvs/src/usr.bin/make/make.1,v
 retrieving revision 1.54
 diff -u -1 -0 -r1.54 make.1
 --- make.1	20 Apr 2002 12:15:44 -0000	1.54
 +++ make.1	13 May 2002 12:17:04 -0000
 @@ -589,45 +589,57 @@
  special characters.
  The colon may be escaped with a backslash
  .Pq Ql \e .
  .Bl -tag -width Cm
  .Sm off
  .It Cm C No \&/ Ar pattern Xo
  .No \&/ Ar replacement
  .No \&/ Op Cm 1g
  .Xc
  .Sm on
 -The
 -.Cm C
 -modifier is just like the
 -.Cm S
 -modifier except that the old and new strings, instead of being
 -simple strings, are a regular expression (see
 -.Xr regex 3 )
 -and an
 -.Xr ed 1 Ns \-style
 -replacement string.
 +Modify each word of the value, substituting
 +.Ar pattern
 +with
 +.Ar replacement .
 +In
 +.Ar pattern
 +regular expressions can be used (see
 +.Xr regex 3
 +or
 +.Xr ed 1
 +for more information on regular expressions).
  Normally, the first occurrence of the pattern in
  each word of the value is changed.
  The
  .Ql 1
  modifier causes the substitution to apply to at most one word; the
  .Ql g
  modifier causes the substitution to apply to as many instances of the
  search pattern as occur in the word or words it is found in.
  Note that
  .Ql 1
  and
  .Ql g
  are orthogonal; the former specifies whether multiple words are
  potentially affected, the latter whether multiple substitutions can
  potentially occur within each affected word.
 +Inside
 +.Ar replacement ,
 +an ampersand
 +.Pq Ql &
 +is replaced by the text that matched
 +.Ar pattern .
 +Any character may be used as a delimiter for the parts of the modifier
 +string.
 +The ampersand and delimiter characters may be escaped with a
 +backslash
 +.Pq Ql \e .
  .It Cm E
  Replaces each word in the variable with its suffix.
  .It Cm H
  Replaces each word in the variable with everything but the last component.
  .It Cm L
  Converts variable to lower-case letters.
  .It Cm M Ns Ar pattern
  Select only those words that match the rest of the modifier.
  The standard shell wildcard characters
  .Pf ( Ql * ,
 %%%
 
 -- 
 Giorgos Keramidas    - http://www.FreeBSD.org
 keramida@FreeBSD.org - The Power to Serve

From: Peter Pentchev <roam@ringlet.net>
To: Giorgos Keramidas <keramida@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: docs/26943: [patch] description of :C modifier is misplaced in make.1
Date: Mon, 13 May 2002 15:30:34 +0300

 On Mon, May 13, 2002 at 03:25:50PM +0300, Giorgos Keramidas wrote:
 > On 2002-05-13 13:49, Peter Pentchev wrote:
 > > Moving the documentation to the description of :C looks like a good
 > > thing to me.
 > 
 > Silly me, I meant to include the new :C entry I made until now, and I
 > forgot the patch.  Here it is.  I have moved most of the stuff from
 > the description of :S to this paragraph.  If I've forgotten anything
 > please let me know.
 
 Looks great, just for one minor possible improvement..
 
 [snip]
 > +In
 > +.Ar pattern
 > +regular expressions can be used (see
 > +.Xr regex 3
 > +or
 > +.Xr ed 1
 > +for more information on regular expressions).
 
 I see that you have copied that from the :S description; however, would
 it not be a bit more user-friendly to link to re_format(7) instead
 of regex(3)? :)
 
 G'luck,
 Peter
 
 -- 
 Peter Pentchev	roam@ringlet.net	roam@FreeBSD.org
 PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
 Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
 I had to translate this sentence into English because I could not read the original Sanskrit.
State-Changed-From-To: open->closed 
State-Changed-By: keramida 
State-Changed-When: Sun Jul 18 02:26:45 GMT 2004 
State-Changed-Why:  
Some of the suggestions made in this PR had already been committed. 
I've edited the part that describes :C to make it independent of :S. 

Thanks for submitting this and my apologies for taking that long 
to handle the PR! 


Responsible-Changed-From-To: freebsd-doc->keramida 
Responsible-Changed-By: keramida 
Responsible-Changed-When: Sun Jul 18 02:26:45 GMT 2004 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=26943 
>Unformatted:
