Merge branch 'cc/browser'

* cc/browser:
  Documentation: add 'git-web--browse.txt' and simplify other docs.
  git-web--browse: fix misplaced quote in init_browser_path()
  web--browse: Add a few quotes in 'init_browser_path'.
  Documentation: instaweb: add 'git-web--browse' information.
  Adjust .gitignore for 5884f1(Rename 'git-help--browse.sh'...)
  git-web--browse: do not start the browser with nohup
  instaweb: use 'git-web--browse' to launch browser.
  Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
  help--browse: add '--config' option to check a config option for a browser.
  help: make 'git-help--browse' usable outside 'git-help'.

Conflicts:

	git-web--browse.sh

diff --cc git-web--browse.sh
index 84e37ef279b11a1461854a7cf37dc962d43e7050,fbf29cbe16a4c6b5fd78b12e130e4b06199ead71..1023b9085989aecfdcdc161232ee22de866d5f57
--- 1/git-help--browse.sh
--- 2/git-web--browse.sh
+++ b/git-web--browse.sh
@@@ -23,14 -23,9 +23,9 @@@ USAGE='[--browser=browser|--tool=browse
  NONGIT_OK=Yes
  . git-sh-setup
  
- # Install data.
- html_dir="@@HTMLDIR@@"
- 
- test -f "$html_dir/git.html" || die "No documentation directory found."
- 
  valid_tool() {
        case "$1" in
 -              firefox | iceweasel | konqueror | w3m | links | lynx | dillo)
 +              firefox | iceweasel | konqueror | w3m | links | lynx | dillo | open)
                        ;; # happy
                *)
                        return 1
@@@ -144,10 -147,10 +151,10 @@@ case "$browser" i
                ;;
        esac
        ;;
 -    w3m|links|lynx)
 +    w3m|links|lynx|open)
-       eval "$browser_path" $pages
+       eval "$browser_path" "$@"
        ;;
      dillo)
-       nohup "$browser_path" $pages &
+       "$browser_path" "$@" &
        ;;
  esac

diff --cc help.c
Simple merge