summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2020-12-18 21:00:29 +0000
committerJulian Andres Klode <jak@debian.org>2020-12-18 21:00:29 +0000
commit06ec0067057e0578f3bc515f6a97d6a9d70824f6 (patch)
treee0cb170d0a4f8caff89c2402bf24e6951b716360 /doc
parentece7f5bb0afee0994a4fb4380e756ce725fe67a9 (diff)
parenta5859bafdaa6bcf12934d0fb1715a5940965e13a (diff)
Merge branch 'pu/uriencode' into 'master'
Use encoded URIs in the acquire system See merge request apt-team/apt!139
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/configure-index2
-rw-r--r--doc/method.dbk4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0af923811..b73166082 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -223,6 +223,8 @@ Acquire
Retries "<INT>";
Source-Symlinks "<BOOL>";
ForceHash "<STRING>"; // hashmethod used for expected hash: sha256, sha1 or md5sum
+ Send-URI-Encoded "<BOOL>"; // false does the old encode/decode dance even if we could avoid it
+ URIEncode "<STRING>"; // characters to encode with percent encoding
AllowTLS "<BOOL>"; // whether support for tls is enabled
diff --git a/doc/method.dbk b/doc/method.dbk
index 410d6898c..ea49c5b54 100644
--- a/doc/method.dbk
+++ b/doc/method.dbk
@@ -522,8 +522,8 @@ This is a list of which headers each status code can use
<para>
Displays the capabilities of the method. Methods should set the pipeline bit
if their underlying protocol supports pipelining. The only known method that
-does support pipelining is http. Fields: Version, Single-Instance, Pre-Scan,
-Pipeline, Send-Config, Needs-Cleanup
+does support pipelining is http. Fields: Version, Single-Instance, Local-Only,
+Pipeline, Send-Config, Needs-Cleanup, Removable, AuxRequests, Send-URI-Encoded
</para>
</listitem>
</varlistentry>