* [PATCH] minor diff between gitweb docs and actual template for $GIT/description
@ 2013-01-11 0:33 Tim Chase
2013-01-11 2:22 ` Jonathan Nieder
0 siblings, 1 reply; 3+ messages in thread
From: Tim Chase @ 2013-01-11 0:33 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
The documentation for gitweb gives one description of the default
content for the $GIT/description, the description template has other
text. One of these two patches should be applied to bring them into
order (applying both would just reverse the problem). Or, both
could be changed to the same new text.
-tkc
(not subscribed to the actual git ML, just git-users@googlegroups.com)
[-- Attachment #2: git_change_gitweb.diff --]
[-- Type: text/plain, Size: 660 bytes --]
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 168e8bf..7c4cb69 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -227,7 +227,7 @@ description (or `gitweb.description`)::
repository). Plain text file; HTML will be escaped. By default set to
+
-------------------------------------------------------------------------------
-Unnamed repository; edit this file to name it for gitweb.
+Unnamed repository; edit this file 'description' to name the repository.
-------------------------------------------------------------------------------
+
from the template during repository creation, usually installed in
[-- Attachment #3: git_change_template.diff --]
[-- Type: text/plain, Size: 314 bytes --]
diff --git a/templates/this--description b/templates/this--description
index 498b267..c6f25e8 100644
--- a/templates/this--description
+++ b/templates/this--description
@@ -1 +1 @@
-Unnamed repository; edit this file 'description' to name the repository.
+Unnamed repository; edit this file to name it for gitweb.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] minor diff between gitweb docs and actual template for $GIT/description
2013-01-11 0:33 [PATCH] minor diff between gitweb docs and actual template for $GIT/description Tim Chase
@ 2013-01-11 2:22 ` Jonathan Nieder
2013-01-11 4:25 ` Tim Chase
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Nieder @ 2013-01-11 2:22 UTC (permalink / raw)
To: Tim Chase; +Cc: git, Jakub Narebski
(+cc: Jakub, who maintains gitweb)
Hi Tim,
Tim Chase wrote:
> The documentation for gitweb gives one description of the default
> content for the $GIT/description, the description template has other
> text. One of these two patches should be applied to bring them into
> order (applying both would just reverse the problem). Or, both
> could be changed to the same new text.
May we have your sign-off? (See Documentation/SubmittingPatches for
what this means.)
> --- a/Documentation/gitweb.txt
> +++ b/Documentation/gitweb.txt
> @@ -227,7 +227,7 @@ description (or `gitweb.description`)::
> repository). Plain text file; HTML will be escaped. By default set to
> +
> -------------------------------------------------------------------------------
> -Unnamed repository; edit this file to name it for gitweb.
> +Unnamed repository; edit this file 'description' to name the repository.
> -------------------------------------------------------------------------------
> +
> from the template during repository creation, usually installed in
Looks sane to me. Thanks for noticing.
Regards,
Jonathan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] minor diff between gitweb docs and actual template for $GIT/description
2013-01-11 2:22 ` Jonathan Nieder
@ 2013-01-11 4:25 ` Tim Chase
0 siblings, 0 replies; 3+ messages in thread
From: Tim Chase @ 2013-01-11 4:25 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: git, Jakub Narebski
On 01/10/13 20:22, Jonathan Nieder wrote:
> (+cc: Jakub, who maintains gitweb)
> Hi Tim,
>
> Tim Chase wrote:
>
>> The documentation for gitweb gives one description of the default
>> content for the $GIT/description, the description template has other
>> text. One of these two patches should be applied to bring them into
>> order (applying both would just reverse the problem). Or, both
>> could be changed to the same new text.
>
> May we have your sign-off? (See Documentation/SubmittingPatches for
> what this means.)
Hahahahah...a one liner doc-fix copy/pasting code from one place in
the codebase to another? If you need it, you've got it:
For my one line diff:
Signed-off-by: Tim Chase <git@tim.thechases.com>
Otherwise, consider my contribution CC0 or public domain or whatever
suits you best. Or take my patch as a bug report and "make" the fix
yourself. :-)
The patches should have been based off the master branch of
github.com/git/git, FWIW.
-tkc
@gumnos
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-11 4:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-11 0:33 [PATCH] minor diff between gitweb docs and actual template for $GIT/description Tim Chase
2013-01-11 2:22 ` Jonathan Nieder
2013-01-11 4:25 ` Tim Chase
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).