Skip to content

Commit 6626922

Browse files
committed
OCP 3.7 Release: Link Fixes
Conflicts: install_config/revhistory_install_config.adoc release_notes/revhistory_release_notes.adoc
1 parent fc23726 commit 6626922

File tree

12 files changed

+20
-20
lines changed

12 files changed

+20
-20
lines changed

admin_guide/managing_networking.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ port from pods in the *_same_* namespace, and connections on ports `80` and
11121112
[[admin-guide-networking-networkpolicy-routers]]
11131113
=== NetworkPolicy and Routers
11141114

1115-
When using the *ovs-multitenant* plugin, traffic from the xref:../architecture/topics/routers.adoc[routers] is automatically allowed into all namespaces. This is because the routers are
1115+
When using the *ovs-multitenant* plugin, traffic from the routers is automatically allowed into all namespaces. This is because the routers are
11161116
usually in the _default_ namespace, and all namespaces allow connections from
11171117
pods in that namespace. With the *ovs-networkpolicy* plugin, this does not
11181118
happen automatically. Therefore, if you have a policy that isolates a namespace

admin_guide/managing_projects.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ command use this endpoint when a developer xref:../dev_guide/projects.adoc#dev-g
3232
=== Modifying the Template for New Projects
3333
The API server automatically provisions projects based on the template that is
3434
identified by the `projectRequestTemplate` parameter of the
35-
xref:../install_config/master_node_configuration.adoc#master-node-config-project-config
36-
[*_master-config.yaml_* file]. If the parameter is not defined, the API server
35+
xref:../install_config/master_node_configuration.adoc#master-node-config-project-config[*_master-config.yaml_* file]. If the parameter is not defined, the API server
3736
creates a default template that creates a project with the requested name, and
3837
assigns the requesting user to the "admin" role for that project.
3938

apb_devel/writing/getting_started.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ toc::[]
1717
In this tutorial, you will walk through the creation of some sample Ansible
1818
Playbook Bundles (APBs). You will create actions for them to allow provision,
1919
deprovision, bind, and unbind. You can find more information about the design of
20-
APBs in the xref:../index.adoc#apb-devel-design[Design] topic. More in-depth
20+
APBs in the xref:../index.adoc#apb-devel-intro-design[Design] topic. More in-depth
2121
information about writing APBs is available in the
2222
xref:reference.adoc#apb-devel-writing-reference[Reference] topic.
2323

apb_devel/writing/reference.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ link:https://docs.docker.com/engine/reference/commandline/tag/#extended-descript
111111
|Boolean option of whether or not this APB can be bound to. Accepted fields are `true` or `false`.
112112

113113
|`metadata`
114-
|Dictionary field declaring relevant metadata information. See
115-
xref:metadata[metadata] for details.
114+
|Dictionary field declaring relevant metadata information.
116115

117116
|`plans`
118117
|A list of plans that can be deployed. See

architecture/networking/routes.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ and "-". The default is the hashed internal key name for the route. |
604604
|`*haproxy.router.openshift.io/timeout*` | Sets a server-side timeout for the route. xref:time-units[(TimeUnits)] | `ROUTER_DEFAULT_SERVER_TIMEOUT`
605605
|`*router.openshift.io/haproxy.health.check.interval*`| Sets the interval for the back-end health checks. xref:time-units[(TimeUnits)] | `ROUTER_BACKEND_CHECK_INTERVAL`
606606
|`*haproxy.router.openshift.io/ip_whitelist*` | Sets a xref:whitelist[whitelist] for the route. |
607-
|`*haproxy.router.openshift.io/hsts_header*` | Sets a xref:hsts[Strict-Transport-Security] header for the edge terminated or re-encrypt route. |
607+
|`*haproxy.router.openshift.io/hsts_header*` | Sets a Strict-Transport-Security header for the edge terminated or re-encrypt route. |
608608

609609
|===
610610

architecture/service_catalog/ansible_service_broker.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ APBs use a simple directory with named playbooks to perform OSB API actions,
4141
such as provision and bind. Metadata defined in *_apb.yml_* spec file contains a
4242
list of required and optional parameters for use during deployment.
4343

44-
See the xref:../../apb_devel/index.adoc#apb-devel-design[APB Development Guide]
44+
See the xref:../../apb_devel/index.adoc#apb-devel-intro-design[APB Development Guide]
4545
for details on the overall design and how APBs are written.

install_config/install/rpm_vs_containerized.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ For the advanced installation method, you can set the Ansible variable
6262
xref:../../install_config/install/advanced_install.adoc#configuring-ansible[inventory
6363
file] on a cluster-wide or per host basis.
6464

65-
For the xref:../../install_config/install/disconnected_install.html[disconnected
65+
For the xref:../../install_config/install/disconnected_install.adoc#install-config-install-disconnected-install[disconnected
6666
installation method], to install the etcd container, you can set the Ansible
6767
variable `osm_etcd_image` to be the fully qualified name of the etcd image on
6868
your local registry, for example, `registry.example.com/rhel7/etcd`.

