git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@citi.umich.edu>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, "J. Bruce Fields" <bfields@citi.umich.edu>
Subject: [PATCH 1/6] glossary: fix overoptimistic automatic linking of defined terms
Date: Sat, 10 Mar 2007 23:35:26 -0500	[thread overview]
Message-ID: <11735877321525-git-send-email-bfields@citi.umich.edu> (raw)
In-Reply-To: <11735877311383-git-send-email-bfields@citi.umich.edu>

From: J. Bruce Fields <bfields@citi.umich.edu>

The script sort_glossary.pl turns each use of "term" into a link to the
definition of "term".  To avoid mangling links like

	gitlink:git-term[1]

it doesn't replace any occurence of "term" preceded by "link:git-".
This fails for gitlink:git-symbolic-ref[1] when substituting for "ref".

So instead just refuse to replace anything preceded by a "-".
That could result in missing some opportunities, but that's a less
annoying error.

Actually I find the automatic substitution a little distracting; some
day maybe we should just run it once and commit the result, so it can
be hand-tuned.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
 Documentation/sort_glossary.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/sort_glossary.pl b/Documentation/sort_glossary.pl
index e0bc552..05dc7b2 100644
--- a/Documentation/sort_glossary.pl
+++ b/Documentation/sort_glossary.pl
@@ -48,7 +48,7 @@ This list is sorted alphabetically:
 ';
 
 @keys=sort {uc($a) cmp uc($b)} keys %terms;
-$pattern='(\b(?<!link:git-)'.join('\b|\b(?<!link:git-)',reverse @keys).'\b)';
+$pattern='(\b(?<!link:git-)'.join('\b|\b(?<!-)',reverse @keys).'\b)';
 foreach $key (@keys) {
 	$terms{$key}=~s/$pattern/sprintf "<<ref_".no_spaces($1).",$1>>";/eg;
 	print '[[ref_'.no_spaces($key).']]'.$key."::\n"
-- 
1.5.0.gb75812-dirty

  reply	other threads:[~2007-03-11  4:35 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-04 21:59 Documentation (mostly user manual) patches J. Bruce Fields
2007-03-04 21:59 ` [PATCH] Documentation: mention module option to git-cvsimport J. Bruce Fields
2007-03-04 21:59   ` [PATCH] user-manual: reset to ORIG_HEAD not HEAD to undo merge J. Bruce Fields
2007-03-04 21:59     ` [PATCH] user-manual: ensure generated manual references stylesheet J. Bruce Fields
2007-03-04 21:59       ` [PATCH] user-manual: insert earlier of mention content-addressable architecture J. Bruce Fields
2007-03-04 21:59         ` [PATCH] user-manual: how to replace commits older than most recent J. Bruce Fields
2007-03-04 21:59           ` [PATCH] user-manual: more detailed merge discussion J. Bruce Fields
2007-03-04 21:59             ` [PATCH] glossary: Add definitions for dangling and unreachable objects J. Bruce Fields
2007-03-05  0:45               ` Yasushi SHOJI
2007-03-16 12:44       ` [PATCH] user-manual: ensure generated manual references stylesheet Robert Pluim
2007-03-16 14:24         ` J. Bruce Fields
     [not found]           ` <7C0AC446-57CA-480B-A14E-1E861E2FCBA7@silverinsanity.com>
2007-03-16 15:36             ` J. Bruce Fields
     [not found]               ` <7DA766E4-D88F-4248-BD29-1E0B403BF0BE@silverinsanity.com>
2007-03-16 17:02                 ` J. Bruce Fields
2007-03-05  3:14 ` Documentation (mostly user manual) patches Junio C Hamano
2007-03-05 18:38   ` J. Bruce Fields
2007-03-11  4:35   ` J. Bruce Fields
2007-03-11  4:35     ` J. Bruce Fields [this message]
2007-03-11  4:35       ` [PATCH 2/6] user-manual: fix inconsistent example J. Bruce Fields
2007-03-11  4:35         ` [PATCH 3/6] user-manual: fix inconsistent use of pull and merge J. Bruce Fields
2007-03-11  4:35           ` [PATCH 4/6] user-manual: fix missing colon in git-show example J. Bruce Fields
2007-03-11  4:35             ` [PATCH 5/6] user-manual: fix rendering of history diagrams J. Bruce Fields
2007-03-11  4:35               ` [PATCH 6/6] user-manual: install user manual stylesheet with other web documents J. Bruce Fields
2007-03-11  4:39         ` [PATCH 2/6] user-manual: fix inconsistent example J. Bruce Fields
2007-03-13 19:31           ` Ramsay Jones
2007-03-14 23:19             ` J. Bruce Fields
2007-03-11  5:35     ` Documentation (mostly user manual) patches Junio C Hamano
2007-03-07 20:19 ` Ramsay Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11735877321525-git-send-email-bfields@citi.umich.edu \
    --to=bfields@citi.umich.edu \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).