Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken Edit links #3321

Merged
merged 1 commit into from
Jan 10, 2017
Merged

Fix broken Edit links #3321

merged 1 commit into from
Jan 10, 2017

Conversation

dedemorton
Copy link
Contributor

@dedemorton dedemorton commented Jan 10, 2017

This PR fixes the broken Edit links that pointed to shared (single-sourced) content in libbeat.

Because the macro that we use to set the Edit url doesn't accept variables in the path (couldn't use {doc-branch}), I decided to point edits to master rather than a specific branch name. This in keeping with our preference for having PRs submitted to the master branch and then back/forward ported. It's also consistent with how Logstash handles doc edits.

All the Edit links in the book will now point to the master branch. The one main drawback of this approach is that the user might see a problem that exists in the current doc, but has been fixed in master. Also, the content in master won't always match what the user sees in the published doc (especially as the doc ages), and it's possible that the link will no longer work if we delete the file in master.

It's the best solution we have for now, though, unless we want to update all the URL paths in all these links whenever we cut a new branch.

NOTE: You'll probably notice that there area couple of instances where I set the Edit url to the location of the shared logstash config doc even though there is a corresponding local file. The local file is just a heading that wraps the shared content, so I figured it was better just to point users to the shared content.

include::./packetbeat-geoip.asciidoc[]

pass::[<?edit_url https://github.com/elastic/beats/edit/master/libbeat/docs/shared-logstash-config.asciidoc ?>]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@monicasarbu monicasarbu merged commit 04f2ade into elastic:master Jan 10, 2017
tsg pushed a commit that referenced this pull request Jan 12, 2017
…3312, #3331, #3336) (#3345)

* Edit haproxy module docs

* Add fixes from review feedback

* Fix broken Edit links

* Clarify when registry file is updated in docs (#3274)

See #3220 (comment)

* Update close_timeout docs  (#3320)

Clarified close_timeout when there are updates to the file.

* Fix typo in regexp

Should be `regexp` and not `reqexp`

* Fix a couple of typos and a broken link

* Change "versions" to "supported_protocols" (#3336)

Urso pointed out during the Heartbeat review that this name is wrong.
tsg pushed a commit that referenced this pull request Jan 12, 2017
…3331, #3336) (#3347)

* Edit haproxy module docs

* Add fixes from review feedback

* Fix broken Edit links

* Update close_timeout docs  (#3320)

Clarified close_timeout when there are updates to the file.

* Fix typo in regexp

Should be `regexp` and not `reqexp`

* Fix a couple of typos and a broken link

* Change "versions" to "supported_protocols" (#3336)

Urso pointed out during the Heartbeat review that this name is wrong.
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…lastic#3320, elastic#3312, elastic#3331, elastic#3336) (elastic#3347)

* Edit haproxy module docs

* Add fixes from review feedback

* Fix broken Edit links

* Update close_timeout docs  (elastic#3320)

Clarified close_timeout when there are updates to the file.

* Fix typo in regexp

Should be `regexp` and not `reqexp`

* Fix a couple of typos and a broken link

* Change "versions" to "supported_protocols" (elastic#3336)

Urso pointed out during the Heartbeat review that this name is wrong.
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…lastic#3274, elastic#3320, elastic#3312, elastic#3331, elastic#3336) (elastic#3345)

* Edit haproxy module docs

* Add fixes from review feedback

* Fix broken Edit links

* Clarify when registry file is updated in docs (elastic#3274)

See elastic#3220 (comment)

* Update close_timeout docs  (elastic#3320)

Clarified close_timeout when there are updates to the file.

* Fix typo in regexp

Should be `regexp` and not `reqexp`

* Fix a couple of typos and a broken link

* Change "versions" to "supported_protocols" (elastic#3336)

Urso pointed out during the Heartbeat review that this name is wrong.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants