diff options
author | lianah <lianahady@gmail.com> | 2014-06-19 18:52:55 -0400 |
---|---|---|
committer | lianah <lianahady@gmail.com> | 2014-06-19 18:52:55 -0400 |
commit | 33324a13308886291d802d69a23993226d557d1a (patch) | |
tree | 7f153f077ed27aca65a543f828bc6e75eeafb26c | |
parent | 61258d16bb812c5b5c8fb8dade1d2b497c69570b (diff) | |
parent | b31dd70bd29e0dbce0a171799e648b499e54cb59 (diff) |
fixed merge conflict
-rwxr-xr-x | src/options/mkoptions | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/options/mkoptions b/src/options/mkoptions index de0986de1..f05de0571 100755 --- a/src/options/mkoptions +++ b/src/options/mkoptions @@ -1060,13 +1060,14 @@ function doc { if [ "$category" = EXPERT ]; then mansmtdoc="$mansmtdoc (EXPERTS only)" fi + altmanopt="`echo "$altopt" | sed 's,-,\\\\\\-,g'`" if [ "$category" = COMMON ]; then common_manpage_internals_documentation="${common_manpage_internals_documentation} .TP .B \"$internal\" $typedefault .br -.B \"This internal Boolean flag is undocumented; however, its alternate option$altopt which reverses the sense of the option, is documented thusly:\" +.B \"This internal Boolean flag is undocumented; however, its alternate option$altmanopt which reverses the sense of the option, is documented thusly:\" $mansmtdoc" else remaining_manpage_internals_documentation="${remaining_manpage_internals_documentation} @@ -1074,7 +1075,7 @@ $mansmtdoc" .B \"$internal\" $typedefault .br -.B \"This internal Boolean flag is undocumented; however, its alternate option$altopt which reverses the sense of the option, is documented thusly:\" +.B \"This internal Boolean flag is undocumented; however, its alternate option$altmanopt which reverses the sense of the option, is documented thusly:\" $mansmtdoc" fi else |