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.

Sign up for GitHub

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

Jump to bottom

fixed links in /apidocs/docker-cloud/includes #1087

Merged
merged 2 commits into from
Jan 11, 2017
Merged

fixed links in /apidocs/docker-cloud/includes #1087

merged 2 commits into from
Jan 11, 2017

Conversation

aduermael
Copy link
Contributor

Proposed changes

I updated some urls in html files found in /apidocs/docker-cloud/includes. It's better to use absolute paths, otherwise it only works when the files are included in some specific location.

../../docker-cloud/apps/autorestart/ becomes /docker-cloud/apps/autorestart/

It will fix these failing test cases (#1068):

html_test.go:55: /apidocs/docker-cloud/includes/container.html
	broken: <a href="../../engine/reference/run/#runtime-constraints-on-cpu-and-memory">
	broken: <a href="../../engine/reference/run/#runtime-constraints-on-cpu-and-memory">
	broken: <a href="../../docker-cloud/apps/autorestart/">
	broken: <a href="../../docker-cloud/apps/auto-destroy/">
	broken: <a href="../../docker-cloud/apps/api-roles/">
	broken: <a href="../../docker-cloud/apps/service-links/">
	broken: <a href="../../engine/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration">
html_test.go:55: /apidocs/docker-cloud/includes/node.html
	broken: <a href="../../docker-cloud/apps/deploy-tags/">
	broken: <a href="../../docker-cloud/infrastructure/docker-upgrade/">
html_test.go:55: /apidocs/docker-cloud/includes/nodecluster.html
	broken: <a href="../../docker-cloud/apps/deploy-tags/">
	broken: <a href="../../docker-cloud/apps/deploy-tags/">
html_test.go:55: /apidocs/docker-cloud/includes/service.html
	broken: <a href="../../docker-cloud/apps/service-scaling/">
	broken: <a href="../../engine/reference/run/#runtime-constraints-on-cpu-and-memory">
	broken: <a href="../../engine/reference/run/#runtime-constraints-on-cpu-and-memory">
	broken: <a href="../../docker-cloud/apps/autorestart/">
	broken: <a href="../../docker-cloud/apps/auto-destroy/">
	broken: <a href="../../docker-cloud/apps/service-links/">
	broken: <a href="../../engine/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration">
	broken: <a href="../../docker-cloud/infrastructure/deployment-strategies/">
	broken: <a href="../../docker-cloud/apps/deploy-tags/">
	broken: <a href="../../docker-cloud/apps/auto-redeploy/">
	broken: <a href="../../docker-cloud/apps/autorestart/">
	broken: <a href="../../docker-cloud/apps/auto-destroy/">
	broken: <a href="../../docker-cloud/apps/service-scaling/">
	broken: <a href="../../docker-cloud/apps/service-links/">
	broken: <a href="../../engine/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration">
	broken: <a href="../../docker-cloud/infrastructure/deployment-strategies/">
	broken: <a href="../../docker-cloud/apps/deploy-tags/">
	broken: <a href="../../docker-cloud/apps/auto-redeploy/">
	broken: <a href="../../docker-cloud/apps/autorestart/">
	broken: <a href="../../docker-cloud/apps/auto-destroy/">
	broken: <a href="../../engine/reference/run/#runtime-constraints-on-cpu-and-memory">
	broken: <a href="../../engine/reference/run/#runtime-constraints-on-cpu-and-memory">
	broken: <a href="../../engine/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration">
	broken: <a href="../../docker-cloud/apps/service-links/">
	broken: <a href="../../docker-cloud/apps/service-scaling/">
	broken: <a href="../../docker-cloud/infrastructure/deployment-strategies/">
	broken: <a href="../../docker-cloud/apps/auto-redeploy/">
html_test.go:55: /apidocs/docker-cloud/includes/stack.html
	broken: <a href="../../docker-cloud/apps/stack-yaml-reference/">
	broken: <a href="../../docker-cloud/apps/stacks/">
html_test.go:55: /apidocs/docker-cloud/includes/tag.html
	broken: <a href="../../docker-cloud/apps/deploy-tags/">
html_test.go:55: /apidocs/docker-cloud/includes/triggers.html
	broken: <a href="../../docker-cloud/apps/triggers/">

@aduermael
fixed links in /apidocs/docker-cloud/includes
cf6fc37 
urls in html files that are included must be absolute, otherwise it only works when the files are included in some specific location.

Signed-off-by: Adrien Duermael <adrien@duermael.com>
@aduermael aduermael mentioned this pull request Jan 11, 2017
Closed
@aduermael
cf6fc37 fix had to be made in /apidocs/cloud-api-source
b193b00 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
sanscontext
sanscontext approved these changes Jan 11, 2017
View reviewed changes
Copy link
Contributor

@sanscontext sanscontext left a comment

Choose a reason for hiding this comment

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

LGTM. if it breaks things we can revert?

@sanscontext sanscontext merged commit 613d448 into docker:master Jan 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanscontext sanscontext sanscontext approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aduermael @sanscontext