You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fl...@apache.org on 2021/01/25 10:33:58 UTC
[couchdb-documentation] branch main updated: fixing links after
branch rename (master -> main) (#616)
This is an automated email from the ASF dual-hosted git repository.
flimzy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
The following commit(s) were added to refs/heads/main by this push:
new 9092932 fixing links after branch rename (master -> main) (#616)
9092932 is described below
commit 9092932cd26736d132e40cbacb9b4ef28f759205
Author: Ronny <ro...@kioskkinder.com>
AuthorDate: Mon Jan 25 11:33:49 2021 +0100
fixing links after branch rename (master -> main) (#616)
---
.github/PULL_REQUEST_TEMPLATE.md | 2 +-
CONTRIBUTING.md | 2 +-
README.md | 2 +-
rfcs/008-map-indexes.md | 2 +-
rfcs/011-opentracing.md | 10 +++++-----
rfcs/013-node-types.md | 2 +-
rfcs/016-fdb-replicator.md | 12 ++++++------
src/best-practices/reverse-proxies.rst | 2 +-
src/ddocs/views/collation.rst | 2 +-
src/query-server/javascript.rst | 2 +-
src/replication/protocol.rst | 2 +-
src/setup/cluster.rst | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7a14b07..c538e44 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -36,5 +36,5 @@
## Checklist
-- [ ] Update [rebar.config.script](https://github.com/apache/couchdb/blob/master/rebar.config.script) with the commit hash once this PR is rebased and merged
+- [ ] Update [rebar.config.script](https://github.com/apache/couchdb/blob/main/rebar.config.script) with the commit hash once this PR is rebased and merged
<!-- Before opening the PR, consider running `make check` locally for a faster turnaround time -->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 55c41d6..db5aa08 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
This repository follows the same contribution guidelines as the
main Apache CouchDB contribution guidelines:
-https://github.com/apache/couchdb/blob/master/CONTRIBUTING.md
+https://github.com/apache/couchdb/blob/main/CONTRIBUTING.md
diff --git a/README.md b/README.md
index fd4efc4..0fd09e6 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,6 @@ with issue reporting or contributing to the upkeep of this project.
[1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/
[2]: http://mail-archives.apache.org/mod_mbox/couchdb-dev/
-[3]: https://github.com/apache/couchdb/blob/master/CONTRIBUTING.md
+[3]: https://github.com/apache/couchdb/blob/main/CONTRIBUTING.md
diff --git a/rfcs/008-map-indexes.md b/rfcs/008-map-indexes.md
index 991fa2b..723e76d 100644
--- a/rfcs/008-map-indexes.md
+++ b/rfcs/008-map-indexes.md
@@ -165,7 +165,7 @@ In CouchDB 2.x, strings are compared via ICU. The way to do this with Foundation
### Index building
-An index will be built and updated via a [background job worker](https://github.com/apache/couchdb-documentation/blob/master/rfcs/007-background-jobs.md). When a request for a view is received, the request process will add a job item onto the background queue for the index to be updated. A worker will take the item off the queue and update the index. Once the index has been built, the background job server will notify the request that the index is up to date. The request process will the [...]
+An index will be built and updated via a [background job worker](https://github.com/apache/couchdb-documentation/blob/main/rfcs/007-background-jobs.md). When a request for a view is received, the request process will add a job item onto the background queue for the index to be updated. A worker will take the item off the queue and update the index. Once the index has been built, the background job server will notify the request that the index is up to date. The request process will then [...]
Initially, the building of an index will be a single worker running through the changes feed and creating the index. In the future, we plan to parallelise that work so that multiple workers could build the index at the same time. This will reduce build times.
diff --git a/rfcs/011-opentracing.md b/rfcs/011-opentracing.md
index bf4a059..4c3c300 100644
--- a/rfcs/011-opentracing.md
+++ b/rfcs/011-opentracing.md
@@ -39,8 +39,8 @@ The following HTTP headers would be used to link tracing span with application s
- b3
More information about the use of these headers can be found [here](https://github.com/openzipkin/b3-propagation).
-Open tracing [specification](https://github.com/opentracing/specification/blob/master/specification.md)
-has a number of [conventions](https://github.com/opentracing/specification/blob/master/semantic_conventions.md)
+Open tracing [specification](https://github.com/opentracing/specification/blob/main/specification.md)
+has a number of [conventions](https://github.com/opentracing/specification/blob/main/semantic_conventions.md)
which would be good to follow.
In a nutshell the idea is:
@@ -133,7 +133,7 @@ Following headers on the response would be supported
## Conventions
-The conventions bellow are based on [conventions from opentracing](https://github.com/opentracing/specification/blob/master/semantic_conventions.md#standard-span-tags-and-log-fields).
+The conventions bellow are based on [conventions from opentracing](https://github.com/opentracing/specification/blob/main/semantic_conventions.md#standard-span-tags-and-log-fields).
All tags are optional since it is just a recomendation from open tracing to hint visualization and filtering tools.
### Span tags
@@ -224,11 +224,11 @@ The security risk of injecting malicious payload into ini config is mitigated vi
# References
-- [opentracing specification](https://github.com/opentracing/specification/blob/master/specification.md)
+- [opentracing specification](https://github.com/opentracing/specification/blob/main/specification.md)
- https://opentracing.io/
- https://www.jaegertracing.io/docs/1.14/
- https://zipkin.io
-- [opentracing conventions](https://github.com/opentracing/specification/blob/master/semantic_conventions.md)
+- [opentracing conventions](https://github.com/opentracing/specification/blob/main/semantic_conventions.md)
# Acknowledgements
diff --git a/rfcs/013-node-types.md b/rfcs/013-node-types.md
index 9c811e2..5cd3adc 100644
--- a/rfcs/013-node-types.md
+++ b/rfcs/013-node-types.md
@@ -135,7 +135,7 @@ N/A
[1] https://github.com/apache/couchdb/issues/1338
-[2] https://github.com/apache/couchdb-documentation/blob/master/rfcs/007-background-jobs.md
+[2] https://github.com/apache/couchdb-documentation/blob/main/rfcs/007-background-jobs.md
# Acknowledgments
diff --git a/rfcs/016-fdb-replicator.md b/rfcs/016-fdb-replicator.md
index a10ea6e..e53ad7b 100644
--- a/rfcs/016-fdb-replicator.md
+++ b/rfcs/016-fdb-replicator.md
@@ -21,11 +21,11 @@ CouchDB <= 3.x, replication jobs were mapped to individual cluster nodes and a
scheduler component would run up to `max_jobs` number of jobs at a time on each
node. The new design proposes using `couch_jobs`, as described in the
[Background Jobs
-RFC](https://github.com/apache/couchdb-documentation/blob/master/rfcs/007-background-jobs.md),
+RFC](https://github.com/apache/couchdb-documentation/blob/main/rfcs/007-background-jobs.md),
to have a central, FDB-based queue of replication jobs. `couch_jobs`
application will manage job scheduling and coordination. The new design also
proposes using heterogeneous node types as defined in the [Node Types
-RFC](https://github.com/apache/couchdb-documentation/blob/master/rfcs/013-node-types.md)
+RFC](https://github.com/apache/couchdb-documentation/blob/main/rfcs/013-node-types.md)
such that replication jobs will be created only on `api_frontend` nodes and run
only on `replication` nodes.
@@ -58,12 +58,12 @@ changes feed, then stop.
`api_frontend node` : Database node which has the `api_frontend` type set to
`true` as described in
-[RFC](https://github.com/apache/couchdb-documentation/blob/master/rfcs/013-node-types.md).
+[RFC](https://github.com/apache/couchdb-documentation/blob/main/rfcs/013-node-types.md).
Replication jobs can be only be created on these nodes.
`replication node` : Database node which has the `replication` type set to
`true` as described in
-[RFC](https://github.com/apache/couchdb-documentation/blob/master/rfcs/013-node-types.md).
+[RFC](https://github.com/apache/couchdb-documentation/blob/main/rfcs/013-node-types.md).
Replication jobs can only be run on these nodes.
`filtered` replications: Replications with a user-defined filter on the source
@@ -369,9 +369,9 @@ traffic sent out only from those nodes.
# References
-* [Background Jobs RFC](https://github.com/apache/couchdb-documentation/blob/master/rfcs/007-background-jobs.md)
+* [Background Jobs RFC](https://github.com/apache/couchdb-documentation/blob/main/rfcs/007-background-jobs.md)
-* [Node Types RFC](https://github.com/apache/couchdb-documentation/blob/master/rfcs/013-node-types.md)
+* [Node Types RFC](https://github.com/apache/couchdb-documentation/blob/main/rfcs/013-node-types.md)
* [CouchDB 3.x replicator implementation](https://github.com/apache/couchdb/blob/3.x/src/couch_replicator/README.md)
diff --git a/src/best-practices/reverse-proxies.rst b/src/best-practices/reverse-proxies.rst
index 4ef2fc3..46102ac 100644
--- a/src/best-practices/reverse-proxies.rst
+++ b/src/best-practices/reverse-proxies.rst
@@ -66,7 +66,7 @@ is for a 3 node CouchDB cluster:
server couchdb2 x.x.x.x:5984 check inter 5s
.. _HAProxy: http://haproxy.org/
-.. _code repository: https://github.com/apache/couchdb/blob/master/rel/haproxy.cfg
+.. _code repository: https://github.com/apache/couchdb/blob/main/rel/haproxy.cfg
Reverse proxying with nginx
===========================
diff --git a/src/ddocs/views/collation.rst b/src/ddocs/views/collation.rst
index 4ce5182..37fae9f 100644
--- a/src/ddocs/views/collation.rst
+++ b/src/ddocs/views/collation.rst
@@ -108,7 +108,7 @@ Collation Specification
This section is based on the view_collation function in `view_collation.js`_:
-.. _view_collation.js: https://github.com/apache/couchdb/blob/master/test/javascript/tests/view_collation.js
+.. _view_collation.js: https://github.com/apache/couchdb/blob/main/test/javascript/tests/view_collation.js
.. code-block:: javascript
diff --git a/src/query-server/javascript.rst b/src/query-server/javascript.rst
index 2cd1acc..ce48c02 100644
--- a/src/query-server/javascript.rst
+++ b/src/query-server/javascript.rst
@@ -96,7 +96,7 @@ modules and functions:
.. data:: JSON
- `JSON2 <https://github.com/apache/couchdb/blob/master/share/server/json2.js>`_
+ `JSON2 <https://github.com/apache/couchdb/blob/main/share/server/json2.js>`_
object.
.. function:: isArray(obj)
diff --git a/src/replication/protocol.rst b/src/replication/protocol.rst
index 0bfbe79..f4e7b4f 100644
--- a/src/replication/protocol.rst
+++ b/src/replication/protocol.rst
@@ -533,7 +533,7 @@ ID:
See `couch_replicator_ids.erl`_ for an example of a Replication ID generation
implementation.
- .. _couch_replicator_ids.erl: https://github.com/apache/couchdb/blob/master/src/couch_replicator/src/couch_replicator_ids.erl
+ .. _couch_replicator_ids.erl: https://github.com/apache/couchdb/blob/main/src/couch_replicator/src/couch_replicator_ids.erl
Retrieve Replication Logs from Source and Target
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/setup/cluster.rst b/src/setup/cluster.rst
index 603d031..3660541 100644
--- a/src/setup/cluster.rst
+++ b/src/setup/cluster.rst
@@ -365,4 +365,4 @@ Ensure the ``all_nodes`` and ``cluster_nodes`` lists match.
You CouchDB cluster is now set up.
.. _HAProxy: http://haproxy.org/
-.. _example configuration for HAProxy: https://github.com/apache/couchdb/blob/master/rel/haproxy.cfg
+.. _example configuration for HAProxy: https://github.com/apache/couchdb/blob/main/rel/haproxy.cfg