3 files changed, 84 insertions, 0 deletions
diff --git a/doc/info/chap/error-reporting.texinfo b/doc/info/chap/error-reporting.texinfo
index 2a438e0..7059630 100644
--- a/doc/info/chap/error-reporting.texinfo
+++ b/doc/info/chap/error-reporting.texinfo
@@ -335,6 +335,13 @@ the @command{slibc}'s implementation will
 print the full process name, or more precisely,
 it prints @code{program_invocation_name}.
 
+@ifnottex
+Etymology: Print (warn)ing!
+@end ifnottex
+@iftex
+Etymology: Print @b{warn}ing!
+@end iftex
+
 @item void vwarn(const char* format, va_list args)
 @fnindex vwarn
 @hfindex err.h
@@ -345,6 +352,13 @@ the header file @file{<err.h>}. It is identical
 to @code{warn} except it uses @code{va_list}
 instead of being a variadic function.
 
+@ifnottex
+Etymology: (V)ariadic version of (`warn`).
+@end ifnottex
+@iftex
+Etymology: @b{V}ariadic version of @b{warn}.
+@end iftex
+
 @item void warnx(const char* format, ...)
 @fnindex warnx
 @hfindex err.h
@@ -355,6 +369,13 @@ the header file @file{<err.h>}. It is identical
 to @code{warn} except it does not print a
 description of the value of @code{errno}.
 
+@ifnottex
+Etymology: (`warn`), [x=](lesser variant).
+@end ifnottex
+@iftex
+Etymology: @b{warn}, [x=]@b{lesser variant}.
+@end iftex
+
 @item void vwarnx(const char* format, va_list args)
 @fnindex vwarnx
 @hfindex err.h
@@ -365,6 +386,13 @@ the header file @file{<err.h>}. It is identical
 to @code{warnx} except it uses @code{va_list}
 instead of being a variadic function.
 
+@ifnottex
+Etymology: (V)ariadic version of (`warnx`).
+@end ifnottex
+@iftex
+Etymology: @b{V}ariadic version of @b{warnx}.
+@end iftex
+
 @item noreturn void err(int status, const char* format, ...)
 @fnindex err
 @hfindex err.h
@@ -375,6 +403,13 @@ the header file @file{<err.h>}. It is identical
 to @code{warn} except will return with the
 exit value @code{status & 255}.
 
+@ifnottex
+Etymology: Report (err)or!
+@end ifnottex
+@iftex
+Etymology: Report @b{err}or!
+@end iftex
+
 @item noreturn void verr(int status, const char* format, va_list args)
 @fnindex verr
 @hfindex err.h
@@ -385,6 +420,13 @@ the header file @file{<err.h>}. It is identical
 to @code{err} except it uses @code{va_list}
 instead of being a variadic function.
 
+@ifnottex
+Etymology: (V)ariadic version of (`err`).
+@end ifnottex
+@iftex
+Etymology: @b{V}ariadic version of @b{err}.
+@end iftex
+
 @item noreturn void errx(int status, const char* format, ...)
 @fnindex errx
 @hfindex err.h
@@ -395,6 +437,13 @@ the header file @file{<err.h>}. It is identical
 to @code{err} except it does not print a
 description of the value of @code{errno}.
 
+@ifnottex
+Etymology: (`err`), [x=](lesser variant).
+@end ifnottex
+@iftex
+Etymology: @b{err}, [x=]@b{lesser variant}.
+@end iftex
+
 @item noreturn void verrx(int status, const char* format, va_list args)
 @fnindex verrx
 @hfindex err.h
@@ -405,6 +454,13 @@ the header file @file{<err.h>}. It is identical
 to @code{errx} except it uses @code{va_list}
 instead of being a variadic function.
 
+@ifnottex
+Etymology: (V)ariadic version of (`errx`).
+@end ifnottex
+@iftex
+Etymology: @b{V}ariadic version of @b{errx}.
+@end iftex
+
 @item void error(int status, int errnum, const char* format, ...)
 @fnindex error
 @hfindex error.h
diff --git a/doc/info/chap/language-facilities.texinfo b/doc/info/chap/language-facilities.texinfo
index 19cfec0..fe27446 100644
--- a/doc/info/chap/language-facilities.texinfo
+++ b/doc/info/chap/language-facilities.texinfo
@@ -356,6 +356,13 @@ The expression must not have said effects.
 must not be evaluated if @code{NDEBUG} is
 defined. If @code{NDEBUG} is defined,
 @code{assert} has no effect, but is defined.
+
+@ifnottex
+Etymology: (Assertion).
+@end ifnottex
+@iftex
+Etymology: @b{Assert}ion.
+@end iftex
 @end table
 
 If @command{slibc} extensions or GNU extensions
@@ -369,6 +376,13 @@ This macro is identical to @code{assert}, except
 the argument should be an error code, and a
 description of it is printed before the process
 exits. (Nothing happens if @code{errnum} is zero.)
+
+@ifnottex
+Etymology: (@code{assert}) version of (@code{perror}).
+@end ifnottex
+@iftex
+Etymology: @b{assert} version of @b{perror}.
+@end iftex
 @end table
 
 @fnindex static_assert
@@ -382,6 +396,13 @@ is included. @code{static_assert} is similar to
 the message to print if the assertion failed,
 and the assertion is evaluated at compile-time.
 
+@ifnottex
+Etymology: (Static) (assert)ion.
+@end ifnottex
+@iftex
+Etymology: @b{Static} @b{assert}ion.
+@end iftex
+
 Assertions should only be used to make sure that
 impossible conditions are not reached.
 
diff --git a/doc/info/chap/memory-allocation.texinfo b/doc/info/chap/memory-allocation.texinfo
index 20136b0..1b7c778 100644
--- a/doc/info/chap/memory-allocation.texinfo
+++ b/doc/info/chap/memory-allocation.texinfo
@@ -233,6 +233,13 @@ void function(size_t n)
 Both of these allocation-methods are both automatic
 and dynamic.
 
+@ifnottex
+Etymology: (Alloca)te!
+@end ifnottex
+@iftex
+Etymology: @b{Alloca}te!
+@end iftex
+
 @cpindex Memory exhaustion
 Memory allocation functions return @code{NULL} if
 the process cannot allocate more memory. However,