Merge branch 'cc/help'

* cc/help:
RPM spec: Adjust htmldir
git-help -w: do not require to be in git repository
git.spec.in: remove python_path
Documentation: rename git.texi to user-manual.texi
Add git-browse-help to .gitignore
git-help -i: show info documentation from matching version of git
git-help -i: invoke info with document and node name
Documentation: add gitman.info target
Documentation: describe -w/--web option to "git-help".
Use {web,instaweb,help}.browser config options.
git-help: add -w|--web option to display html man page in a browser.
Documentation: describe -i/--info option to "git-help"
git-help: add -i|--info option to display info page.

diff --combined Makefile
index 3615be0b730727d557589f7a1c3117beab6ad77a,f20b8c0092282778ecc2d68d2df49d3f006dce91..16de2f3e252ad2b3324c0c439ad6e771e4ca358c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -155,9 -155,11 +155,11 @@@ STRIP ?= stri
  prefix = $(HOME)
  bindir = $(prefix)/bin
  mandir = $(prefix)/share/man
+ infodir = $(prefix)/share/info
  gitexecdir = $(bindir)
  sharedir = $(prefix)/share
  template_dir = $(sharedir)/git-core/templates
+ htmldir=$(sharedir)/doc/git-doc
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  else
@@@ -184,7 -186,7 +186,7 @@@ GITWEB_FAVICON = git-favicon.pn
  GITWEB_SITE_HEADER =
  GITWEB_SITE_FOOTER =
  
- export prefix bindir gitexecdir sharedir template_dir sysconfdir
+ export prefix bindir gitexecdir sharedir template_dir htmldir sysconfdir
  
  CC = gcc
  AR = ar
@@@ -224,7 -226,8 +226,8 @@@ SCRIPT_SH = 
        git-merge-resolve.sh \
        git-lost-found.sh git-quiltimport.sh git-submodule.sh \
        git-filter-branch.sh \
-       git-stash.sh
+       git-stash.sh \
+       git-browse-help.sh
  
  SCRIPT_PERL = \
        git-add--interactive.perl \
@@@ -748,8 -751,10 +751,10 @@@ ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC
  DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
  bindir_SQ = $(subst ','\'',$(bindir))
  mandir_SQ = $(subst ','\'',$(mandir))
+ infodir_SQ = $(subst ','\'',$(infodir))
  gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
  template_dir_SQ = $(subst ','\'',$(template_dir))
+ htmldir_SQ = $(subst ','\'',$(htmldir))
  prefix_SQ = $(subst ','\'',$(prefix))
  
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@@ -795,7 -800,9 +800,9 @@@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS
                $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
  
  help.o: help.c common-cmds.h GIT-CFLAGS
-       $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_MAN_PATH="$(mandir_SQ)"' $<
+       $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
+               '-DGIT_MAN_PATH="$(mandir_SQ)"' \
+               '-DGIT_INFO_PATH="$(infodir_SQ)"' $<
  
  git-merge-subtree$X: git-merge-recursive$X
        $(QUIET_BUILT_IN)$(RM) $@ && ln git-merge-recursive$X $@
@@@ -814,6 -821,7 +821,7 @@@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %
            -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
+           -e 's|@@HTMLDIR@@|$(htmldir_SQ)|g' \
            $@.sh >$@+ && \
        chmod +x $@+ && \
        mv $@+ $@
@@@ -1025,7 -1033,7 +1033,7 @@@ install: al
        $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
        $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
        $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 -      $(MAKE) -C perl prefix='$(prefix_SQ)' install
 +      $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK
        $(MAKE) -C gitk-git install
        $(MAKE) -C git-gui install