install_config/revhistory_install_config.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
:icons:
77
:experimental:
88

9-
// do-release: revhist-tables
9+
// do-release: revhist-tables

install_config/upgrading/automated_upgrades.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ start an upgrade.
208208

209209
The quick installer supports upgrading between minor versions of {product-title}
210210
(one minor version at a time, e.g., 3.5 to 3.6) as well as between
211-
xref:../../release_notes/ocp_3_6_release_notes.adoc#ocp-36-asynchronous-errata-updates[asynchronous errata updates] within a minor version (e.g., 3.6.z).
211+
asynchronous errata updates within a minor version (e.g., 3.6.z).
212212

213213
If you have an older format installation configuration file in
214214
*_~/.config/openshift/installer.cfg.yml_* from an installation of a previous
@@ -231,7 +231,7 @@ To start an upgrade with the quick installer:
231231
[NOTE]
232232
====
233233
If the quick installer fails, note the error output and check
234-
xref:upgrading_known_issues.adoc#install-config-upgrading-known-issues[Known Issues] for any additional steps.
234+
Known Issues for any additional steps.
235235
====
236236

237237
include::install_config/upgrading/automated_upgrades.adoc[tag=automated_upgrade_after_reboot]

release_notes/ocp_3_7_release_notes.adoc

+8-6
Original file line numberDiff line numberDiff line change
@@ -912,9 +912,11 @@ You can also automate the configuration of the provider to point to multiple Ope
912912
[NOTE]
913913
====
914914
The *_/tmp/cp.yml_* file requires some manual configurations to create and use
915-
it correctly. See
916-
xref:../install_config/cfme/container_provider.adoc#cfme-container-provider-multiple[Multiple
917-
Container Providers] for more information.
915+
it correctly.
916+
917+
//// Commenting out this section till CFME merges
918+
See Multiple Container Providers for more information.
919+
////
918920
====
919921

920922
[[ocp-37-diagnostics]]
@@ -1096,7 +1098,7 @@ metrics, and get alerts. Operators can see and query metrics and alerts on the
10961098
Prometheus web dashboard, or bring their own Grafana and hook it up to
10971099
Prometheus.
10981100

1099-
See xref:../nstall_config/cluster_metrics.adoc#openshift-prometheus[Prometheus
1101+
See xref:../install_config/cluster_metrics.adoc#openshift-prometheus[Prometheus
11001102
on OpenShift] for more information.
11011103

11021104
[[ocp-37-integrated-approach-to-adding-hosa]]
@@ -1406,7 +1408,7 @@ The {product-title} 3.7 documentation will be updated with more complete
14061408
instructions on deploying CFME 4.6 after it has been released.
14071409

14081410
[discrete]
1409-
[[updated-installer-support-for-cfme]]
1411+
[[node-authorizer-plugin]]
14101412
=== Node Authorizer and Admission Plug-in for Managing Node Permissions
14111413

14121414
In {product-title} 3.7, the node authorizer and admission plug-in are used to
@@ -2762,7 +2764,7 @@ The following features that were formerly in Technology Preview from a previous
27622764
- xref:../dev_guide/cron_jobs.adoc#dev-guide-cron-jobs[Cron Jobs (formerly called Scheduled Jobs)]
27632765
- xref:../dev_guide/deployments/kubernetes_deployments.adoc#dev-guide-kubernetes-deployments-support[Kubernetes
27642766
Deployments Support]
2765-
- xref:../release_notes/ocp_3_5_release_notes.adoc#ocp-35-statefulsets[`StatefulSets`, formerly known as `PetSets`]
2767+
- `StatefulSets`, formerly known as `PetSets`
27662768
- xref:../admin_guide/quota.adoc#limited-resources-quota[Require Explicit Quota to Consume a Resource]
27672769
- xref:../architecture/additional_concepts/storage.adoc#pv-mount-options[Mount Options]
27682770
- xref:../install_config/install/advanced_install.adoc#advanced-install-configuring-system-containers[Installation of etcd, Docker Daemon, and Ansible Installer as System Containers]

release_notes/revhistory_release_notes.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
:icons:
77
:experimental:
88

9-
// do-release: revhist-tables
9+
// do-release: revhist-tables

rest_api/index.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ be created and deleted as needed with the appropriate role(s) assigned. See
8989
xref:../architecture/additional_concepts/authorization.adoc#roles[Authorization]
9090
in the Architecture documentation for a deeper discussion on roles.
9191

92-
[[rest-api-examples]]
92+
[[rest-api-index-examples]]
9393
== Examples
9494

9595
These examples provide a quick reference for making successful REST API calls.

0 commit comments

Comments
 (0)