From: Junio C Hamano <gitster@pobox.com>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Max Horn <max@quendi.de>
Subject: Re: [PATCH] Rename {git- => git}remote-helpers.txt
Date: Thu, 31 Jan 2013 14:43:20 -0800 [thread overview]
Message-ID: <7vtxpxdldj.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130131222817.GP1342@serenity.lan> (John Keeping's message of "Thu, 31 Jan 2013 22:28:17 +0000")
John Keeping <john@keeping.me.uk> writes:
> Yes. Should I change it to "git-remote-helpers.html.in" and then copy
> it into place? That seems like the simplest answer and means that
> "*.html" will continue to refer only to generated files.
I'd like to see if we can have a way to keep its look as the default
css gets updated without maintainance burden.
How about using AsciiDoc instead of "cp", perhaps like this on top
of your patch?
Documentation/.gitignore | 1 -
Documentation/Makefile | 9 +++++-
Documentation/git-remote-helpers.txto | 26 +++++++++++++++++
Documentation/git-remote-helpers.html | 55 -----------------------------------
4 files changed, 34 insertions(+), 57 deletions(-)
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 4685378..d62aebd 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -1,6 +1,5 @@
*.xml
*.html
-!git-remote-helpers.html
*.[1-8]
*.made
*.texi
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 13e0098..fa2f9f9 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -13,7 +13,8 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
-DOC_HTML=$(MAN_HTML) git-remote-helpers.html
+OBSOLETE_HTML = git-remote-helpers.html
+DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML)
ARTICLES = howto-index
ARTICLES += everyday
@@ -261,6 +262,12 @@ $(MAN_HTML): %.html : %.txt asciidoc.conf
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
mv $@+ $@
+$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
+ $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+ $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
+ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
+ mv $@+ $@
+
manpage-base-url.xsl: manpage-base-url.xsl.in
sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
diff --git a/Documentation/git-remote-helpers.txto b/Documentation/git-remote-helpers.txto
new file mode 100644
index 0000000..a966013
--- /dev/null
+++ b/Documentation/git-remote-helpers.txto
@@ -0,0 +1,25 @@
+git-remote-helpers(1)
+=====================
+
+NAME
+----
+git-remote-helpers - obsoleted page
+
+SYNOPSIS
+--------
+See linkgit:gitremote-helpers[1].
+
+DESCRIPTION
+-----------
+This document has been moved to linkgit:gitremote-helpers[1].
+
+Please let the owners of the referring site know so that they can update the
+link you clicked to get here.
+
+SEE ALSO
+--------
+linkgit:gitremote-helpers[1]
+
+GIT
+---
+No longer a part of the linkgit:git[1] suite
diff --git a/Documentation/git-remote-helpers.html b/Documentation/git-remote-helpers.html
deleted file mode 100644
index 0c5ec27..0000000
--- a/Documentation/git-remote-helpers.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<title>git-remote-helpers(1) - Document Moved</title>
-<style type="text/css">
-/* Cut-down styles from asciidoc.css. */
-
-/* Default font. */
-body {
- font-family: Georgia,serif;
-}
-
-/* Title font. */
-h1 {
- font-family: Arial,Helvetica,sans-serif;
-}
-
-body {
- margin: 1em 5% 1em 5%;
-}
-
-a {
- color: blue;
- text-decoration: underline;
-}
-a:visited {
- color: fuchsia;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #527bbd;
- margin-top: 1.2em;
- margin-bottom: 0.5em;
- line-height: 1.3;
-}
-
-</style>
-</head>
-<body class="manpage">
-<div id="header">
-<h1>
-Document Moved
-</h1>
-</div>
-
-<p>This document is now called <a
-href="gitremote-helpers.html">gitremote-helpers</a>.</p>
-
-<p>Please let the owners of the referring site know so that they can update the
-link you clicked to get here.</p>
-
-</body>
-</html>
next prev parent reply other threads:[~2013-01-31 22:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-30 20:11 git-remote-helpers.txt: should it be gitremote-helpers.txt? John Keeping
2013-01-30 20:28 ` Junio C Hamano
2013-01-31 20:08 ` [PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt John Keeping
2013-01-31 20:18 ` Matthieu Moy
2013-01-31 20:36 ` Junio C Hamano
2013-01-31 21:59 ` [PATCH] Rename {git- => git}remote-helpers.txt John Keeping
2013-01-31 22:13 ` Junio C Hamano
2013-01-31 22:28 ` John Keeping
2013-01-31 22:43 ` Junio C Hamano [this message]
2013-01-31 22:56 ` John Keeping
2013-01-31 23:49 ` Junio C Hamano
2013-01-31 22:33 ` Jeff King
2013-01-31 22:48 ` Junio C Hamano
2013-01-31 23:04 ` Jonathan Nieder
2013-01-31 23:11 ` Junio C Hamano
2013-01-31 23:13 ` Jonathan Nieder
2013-02-01 5:03 ` Jeff King
2013-02-01 5:37 ` Junio C Hamano
2013-02-01 7:33 ` Jeff King
2013-02-01 8:25 ` Jeff King
2013-02-01 8:26 ` [PATCH 1/2] Documentation/Makefile: clean up MAN*_TXT lists Jeff King
2013-02-01 19:20 ` Jonathan Nieder
2013-02-01 19:38 ` Junio C Hamano
2013-02-01 19:38 ` Jeff King
2013-02-01 19:41 ` Jeff King
2013-02-01 8:27 ` [PATCH 2/2] docs: convert "concept" manpages to git-* Jeff King
2013-02-01 19:25 ` Jonathan Nieder
2013-02-01 18:52 ` [PATCH] Rename {git- => git}remote-helpers.txt Junio C Hamano
2013-02-01 19:00 ` Jeff King
2013-02-01 22:15 ` Junio C Hamano
2013-01-31 22:28 ` [PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt Tomas Carnecky
2013-01-31 22:45 ` Junio C Hamano
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=7vtxpxdldj.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=max@quendi.de \
/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).