Skip to content

Commit 3ac2ee8

Browse files
roboparkerDenise
authored and
Denise
committed
404s
1 parent 677b924 commit 3ac2ee8

File tree

32 files changed

+33
-33
lines changed

32 files changed

+33
-33
lines changed

os/v1.0/en/configuration/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, create `gce-qemu.json`:
4545
{
4646
"type": "qemu",
4747
"name": "qemu-googlecompute",
48-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
48+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
4949
"iso_checksum": "<rancheros.iso-MD5-hash>",
5050
"iso_checksum_type": "md5",
5151
"ssh_wait_timeout": "360s",

os/v1.0/en/configuration/switching-docker-versions/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ FROM scratch
8888
COPY engine /engine
8989
```
9090
91-
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.3.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
91+
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.6.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
9292
9393
All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.
9494

os/v1.0/en/custom-builds/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, create `gce-qemu.json`:
4545
{
4646
"type": "qemu",
4747
"name": "qemu-googlecompute",
48-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
48+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
4949
"iso_checksum": "<rancheros.iso-MD5-hash>",
5050
"iso_checksum_type": "md5",
5151
"ssh_wait_timeout": "360s",

os/v1.0/en/running-rancheros/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ RancherOS runs on virtualization platforms, cloud providers and bare metal serve
2626

2727
[DigitalOcean]({{page.osbaseurl}}/running-rancheros/cloud/do)
2828

29-
[Azure]({{page.osbaseurl}}/running-rancheros/cloud/azure)
29+
Azure
3030

3131
#### Bare Metal & Virtual Servers
3232

33-
[iPXE]({{page.osbaseurl}}/running-rancheros/server/ipxe)
33+
iPXE
3434

3535
[PXE]({{page.osbaseurl}}/running-rancheros/server/pxe)
3636

os/v1.0/en/system-services/environment/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Environment
77
# Environment
88
---
99

10-
The [environment key](https://docs.docker.com/compose/yml/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
10+
The [environment key](https://docs.docker.com/compose/compose-file/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
1111

1212
In the example below, `ETCD_DISCOVERY` will be set to `https://discovery.etcd.io/d1cd18f5ee1c1e2223aed6a1734719f7` for the `etcd` service.
1313

os/v1.1/en/configuration/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, create `gce-qemu.json`:
4545
{
4646
"type": "qemu",
4747
"name": "qemu-googlecompute",
48-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
48+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
4949
"iso_checksum": "<rancheros.iso-MD5-hash>",
5050
"iso_checksum_type": "md5",
5151
"ssh_wait_timeout": "360s",

os/v1.1/en/configuration/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ In our example above, we have our `#cloud-config` line to indicate it's a cloud-
3939
### Manually Changing Configuration
4040

4141
To update RancherOS configuration after booting, the `ros config set <key> <value>` command can be used.
42-
For more complicated settings, like the [sysctl settings]({{page.osbaseurl}}/sysctl/), you can also create a small YAML file and then run `sudo ros config merge -i <your yaml file>`.
42+
For more complicated settings, like the sysctl settings, you can also create a small YAML file and then run `sudo ros config merge -i <your yaml file>`.
4343

4444
#### Getting Values
4545

os/v1.1/en/configuration/switching-docker-versions/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ FROM scratch
8888
COPY engine /engine
8989
```
9090
91-
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.3.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
91+
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.6.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
9292
9393
All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.
9494

os/v1.1/en/custom-builds/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, create `gce-qemu.json`:
4545
{
4646
"type": "qemu",
4747
"name": "qemu-googlecompute",
48-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
48+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
4949
"iso_checksum": "<rancheros.iso-MD5-hash>",
5050
"iso_checksum_type": "md5",
5151
"ssh_wait_timeout": "360s",

os/v1.1/en/running-rancheros/cloud/gce/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: Running RancherOS on GCE
66
# Running RancherOS on Google Compute Engine (GCE)
77
----
88

9-
> **Note:** Due to the maximum transmission unit (MTU) of [1460 bytes on GCE](https://cloud.google.com/compute/docs/troubleshooting#packetfragmentation), you will need to configure your [network interfaces]({{page.osbaseurl}}/os/networking/interfaces/) and both the [Docker and System Docker]({{page.osbaseurl}}/os/configuration/docker/) to use a MTU of 1460 bytes or you will encounter weird networking related errors.
9+
> **Note:** Due to the maximum transmission unit (MTU) of [1460 bytes on GCE](https://cloud.google.com/compute/docs/troubleshooting#packetfragmentation), you will need to configure your network interfaces and both the Docker and System Docker to use a MTU of 1460 bytes or you will encounter weird networking related errors.
1010
1111
### Adding the RancherOS Image into GCE
1212

os/v1.1/en/running-rancheros/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RancherOS runs on virtualization platforms, cloud providers and bare metal serve
3030

3131
#### Bare Metal & Virtual Servers
3232

33-
[iPXE]({{page.osbaseurl}}/running-rancheros/server/ipxe)
33+
iPXE
3434

3535
[PXE]({{page.osbaseurl}}/running-rancheros/server/pxe)
3636

os/v1.1/en/running-rancheros/server/pxe/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Valid cloud-init datasources for RancherOS.
6262
| gce | | |
6363
| packet | DefaultAddress | |
6464
| url | url | |
65-
| vmware | | set `guestinfo` cloud-init or interface data as per [VMware ESXi]({{page.osbaseurl}}/cloud/vmware-esxi) |
65+
| vmware | | set `guestinfo` cloud-init or interface data as per VMware ESXi |
6666
| * | This will add ["configdrive", "vmware", "ec2", "digitalocean", "packet", "gce"] into the list of datasources to try | |
6767

6868
### Cloud-Config

os/v1.1/en/security/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ title: RancherOS security
1616
</td>
1717
<td width="30%" style="border: none;">
1818
<h4>Reporting process</h4>
19-
<p style="padding: 8px">Please submit possible security issues by emailing <a href="[email protected]">[email protected]</a></p>
19+
<p style="padding: 8px">Please submit possible security issues by emailing <a href="mailto:[email protected]">[email protected]</a></p>
2020
</td>
2121
<td width="30%" style="border: none;">
2222
<h4>Announcments</h4>

os/v1.1/en/system-services/environment/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Environment
77
# Environment
88
---
99

10-
The [environment key](https://docs.docker.com/compose/yml/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
10+
The [environment key](https://docs.docker.com/compose/compose-file/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
1111

1212
In the example below, `ETCD_DISCOVERY` will be set to `https://discovery.etcd.io/d1cd18f5ee1c1e2223aed6a1734719f7` for the `etcd` service.
1313

os/v1.2/en/configuration/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, create `gce-qemu.json`:
4545
{
4646
"type": "qemu",
4747
"name": "qemu-googlecompute",
48-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
48+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
4949
"iso_checksum": "<rancheros.iso-MD5-hash>",
5050
"iso_checksum_type": "md5",
5151
"ssh_wait_timeout": "360s",

os/v1.2/en/configuration/switching-docker-versions/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ FROM scratch
8888
COPY engine /engine
8989
```
9090
91-
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.3.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
91+
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.6.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
9292
9393
All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.
9494

os/v1.2/en/custom-builds/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ First, create `gce-qemu.json`:
4545
{
4646
"type": "qemu",
4747
"name": "qemu-googlecompute",
48-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
48+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
4949
"iso_checksum": "<rancheros.iso-MD5-hash>",
5050
"iso_checksum_type": "md5",
5151
"ssh_wait_timeout": "360s",

os/v1.2/en/running-rancheros/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RancherOS runs on virtualization platforms, cloud providers and bare metal serve
3030

3131
#### Bare Metal & Virtual Servers
3232

33-
[iPXE]({{page.osbaseurl}}/running-rancheros/server/ipxe)
33+
iPXE
3434

3535
[PXE]({{page.osbaseurl}}/running-rancheros/server/pxe)
3636

os/v1.2/en/running-rancheros/server/pxe/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Valid cloud-init datasources for RancherOS.
6262
| gce | | |
6363
| packet | DefaultAddress | |
6464
| url | url | |
65-
| vmware | | set `guestinfo` cloud-init or interface data as per [VMware ESXi]({{page.osbaseurl}}/cloud/vmware-esxi) |
65+
| vmware | | set `guestinfo` cloud-init or interface data as per VMware ESXi |
6666
| * | This will add ["configdrive", "vmware", "ec2", "digitalocean", "packet", "gce"] into the list of datasources to try | |
6767

6868
### Cloud-Config

os/v1.2/en/system-services/environment/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Environment
77
## Environment
88
---
99

10-
The [environment key](https://docs.docker.com/compose/yml/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
10+
The [environment key](https://docs.docker.com/compose/compose-file/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
1111

1212
In the example below, `ETCD_DISCOVERY` will be set to `https://discovery.etcd.io/d1cd18f5ee1c1e2223aed6a1734719f7` for the `etcd` service.
1313

os/v1.x/en/configuration/switching-docker-versions/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ FROM scratch
9090
COPY engine /engine
9191
```
9292
93-
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.3.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
93+
Once the image is built a [system service]({{page.osbaseurl}}/system-services/adding-system-services/) configuration file must be created. An [example file](https://github.com/rancher/os-services/blob/master/d/docker-1.12.6.yml) can be found in the rancher/os-services repo. Change the `image` field to point to the Docker engine image you've built.
9494
9595
All of the previously mentioned methods of switching Docker engines are now available. For example, if your service file is located at `https://myservicefile` then the following cloud-config file could be used to use your custom Docker engine.
9696

os/v1.x/en/custom-builds/custom-rancheros-iso/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ First, create `gce-qemu.json`:
4747
{
4848
"type": "qemu",
4949
"name": "qemu-googlecompute",
50-
"iso_url": "https://github.com/rancherio/os/releases/download/<RancherOS-Version>/rancheros.iso",
50+
"iso_url": "https://github.com/rancher/os/releases/download/<RancherOS-Version>/rancheros.iso",
5151
"iso_checksum": "<rancheros.iso-MD5-hash>",
5252
"iso_checksum_type": "md5",
5353
"ssh_wait_timeout": "360s",

os/v1.x/en/running-rancheros/cloud/gce/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title: Running RancherOS on GCE
66
## Running RancherOS on Google Compute Engine (GCE)
77
----
88

9-
> **Note:** Due to the maximum transmission unit (MTU) of [1460 bytes on GCE](https://cloud.google.com/compute/docs/troubleshooting#packetfragmentation), you will need to configure your [network interfaces]({{site.baseurl}}/os/networking/interfaces/) and both the [Docker and System Docker]({{site.baseurl}}/os/configuration/docker/) to use a MTU of 1460 bytes or you will encounter weird networking related errors.
9+
> **Note:** Due to the maximum transmission unit (MTU) of [1460 bytes on GCE](https://cloud.google.com/compute/docs/troubleshooting#packetfragmentation), you will need to configure your network interfaces and both the [Docker and System Docker]({{site.baseurl}}/os/configuration/docker/) to use a MTU of 1460 bytes or you will encounter weird networking related errors.
1010
1111
### Adding the RancherOS Image into GCE
1212

os/v1.x/en/running-rancheros/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RancherOS runs on virtualization platforms, cloud providers and bare metal serve
3030

3131
#### Bare Metal & Virtual Servers
3232

33-
[iPXE]({{page.osbaseurl}}/running-rancheros/server/ipxe)
33+
iPXE
3434

3535
[PXE]({{page.osbaseurl}}/running-rancheros/server/pxe)
3636

os/v1.x/en/system-services/environment/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Environment
77
## Environment
88
---
99

10-
The [environment key](https://docs.docker.com/compose/yml/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
10+
The [environment key](https://docs.docker.com/compose/compose-file/#environment) can be used to customize system services. When a value is not assigned, RancherOS looks up the value from the `rancher.environment` key.
1111

1212
In the example below, `ETCD_DISCOVERY` will be set to `https://discovery.etcd.io/d1cd18f5ee1c1e2223aed6a1734719f7` for the `etcd` service.
1313

rancher/v1.3/en/api/v1/common/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ In the API, the resource fields that are the most common and read only on a reso
1616

1717
Field | Type | Notes
1818
---|---|---|---|---|---
19-
accountId | [account]({{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/api/api-resources/account/) | The unique identifier for the associated account
19+
accountId | account | The unique identifier for the associated account
2020
created[TS] | date | The date/time when the resource was initially created.
2121
id | string | The unique identifier for the resource.
2222
kind | string | A more specific sub-type for the resource.

rancher/v1.3/en/api/v1/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ In the documentation, we have used the UI term in descriptions and have provided
2626

2727
### Authentication
2828

29-
API requests must include authentication information if [Access Control]({{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/access-control/) is enabled. Authentication is done with HTTP basic authentication using [API Keys]({{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/api/api-resources/apikey). API keys can either belong to a single (UI) Environment / (API) [Project]({{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/api/api-resources/project/) with access to just that Environment, or to a [Account]({{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/api/api-resources/account) with access to all Environments the account belongs to, and the ability to create new ones. There is also a separate JSON Web Token interface primarily for the UI.
29+
API requests must include authentication information if [Access Control]({{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/access-control/) is enabled. Authentication is done with HTTP basic authentication using API Keys. API keys can either belong to a single (UI) Environment / (API) Project with access to just that Environment, or to a Account with access to all Environments the account belongs to, and the ability to create new ones. There is also a separate JSON Web Token interface primarily for the UI.
3030

3131
> **Note:** In our examples, we've assumed that the `${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY}` are Account API Keys, but if you were to use an Environment API Key, you could omit the `projects/${PROJECT_ID}` from the URL.
3232

rancher/v1.3/en/windows/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ As part of adding a host into Rancher, the Rancher agent is installed and regist
4242

4343
### Networking in Windows
4444

45-
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-networking).
45+
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/container-networking/architecture).
4646

4747
Currently, the default **Windows** environment template supports a transparent network named `transparent`, which is created by running `docker network create -d transparent transparent`.
4848

rancher/v1.4/en/windows/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ As part of adding a host into Rancher, the Rancher agent is installed and regist
4040

4141
### Networking in Windows
4242

43-
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-networking).
43+
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/container-networking/architecture).
4444

4545
Currently, the default **Windows** environment template supports a transparent network named `transparent`, which is created by running `docker network create -d transparent transparent`.
4646

rancher/v1.5/en/windows/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ As part of adding a host into Rancher, the Rancher agent is installed and regist
4040

4141
### Networking in Windows
4242

43-
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-networking).
43+
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/container-networking/architecture).
4444

4545
Currently, the default **Windows** environment template supports a transparent network named `transparent`, which is created by running `docker network create -d transparent transparent`.
4646

rancher/v1.6/en/windows/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ As part of adding a host into Rancher, the Rancher agent is installed and regist
164164

165165
### Networking in Windows
166166

167-
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-networking).
167+
By default, we support NAT and transparent [networking](https://docs.microsoft.com/en-us/virtualization/windowscontainers/container-networking/architecture).
168168

169169
Currently, the default **Windows** environment template supports a transparent network named `transparent`, which is created by running `docker network create -d transparent transparent`.
170170

rancher/v1.6/zh/windows/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ lang: zh
3737
```
3838

3939
### Windows 中的网络
40-
我们默认支持NAT和[透明网络](https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/container-networking).
40+
我们默认支持NAT和[透明网络](https://docs.microsoft.com/en-us/virtualization/windowscontainers/container-networking/architecture).
4141

4242
目前,默认的 **Windows** 环境模版支持名为transparent的透明网络
4343
这个透明网络是在运行 `docker network create -d transparent transparent`时创建的。

0 commit comments

Comments
 (0)