Merge branch 'master' of github.com:sveltejs/svelte

site/content/docs/03-run-time.md

@@ -265,7 +265,7 @@ const time = readable(new Date(), set => {
 });
 ```
 
-#### `derive`
+#### `derived`
 
 * `store = derived(a, callback: (a: any) => any)`
 * `store = derived(a, callback: (a: any, set: (value: any) => void) => void)`

site/content/tutorial/08-stores/04-derived-stores/text.md

@@ -11,4 +11,4 @@ export const elapsed = derived(
 );
 ```
 
-> It's possible to derive a store from multiple inputs, and to explicitly `set` a value instead of returning it (which is useful for deriving values asynchronously). Consult the [API reference](docs/TK) for more information.
+> It's possible to derive a store from multiple inputs, and to explicitly `set` a value instead of returning it (which is useful for deriving values asynchronously). Consult the [API reference](docs#derived) for more information.