summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@redhat.com>2017-03-03 09:58:31 +0100
committerStef Walter <stefw@redhat.com>2017-08-09 10:05:55 +0200
commitdf6863a758176feda898751c811ecd7deba3ea05 (patch)
tree0704c504d7f1a28ea8fc630f5f5b6fbb3f53b3d9
parentc2e8f2ece5d36aca34ab6089c87a9f9db217e777 (diff)
Fix broken links
-rw-r--r--content/cockpit/cockpit-0.78.md4
-rw-r--r--content/cockpit/cockpit-plugin-tutorial.md8
-rw-r--r--content/cockpit/cockpit-vagrantfile.md2
-rw-r--r--content/cockpit/dbus-basics.md12
-rw-r--r--content/cockpit/protocol-interaction.md2
-rw-r--r--content/cockpit/rest-api-plugin.md6
6 files changed, 17 insertions, 17 deletions
diff --git a/content/cockpit/cockpit-0.78.md b/content/cockpit/cockpit-0.78.md
index 3d9b54e..1cfd7f4 100644
--- a/content/cockpit/cockpit-0.78.md
+++ b/content/cockpit/cockpit-0.78.md
@@ -20,8 +20,8 @@ The Cockpit Guide has been updated and includes information about how
various features are implemented, and what sort of privileges they use
on the system.
-Here's a link to [the guide](http://files.cockpit-project.org/guide/latest/) or you can take a look at
-the [privileges docs](http://files.cockpit-project.org/guide/latest/privileges.html).
+Here's a link to [the guide](http://cockpit-project.org/guide/latest/) or you can take a look at
+the [privileges docs](http://cockpit-project.org/guide/latest/privileges.html).
### Compatibility with old Cockpit
diff --git a/content/cockpit/cockpit-plugin-tutorial.md b/content/cockpit/cockpit-plugin-tutorial.md
index a311825..c19f9fc 100644
--- a/content/cockpit/cockpit-plugin-tutorial.md
+++ b/content/cockpit/cockpit-plugin-tutorial.md
@@ -123,7 +123,7 @@ Lets take a look at the pinger HTML, and see how it works.
</body>
</html>
-First we include `jquery.js` and `cockpit.js`. `cockpit.js` defines the basic API for interacting with the system, as well as Cockpit itself. You can find [detailed documentation here](http://files.cockpit-project.org/guide/latest/api-cockpit.html).
+First we include `jquery.js` and `cockpit.js`. `cockpit.js` defines the basic API for interacting with the system, as well as Cockpit itself. You can find [detailed documentation here](http://cockpit-project.org/guide/latest/development.html).
:::html
<script src="../base1/jquery.js"></script>
@@ -139,12 +139,12 @@ Next we attach a handler to the *Ping* button so that the `ping_run()` function
function ping_run() {
-In the `ping_run()` function is where the magic happens. `cockpit.spawn` is a function, [documented here](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-spawn) that lets you spawn processes on the server and interact with them via stdin and stdout. Here we spawn the `ping` command with some arguments:
+In the `ping_run()` function is where the magic happens. `cockpit.spawn` is a function, [documented here](http://cockpit-project.org/guide/latest/cockpit-spawn.html) that lets you spawn processes on the server and interact with them via stdin and stdout. Here we spawn the `ping` command with some arguments:
:::javascript
var proc = cockpit.spawn(["ping", "-c", "4", address.val()]);
-In a web browser you cannot block and wait until a method call completes. Anything that doesn't happen instantaneously gets its results reported back to you by [means of callback handlers](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-spawn-done). jQuery has a standard interface [called a promise](http://api.jquery.com/deferred.promise/). You add handlers by calling the `.done()` or `.fail()` methods and registering callbacks. `proc.stream()` registers a callback to be invoked whenever the process produces output.
+In a web browser you cannot block and wait until a method call completes. Anything that doesn't happen instantaneously gets its results reported back to you by [means of callback handlers](http://cockpit-project.org/guide/latest/cockpit-spawn.html#cockpit-spawn-done). jQuery has a standard interface [called a promise](http://api.jquery.com/deferred.promise/). You add handlers by calling the `.done()` or `.fail()` methods and registering callbacks. `proc.stream()` registers a callback to be invoked whenever the process produces output.
:::javascript
proc.done(ping_success);
@@ -155,4 +155,4 @@ In a web browser you cannot block and wait until a method call completes. Anythi
The `ping_success()` and `ping_fail()` and `ping_output()` update the display as you would expect.
-So there you go ... it's a simple plugin to start off with ... next time we'll cover [how to use DBus](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-dbus), and then the real fun begins.
+So there you go ... it's a simple plugin to start off with ... next time we'll cover [how to use DBus](http://cockpit-project.org/guide/latest/cockpit-dbus.html), and then the real fun begins.
diff --git a/content/cockpit/cockpit-vagrantfile.md b/content/cockpit/cockpit-vagrantfile.md
index 999eceb..aeef24e 100644
--- a/content/cockpit/cockpit-vagrantfile.md
+++ b/content/cockpit/cockpit-vagrantfile.md
@@ -88,7 +88,7 @@ you'll want to look at the information about
[Contributing](https://github.com/cockpit-project/cockpit/wiki/Contributing) and if you need help
understanding how to add a
[plugin package](http://stef.thewalter.net/creating-plugins-for-the-cockpit-user-interface.html)
-you can look at the [Developer Guide](http://files.cockpit-project.org/guide/latest/development.html).
+you can look at the [Developer Guide](http://cockpit-project.org/guide/latest/development.html).
## Bringing the Vagrant VM in sync
diff --git a/content/cockpit/dbus-basics.md b/content/cockpit/dbus-basics.md
index e5599a7..36c3780 100644
--- a/content/cockpit/dbus-basics.md
+++ b/content/cockpit/dbus-basics.md
@@ -100,7 +100,7 @@ You should see your timezone on your screen update immediately to reflect the ne
</body>
</html>
-First we include `jquery.js` and `cockpit.js`. `cockpit.js` defines the basic API for interacting with the system, as well as Cockpit itself. You can find [detailed documentation here](http://files.cockpit-project.org/guide/latest/api-cockpit.html).
+First we include `jquery.js` and `cockpit.js`. `cockpit.js` defines the basic API for interacting with the system, as well as Cockpit itself. You can find [detailed documentation here](http://cockpit-project.org/guide/latest/development.html).
:::html
<script src="../base1/jquery.js"></script>
@@ -114,17 +114,17 @@ Next we attach a handler to the *Change* button so that the `change_zone()` func
:::javascript
$("#change").on("click", change_zone);
-Next we connect to the [timedated](http://www.freedesktop.org/wiki/Software/systemd/timedated/) DBus service using the [`cockpit.dbus()`](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-dbus-dbus) function:
+Next we connect to the [timedated](http://www.freedesktop.org/wiki/Software/systemd/timedated/) DBus service using the [`cockpit.dbus()`](http://cockpit-project.org/guide/latest/cockpit-dbus.html#cockpit-dbus-dbus) function:
:::javascript
var service = cockpit.dbus('org.freedesktop.timedate1');
-Now we make a proxy which represents a particular DBus interface containing methods and properties. Simple services have only one interface. When more than one interface or instance of that interface is present, there are additional arguments to the [`.proxy()`](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-dbus-proxy) method that you can specify.
+Now we make a proxy which represents a particular DBus interface containing methods and properties. Simple services have only one interface. When more than one interface or instance of that interface is present, there are additional arguments to the [`.proxy()`](http://cockpit-project.org/guide/latest/cockpit-dbus.html#cockpit-dbus-proxy) method that you can specify.
:::javascript
var timedate = service.proxy();
-Each interface proxy has a [`"changed"`](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-dbus-proxy-onchanged) event we can connect to. When properties on the proxy change, or are received for the first time, this event is fired. We use this to call our `display_zone()` function and update the display of the current time zone:
+Each interface proxy has a [`"changed"`](http://cockpit-project.org/guide/latest/cockpit-dbus.html#cockpit-dbus-proxy-onchanged) event we can connect to. When properties on the proxy change, or are received for the first time, this event is fired. We use this to call our `display_zone()` function and update the display of the current time zone:
:::javascript
$(timedate).on("changed", display_zone);
@@ -140,7 +140,7 @@ Each interface proxy has a [`"changed"`](http://files.cockpit-project.org/guide/
function change_zone() {
var call = timedate.SetTimezone(input.val(), true);
-In a web browser you cannot block and wait until a method call completes. Anything that doesn't happen instantaneously gets its results reported back to you by [means of callback handlers](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-dbus-done). jQuery has a standard interface [called a promise](http://api.jquery.com/deferred.promise/). You add handlers by calling the `.done()` or `.fail()` methods and registering callbacks.
+In a web browser you cannot block and wait until a method call completes. Anything that doesn't happen instantaneously gets its results reported back to you by [means of callback handlers](http://cockpit-project.org/guide/latest/cockpit-dbus.html#cockpit-dbus-done). jQuery has a standard interface [called a promise](http://api.jquery.com/deferred.promise/). You add handlers by calling the `.done()` or `.fail()` methods and registering callbacks.
call.fail(change_fail);
failure.empty();
@@ -150,4 +150,4 @@ The `change_fail()` displays any failures that happen. In this case, `SetTimezon
Notice that we relied on DBus to tell us when things changed and just updated the display from our event handler. That way we reacted both when the time zone changed due to an action in Cockpit, as well as an action on the server.
-Again this is a simple example, but I hope it will whet your appetite to what [Cockpit can do with DBus](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-dbus). Obviously you can also do signal handling, working with return values from methods, tracking all instances of a given interface, and other stuff you would expect to do as a DBus client.
+Again this is a simple example, but I hope it will whet your appetite to what [Cockpit can do with DBus](http://cockpit-project.org/guide/latest/cockpit-dbus.html). Obviously you can also do signal handling, working with return values from methods, tracking all instances of a given interface, and other stuff you would expect to do as a DBus client.
diff --git a/content/cockpit/protocol-interaction.md b/content/cockpit/protocol-interaction.md
index c43ed42..02fef06 100644
--- a/content/cockpit/protocol-interaction.md
+++ b/content/cockpit/protocol-interaction.md
@@ -197,7 +197,7 @@ The process will send its output in the payload of one or more messages of the `
Doing it over a WebSocket
-------------------------
-Obviously in Cockpit we send all of these messages from the browser through a WebSocket hosted by `cockpit-ws`. `cockpit-ws` then passes them on to `cockpit-bridge`. You can communicate this way too, if you [configure Cockpit to accept different Websocket Origins](http://files.cockpit-project.org/guide/cockpit.conf.5.html).
+Obviously in Cockpit we send all of these messages from the browser through a WebSocket hosted by `cockpit-ws`. `cockpit-ws` then passes them on to `cockpit-bridge`. You can communicate this way too, if you [configure Cockpit to accept different Websocket Origins](http://cockpit-project.org/guide/latest/cockpit.conf.5.html).
And on it goes
--------------
diff --git a/content/cockpit/rest-api-plugin.md b/content/cockpit/rest-api-plugin.md
index 07827df..6a890b2 100644
--- a/content/cockpit/rest-api-plugin.md
+++ b/content/cockpit/rest-api-plugin.md
@@ -97,7 +97,7 @@ You should see the numbers update as the container is pulled and started. When y
</body>
</html>
-First we include `jquery.js` and `cockpit.js`. `cockpit.js` defines the basic API for interacting with the system, as well as Cockpit itself. You can find [detailed documentation here](http://files.cockpit-project.org/guide/latest/api-cockpit.html).
+First we include `jquery.js` and `cockpit.js`. `cockpit.js` defines the basic API for interacting with the system, as well as Cockpit itself. You can find [detailed documentation here](http://cockpit-project.org/guide/latest/development.html).
:::html
<script src="../base1/jquery.js"></script>
@@ -119,7 +119,7 @@ First we define how to retrieve info from Docker. We use the REST `/info` API to
info.fail(print_failure);
}
-In a browser you cannot stop and wait until a REST call completes. Anything that doesn't happen instantaneously gets its results reported back to you by [means of callback handlers](http://files.cockpit-project.org/guide/latest/api-cockpit.html#cockpit-http-done). jQuery has a standard interface [called a promise](http://api.jquery.com/deferred.promise/). You add handlers by calling the `.done()` or `.fail()` methods and registering callbacks.
+In a browser you cannot stop and wait until a REST call completes. Anything that doesn't happen instantaneously gets its results reported back to you by [means of callback handlers](http://cockpit-project.org/guide/latest/cockpit-http.html). jQuery has a standard interface [called a promise](http://api.jquery.com/deferred.promise/). You add handlers by calling the `.done()` or `.fail()` methods and registering callbacks.
The result of the `/info` call is JSON, and we process it here. This is standard jQuery for filling in text data into the various elements:
@@ -154,4 +154,4 @@ The `.get("/events")` call returns a jQuery Promise. When a line of event data a
retrieve_info();
}
-This is a simple example, but I hope it helps you get started. There are further REST [javascript calls](http://files.cockpit-project.org/guide/latest/api-cockpit.html#latest-http). Obviously you can also do `POST` and so on.
+This is a simple example, but I hope it helps you get started. There are further REST [javascript calls](http://cockpit-project.org/guide/latest/cockpit-http.html). Obviously you can also do `POST` and so on.