vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5552 from ktateish/fix-wrong-link 

Fix wrong links
release-3.0
Xiang Li 2016-06-03 10:06:13 -07:00
parent 634b9584ef 5bff4d85d6
commit 948dc5e425
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/dev-guide/local_cluster.md
View File

@ -86,5 +86,5 @@ hello
To learn more about interacting with etcd, read [interacting with etcd section][interacting].
[interacting]: ./interacting_v3.md
[clustering]: ./clustering.md
[clustering]: ../op-guide/clustering.md

6
Documentation/op-guide/clustering.md
View File

@ -461,9 +461,9 @@ When the `--proxy` flag is set, etcd runs in [proxy mode][proxy]. This proxy mod
To setup an etcd cluster with proxies of v2 API, please read the the [clustering doc in etcd 2.3 release][clustering_etcd2].
[conf-adv-client]: configuration.md#-advertise-client-urls
[conf-listen-client]: configuration.md#-listen-client-urls
[discovery-proto]: dev-internal/discovery_protocol.md
[conf-adv-client]: configuration.md#--advertise-client-urls
[conf-listen-client]: configuration.md#--listen-client-urls
[discovery-proto]: ../dev-internal/discovery_protocol.md
[rfc-srv]: http://www.ietf.org/rfc/rfc2052.txt
[runtime-conf]: runtime-configuration.md
[runtime-reconf-design]: runtime-reconf-design.md

8
Documentation/op-guide/configuration.md
View File

@ -8,8 +8,6 @@ The [official etcd ports][iana-ports] are 2379 for client requests and 2380 for
To start etcd automatically using custom settings at startup in Linux, using a [systemd][systemd-intro] unit is highly recommended.
[systemd-intro]: http://freedesktop.org/wiki/Software/systemd/
## Member Flags
### --name
@ -39,7 +37,7 @@ To start etcd automatically using custom settings at startup in Linux, using a [
+ env variable: ETCD_HEARTBEAT_INTERVAL
### --election-timeout
+ Time (in milliseconds) for an election to timeout. See [Documentation/tuning.md](tuning.md#time-parameters) for details.
+ Time (in milliseconds) for an election to timeout. See [Documentation/tuning.md][tuning] for details.
+ default: "1000"
+ env variable: ETCD_ELECTION_TIMEOUT
@ -281,9 +279,7 @@ Follow the instructions when using these flags.
[discovery]: clustering.md#discovery
[iana-ports]: https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=etcd
[proxy]: ../v2/proxy.md
[reconfig]: runtime-configuration.md
[restore]: ../v2/admin_guide.md#restoring-a-backup
[rfc-v3]: rfc/v3api.md
[security]: security.md
[systemd-intro]: http://freedesktop.org/wiki/Software/systemd/
[tuning]: tuning.md#time-parameters
[tuning]: ../tuning.md#time-parameters

4
Documentation/op-guide/failures.md
View File

@ -40,5 +40,5 @@ A cluster bootstrap is only successful if all required members successfully star
Of course, it is possible to recover a failed bootstrapped cluster like recovering a running cluster. However, it almost always takes more time and resources to recover that cluster than bootstrapping a new one, since there is no data to recover.
[backup]: https://github.com/coreos/etcd/blob/master/Documentation/op-guide/maintenance.md#snapshot-backup
[unrecoverable]: https://github.com/coreos/etcd/blob/master/Documentation/op-guide/recovery.md#disaster-recovery
[backup]: maintenance.md#snapshot-backup
[unrecoverable]: recovery.md#disaster-recovery