git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org, Drew Northup <drew.northup@maine.edu>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	John 'Warthog9' Hawley <warthog9@kernel.org>,
	admin@repo.or.cz, Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH/RFCv4 1/4] Documentation: Preparation for gitweb manpages
Date: Sun, 18 Sep 2011 15:34:41 +0200	[thread overview]
Message-ID: <1316352884-26193-2-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <1316352884-26193-1-git-send-email-jnareb@gmail.com>

Gitweb documentation currently consist of gitweb/README, gitweb/INSTALL
and comments in gitweb source code.  This is harder to find, use and
browse that manpages ("man gitweb" or "git help gitweb") and HTML
documentation ("git help --web gitweb").

The goal is to move documentation out of gitweb/README to gitweb.txt and
gitweb.conf.txt manpages, reducing its size 10x from around 500 to
around 50 lines (two pages), and move information not related drectly to
building and installing gitweb out of gitweb/INSTALL there.

The idea is to have gitweb manpage sources reside in AsciiDoc format
in Documentation/ directory, like for gitk and git-gui.  Alternate
solution would be to have gitweb documentation in gitweb/ directory,
perhaps in POD format (see perlpod(1)).


This patch adds infrastructure for easy generating gitweb-related
manpages.  It adds currently empty 'gitweb-doc' target to
Documentation/Makefile, and 'doc' proxy target to gitweb's Makefile.

This way to build gitweb documentation one can use

  make -C gitweb doc

or

  cd gitweb; make doc

The gitweb.conf(5) and gitweb(1) manpages will be added in subsequent
commits.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
This changes were part of patch adding first gitweb manpage in
previous version of this series.

Compared to v3 series it lacks the following hunk (at the very end of
Documentation/Makefile):

  @@ -334,4 +337,4 @@ quick-install-man:
   quick-install-html:
   	'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
  
  -.PHONY: FORCE
  +.PHONY: FORCE gitweb-doc

This is because it would introduce inconsistency, as 'gitweb-doc'
would be only one of many phony targets in Documentation/Makefile
that is explicitly marked .PHONY

So this is something left for other commit.

 Documentation/Makefile |    3 +++
 gitweb/Makefile        |    7 ++++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 6346a75..44be67b 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -170,6 +170,9 @@ info: git.info gitman.info
 
 pdf: user-manual.pdf
 
+GITWEB_DOC = $(filter gitweb.%,$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7))
+gitweb-doc: $(GITWEB_DOC)
+
 install: install-man
 
 install-man: man
diff --git a/gitweb/Makefile b/gitweb/Makefile
index 1c85b5f..3014d80 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -174,6 +174,11 @@ test-installed:
 	GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
 		$(MAKE) -C ../t gitweb-test
 
+### Documentation
+
+doc:
+	$(MAKE) -C ../Documentation gitweb-doc
+
 ### Installation rules
 
 install: all
@@ -187,5 +192,5 @@ install: all
 clean:
 	$(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
 
-.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE
+.PHONY: all clean install test test-installed doc .FORCE-GIT-VERSION-FILE FORCE
 
-- 
1.7.6

  reply	other threads:[~2011-09-18 13:35 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-18 13:34 [PATCH/RFCv4 0/4] Moving gitweb documentation to manpages Jakub Narebski
2011-09-18 13:34 ` Jakub Narebski [this message]
2011-09-19 23:37   ` [PATCH/RFCv4 1/4] Documentation: Preparation for gitweb manpages Jonathan Nieder
2011-09-20  0:10     ` Jakub Narebski
2011-09-20 20:11     ` Jakub Narebski
2011-09-20 20:19       ` Jonathan Nieder
2011-09-20 20:33         ` Jakub Narebski
2011-09-18 13:34 ` [PATCH/RFCv4 2/4] gitweb: Add manpage for /etc/gitweb.conf (for gitweb documentation) Jakub Narebski
2011-09-20  4:41   ` Jonathan Nieder
2011-09-22 13:41     ` Jakub Narebski
2011-09-18 13:34 ` [PATCH/RFCv4 3/4] gitweb: Add manpage for gitweb Jakub Narebski
2011-09-18 13:34 ` [PATCH/RFCv4 4/4] gitweb: Add gitweb manpages to 'gitweb' package in git.spec Jakub Narebski

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=1316352884-26193-2-git-send-email-jnareb@gmail.com \
    --to=jnareb@gmail.com \
    --cc=admin@repo.or.cz \
    --cc=drew.northup@maine.edu \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=warthog9@kernel.org \
    /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).