Unify @env{$...} usage

diff --git a/doc/building.texi b/doc/building.texi
index bd26c5da6bd9b010af45a628e69a6f30e61170db..e6699233e0bab2f24241591b5d04159a184b8f79 100644 (file)
--- a/doc/building.texi
+++ b/doc/building.texi
@@ -34,7 +34,7 @@ in tarball. Following ones are tested to work with:
 @url{https://redo.readthedocs.io/, apenwarr/redo} (@code{contrib/do} is
 from that project), @url{https://github.com/leahneukirchen/redo-c, redo-c}.
 
-There is @command{install} target respecting @env{DESTDIR}. It will
+There is @command{install} target respecting @env{$DESTDIR}. It will
 install binaries and info-documentation:
 
 @example

diff --git a/doc/cmd/index.texi b/doc/cmd/index.texi
index b4cdce8c52e3ec46da202a8b09c5f5c801362c90..5727db82ba9538656e363d5ab19c4de3fb35aa1f 100644 (file)
--- a/doc/cmd/index.texi
+++ b/doc/cmd/index.texi
@@ -5,7 +5,7 @@ Nearly all commands have the following common options:
 
 @table @option
 @item -cfg
-    Path to configuration file. May be overridden by @env{NNCPCFG}
+    Path to configuration file. May be overridden by @env{$NNCPCFG}
     environment variable. If file file is an encrypted @ref{EBlob,
     eblob}, then ask for passphrase to decrypt it first.
 @item -debug
@@ -26,9 +26,9 @@ Nearly all commands have the following common options:
     With @verb{|-via -|} you can disable relaying at all.
 @item -spool
     Override path to spool directory. May be specified by
-    @env{NNCPSPOOL} environment variable.
+    @env{$NNCPSPOOL} environment variable.
 @item -log
-    Override path to logfile. May be specified by @env{NNCPLOG}
+    Override path to logfile. May be specified by @env{$NNCPLOG}
     environment variable.
 @item -quiet
     Print only errors, omit simple informational messages. In any case

diff --git a/doc/cmd/nncp-file.texi b/doc/cmd/nncp-file.texi
index 29f061af29b9f666cc3d9f02e6e7d1b51525125a..24dafde0c554b486e35b44d52701a7226b9957fd 100644 (file)
--- a/doc/cmd/nncp-file.texi
+++ b/doc/cmd/nncp-file.texi
@@ -21,7 +21,7 @@ file and copy everything taken from @code{stdin} to it and use for outbound
 packet creation. Pay attention that if you want to send 1 GiB of data
 taken from @code{stdin}, then you have to have more than 2 GiB of disk space
 for that temporary file and resulting encrypted packet. You can control
-temporary file location directory with @env{TMPDIR} environment
+temporary file location directory with @env{$TMPDIR} environment
 variable. Encryption is performed in AEAD mode with
 @url{https://cr.yp.to/chacha.html, ChaCha20}-@url{https://en.wikipedia.org/wiki/Poly1305, Poly1305}
 algorithms. Data is divided on 128 KiB blocks. Each block is encrypted

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index d2c5f832f9b3de906ae88573a12b33c6d5accec7..497509ddffaafcf62a18c58cb938393649a10d5b 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -359,7 +359,7 @@ online демоны не выполнят проверку целостност
 Вы можете настраивать опции автоматического tosser для каждого вызова.
 
 @item
-Использовать vendoring вместо переопределения @env{GOPATH} во время
+Использовать vendoring вместо переопределения @env{$GOPATH} во время
 установки tarball, так как текущая минимальная версия Go это 1.12,
 поддерживающая модули.
 
@@ -370,7 +370,7 @@ online демоны не выполнят проверку целостност
 @itemize
 
 @item
-Уважать @env{BINDIR}, @env{INFODIR} и @env{DOCDIR} переменные окружения
+Уважать @env{$BINDIR}, @env{$INFODIR} и @env{$DOCDIR} переменные окружения
 в @file{config} во время установки.
 
 @end itemize
@@ -761,7 +761,7 @@ Chunked файлы, меньшего размера чем указанный ch
 
 @item
 Exec команды вызываются с дополнительными переменными окружения
-@env{NNCP_NICE} и @env{NNCP_SELF}.
+@env{$NNCP_NICE} и @env{$NNCP_SELF}.
 
 @item
 Отправляемые файлы в ответ на запрос имеют приоритет указанный в запросе.
@@ -837,7 +837,7 @@ HKDF-BLAKE2b-256 KDF алгоритм заменён на BLAKE2Xb XOF. Ещё 
 @node Релиз 0.12
 @subsection Релиз 0.12
 @itemize
-@item Команда sendmail вызывается с @env{NNCP_SENDER} переменной окружения.
+@item Команда sendmail вызывается с @env{$NNCP_SENDER} переменной окружения.
 @end itemize
 
 @node Релиз 0.11

diff --git a/doc/news.texi b/doc/news.texi
index 48f5ec0dedbdf1877fee59ee19c91d73d535a3cc..80153a83ad4956354579397fcd50d2e67a1bf542 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -350,7 +350,7 @@ second while it is active.
 automatic tosser options.
 
 @item
-Use vendoring, instead of @env{GOPATH} overriding during tarball
+Use vendoring, instead of @env{$GOPATH} overriding during tarball
 installation, because current minimal Go's version is 1.12 and it
 supports modules.
 
@@ -361,7 +361,7 @@ supports modules.
 @itemize
 
 @item
-Respect for @env{BINDIR}, @env{INFODIR} and @env{DOCDIR} environment
+Respect for @env{$BINDIR}, @env{$INFODIR} and @env{$DOCDIR} environment
 variables in @file{config} during installation.
 
 @end itemize
@@ -738,8 +738,8 @@ Chunked files, having size less than specified chunk size, will be sent
 as an ordinary single file.
 
 @item
-Exec commands are invoked with additional @env{NNCP_NICE} and
-@env{NNCP_SELF} environment variables.
+Exec commands are invoked with additional @env{$NNCP_NICE} and
+@env{$NNCP_SELF} environment variables.
 
 @item
 Files, that are sent as a reply to freq, have niceness level taken from
@@ -815,7 +815,7 @@ command line argument, or environment variable.
 @node Release 0_12
 @section Release 0.12
 @itemize
-@item Sendmail command is called with @env{NNCP_SENDER} environment variable.
+@item Sendmail command is called with @env{$NNCP_SENDER} environment variable.
 @end itemize
 
 @node Release 0_11

diff --git a/doc/pkt/plain.texi b/doc/pkt/plain.texi
index 211bdd2a8cc74b981a8f406316ad48e946ab66a5..46d66eadc9450e5800d8ecc3e8b234d6a24500e0 100644 (file)
--- a/doc/pkt/plain.texi
+++ b/doc/pkt/plain.texi
@@ -67,7 +67,7 @@ Also depending on packet's type, niceness level means:
 
 @itemize
 @item Preferable niceness level for files sent by freq
-@item @env{NNCP_NICE} variable's value passed during @ref{CfgExec} invocation.
+@item @env{$NNCP_NICE} variable's value passed during @ref{CfgExec} invocation.
 @end itemize
 
 So plain packets can hold following paths and payloads: