Merge branch 'master' into xbs

Conflicts:
	src/lib/conf.sh

2 files changed, 10 insertions, 1 deletions

diff --git a/src/lib/conf.sh b/src/lib/conf.sh
index 07b6fd5..561ae9e 100644
--- a/src/lib/conf.sh
+++ b/src/lib/conf.sh
@@ -81,6 +81,9 @@ list_envvars() {
 				PKGEXT SRCEXT \
 				GPGKEY PACKAGER
 			;;
+		libretools)
+			printf '%s\n' DIFFPROG
+			;;
 		xbs)
 			printf '%s\n' BUILDSYSTEM
 			;;
diff --git a/src/lib/libremessages.1.ronn b/src/lib/libremessages.1.ronn
index 970b950..b91a958 100644
--- a/src/lib/libremessages.1.ronn
+++ b/src/lib/libremessages.1.ronn
@@ -51,6 +51,8 @@ the command `help printf` from a Bash shell for more information.
 
 ### GENERAL ROUTINES
 
+Unless otherwise noted, these do not implicitly call `gettext`.
+
    * `_` <MESSAGE>:
      If `gettext` is available, calls `gettext`, otherwise just prints
      the arguments given.
@@ -61,7 +63,7 @@ the command `help printf` from a Bash shell for more information.
 
    * `panic`:
      For the times when you can't reasonably continue, similar to
-     "assert" in some languages.
+     "assert" in some programming languages.
 
    * `term_title` <MESSAGE>...:
      Joins all arguments with whitespace, and sets the terminal title
@@ -72,6 +74,8 @@ the command `help printf` from a Bash shell for more information.
 These routines print to standard output, ande are useful for printing
 word-wrapped prose.
 
+For each of these, <MESSAGE> is fed through `gettext` automatically.
+
    * `print` <MESSAGE> [<ARGS>...]:
      Like `printf`(1), but `gettext`-aware, and automatically prints a
      trailing newline.
@@ -102,6 +106,8 @@ These routines print to standard error, and all take arguments in the
 same format as `printf`(1), except for `stat_done`, which doesn't take
 any arguments.
 
+For each of these, <MESSAGE> is fed through `gettext` automatically.
+
    * `plain` <MESSAGE> [<ARGS>...]:
      Prints "plain" message in bold, indented with 4 spaces.