diff options
| author | Robert Newson <rnewson@apache.org> | 2014-01-06 23:27:33 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2014-01-06 23:37:43 +0000 |
| commit | 9dd093df4577a889cd6ef2bb8fb6dfdd2f0381cb (patch) | |
| tree | 6facfa54a715239ad28e273df25046d7c0140e15 | |
| parent | fcd76c9cd4b115165a9904d2894741222f3a575c (diff) | |
| download | couchdb-9dd093df4577a889cd6ef2bb8fb6dfdd2f0381cb.tar.gz | |
Mention SOCKS5 protocol option in docs
COUCHDB-2025
| -rw-r--r-- | share/doc/src/api/server/common.rst | 2 | ||||
| -rw-r--r-- | share/doc/src/whatsnew/1.6.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/share/doc/src/api/server/common.rst b/share/doc/src/api/server/common.rst index 98bb19b56..4e5614c0c 100644 --- a/share/doc/src/api/server/common.rst +++ b/share/doc/src/api/server/common.rst @@ -359,7 +359,7 @@ jumping to ``offset`` bytes towards the beginning of the file first: Required administrator's privileges on target server. :<json array doc_ids: Array of document IDs to be synchronized :<json string proxy: Address of a proxy server through which replication - should occur + should occur (protocol can be "http" or "socks5") :<json string source: Source database name or URL :<json string target: Target database name or URL :>header Content-Type: - :mimetype:`application/json` diff --git a/share/doc/src/whatsnew/1.6.rst b/share/doc/src/whatsnew/1.6.rst index 2a0fc6ec0..28e5ac290 100644 --- a/share/doc/src/whatsnew/1.6.rst +++ b/share/doc/src/whatsnew/1.6.rst @@ -51,3 +51,4 @@ Version 1.6.0 * :issue:`1962`: Various replicator enhancements :commit:`1d5fe2aa` write access for checkpoints is not required on source db :commit:`0693f98e` make the replication checkpoint interval configurable + :issue:`2025`: Support SOCKS5 protocol for replication sources and targets |