From fefb1bf2cc1f40de99a72e3b0b3cea24dcdcf6d7 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 1 Dec 2023 00:04:00 +0100 Subject: [PATCH 1/4] Use codeblocks to preserve line breaks Signed-off-by: Roger Sheen --- topics/configuring-the-proxy.dita | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/topics/configuring-the-proxy.dita b/topics/configuring-the-proxy.dita index e0bae05d..2c12af8c 100644 --- a/topics/configuring-the-proxy.dita +++ b/topics/configuring-the-proxy.dita @@ -44,19 +44,19 @@ Linux or macOS  - export ANT_OPTS="-Dhttp.proxySet=true \ - -Dhttps.proxyHost=<HTTPS proxy IP address> \ - -Dhttp.proxyHost=<HTTP proxy IP address> \ - -Dhttp.proxyPort=<HTTP proxy port> \ - -Dhttps.proxyPort=<HTTPS proxy port>" + export ANT_OPTS="-Dhttp.proxySet=true \ + -Dhttps.proxyHost=<HTTPS proxy IP address> \ + -Dhttp.proxyHost=<HTTP proxy IP address> \ + -Dhttp.proxyPort=<HTTP proxy port> \ + -Dhttps.proxyPort=<HTTPS proxy port>" Windows - set ANT_OPTS=%ANT_OPTS% -Dhttp.proxySet=true \ - -Dhttps.proxyHost=<HTTPS proxy IP address> \ - -Dhttp.proxyHost=<HTTP proxy IP address> \ - -Dhttp.proxyPort=<HTTP proxy port> \ - -Dhttps.proxyPort=<HTTPS proxy port> + set ANT_OPTS=%ANT_OPTS% -Dhttp.proxySet=true ^ + -Dhttps.proxyHost=<HTTPS proxy IP address> ^ + -Dhttp.proxyHost=<HTTP proxy IP address> ^ + -Dhttp.proxyPort=<HTTP proxy port> ^ + -Dhttps.proxyPort=<HTTPS proxy port> From 7caab940ca12901fda287026df0eadf2e549ac43 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 1 Dec 2023 00:21:31 +0100 Subject: [PATCH 2/4] Implement review feedback Per https://github.com/dita-ot/docs/pull/501#pullrequestreview-1673694513 Signed-off-by: Roger Sheen --- parameters/dita-command-arguments.dita | 9 +++++---- topics/configuring-the-proxy.dita | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/parameters/dita-command-arguments.dita b/parameters/dita-command-arguments.dita index 5eaa5332..08038351 100644 --- a/parameters/dita-command-arguments.dita +++ b/parameters/dita-command-arguments.dita @@ -107,10 +107,11 @@ - The dita install command uses a network connection for - installing and downloading content. In environments where an HTTP proxy is used to establish - a network connection, provide the proxy configuration via the ANT_OPTS - environment variable. For more information, see Configuring the proxy. + The dita install command uses a network connection to install plug-ins from + the configured registry or process remote referenced resources. In environments where an HTTP proxy is used to + establish a network connection, you can provide the proxy configuration via the ANT_OPTS + environment variable. For more information, see + . Prior to DITA-OT 3.5, subcommands were specified with the double-hyphen option syntax, which is still supported for backwards compatibility. (For example, dita --install will still work.) diff --git a/topics/configuring-the-proxy.dita b/topics/configuring-the-proxy.dita index 2c12af8c..a5fd99c9 100644 --- a/topics/configuring-the-proxy.dita +++ b/topics/configuring-the-proxy.dita @@ -6,9 +6,9 @@ Configuring the proxy - Certain commands, for example, the dita install command, use a - network connection for installing and downloading content. In environments where an HTTP proxy - is used to establish a network connection, provide the proxy configuration via the + Certain commands, for example, the dita install command, use a network connection to + install plug-ins from the configured registry or process remote referenced resources. In environments where an HTTP + proxy is used to establish a network connection, you can provide the proxy configuration via the ANT_OPTS environment variable. From d97d8692d03a3a27b7b8119979f56b3f5d1da36a Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 1 Dec 2023 00:34:15 +0100 Subject: [PATCH 3/4] Move proxy tip to install subcommand description Signed-off-by: Roger Sheen --- parameters/dita-command-arguments.dita | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/parameters/dita-command-arguments.dita b/parameters/dita-command-arguments.dita index 08038351..a3d77dfe 100644 --- a/parameters/dita-command-arguments.dita +++ b/parameters/dita-command-arguments.dita @@ -107,11 +107,6 @@ - The dita install command uses a network connection to install plug-ins from - the configured registry or process remote referenced resources. In environments where an HTTP proxy is used to - establish a network connection, you can provide the proxy configuration via the ANT_OPTS - environment variable. For more information, see - . Prior to DITA-OT 3.5, subcommands were specified with the double-hyphen option syntax, which is still supported for backwards compatibility. (For example, dita --install will still work.) @@ -194,6 +189,13 @@ Install a single plug-in ID from the registry at (or a local registry), from a remote URL, or a local ZIP file. + + The dita install command uses a network connection to install plug-ins + from the configured registry or process remote referenced resources. In environments where an HTTP proxy + is used to establish a network connection, you can provide the proxy configuration via the + ANT_OPTS environment variable. For more information, see + . + From 40ab609c9e227f461d177e1d799302c14d2e02d9 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 1 Dec 2023 00:40:00 +0100 Subject: [PATCH 4/4] Use plural form in proxy configuration filename Signed-off-by: Roger Sheen --- parameters/dita-command-arguments.dita | 2 +- resources/source-files.ditamap | 2 +- topics/{configuring-the-proxy.dita => configuring-proxies.dita} | 2 +- topics/troubleshooting.ditamap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename topics/{configuring-the-proxy.dita => configuring-proxies.dita} (99%) diff --git a/parameters/dita-command-arguments.dita b/parameters/dita-command-arguments.dita index a3d77dfe..4245a805 100644 --- a/parameters/dita-command-arguments.dita +++ b/parameters/dita-command-arguments.dita @@ -194,7 +194,7 @@ from the configured registry or process remote referenced resources. In environments where an HTTP proxy is used to establish a network connection, you can provide the proxy configuration via the ANT_OPTS environment variable. For more information, see - . + . diff --git a/resources/source-files.ditamap b/resources/source-files.ditamap index 813e027d..c89c33e0 100644 --- a/resources/source-files.ditamap +++ b/resources/source-files.ditamap @@ -18,7 +18,7 @@ - + diff --git a/topics/configuring-the-proxy.dita b/topics/configuring-proxies.dita similarity index 99% rename from topics/configuring-the-proxy.dita rename to topics/configuring-proxies.dita index a5fd99c9..41e59630 100644 --- a/topics/configuring-the-proxy.dita +++ b/topics/configuring-proxies.dita @@ -1,7 +1,7 @@ - + Configuring the proxy Configuring the proxy diff --git a/topics/troubleshooting.ditamap b/topics/troubleshooting.ditamap index face9e70..53011bb0 100644 --- a/topics/troubleshooting.ditamap +++ b/topics/troubleshooting.ditamap @@ -11,6 +11,6 @@ - +