Merge lp:~kroq-gar78/ubuntu/precise/sensible-utils/fix-977526 into lp:ubuntu/precise/sensible-utils

[Aditya V]

I added a description of what sensible-browser will default to for the variable BROWSER, which is not explained anywhere. I used Smylers' <email address hidden> suggestion for the changes.

[Michael Terry (mterry)]

Per my comment in bug 977526, I'll mark this branch as Work In Progress to keep it from showing up on the sponsor queue. I think this should go through Debian first.

Unmerged revisions

10. By Aditya V on 2012-04-10

sensible-editor.1: added explanation of BROWSER variable (LP: #977526)

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-30 18:30:28 +0000
+++ debian/changelog	2012-04-10 03:20:23 +0000
@@ -1,3 +1,9 @@
+sensible-utils (0.0.6ubuntu3) precise; urgency=low
+
+  * sensible-editor.1: added explanation of BROWSER variable (LP: #977526)
+
+ -- Aditya Vaidya <[e-mail]>  Mon, 09 Apr 2012 22:02:09 -0500
+
 sensible-utils (0.0.6ubuntu2) natty; urgency=low
 
   * Makefile.in: add select-editor and its manpage, LP: #682997

=== modified file 'sensible-editor.1'
--- sensible-editor.1	2010-11-29 20:02:40 +0000
+++ sensible-editor.1	2012-04-10 03:20:23 +0000
@@ -14,6 +14,14 @@
 make sensible decisions on which editor, pager, and web browser to call,
 respectively.  Programs in Debian can use these scripts
 as their default editor, pager, or web browser or emulate their behavior.
+.BR sensible-browser
+defaults to
+.BR gnome-www-browser (1)
+if the program is running under GNOME,
+.BR x-www-browser (1)
+if running under X, or
+.BR www-browser (1)
+if running under neither.
 .SH "SEE ALSO"
 Documentation of the EDITOR, VISUAL, PAGER, and BROWSER variables in
 .BR environ (7)