adds links and update bzz api, bump version

Author: significance

docs/access-the-swarm/host-your-website.md

@@ -43,7 +43,7 @@ Make sure you trust the gateway you are interacting with! To ensure that you are
 
 First we will need to upload the website assets to Swarm in order to
 get its Swarm reference hash, see
-[uploading a directory](/docs/installation/upload-a-directory)
+[uploading a directory](/docs/access-the-swarm/upload-a-directory)
 for more information.
 
 This time we will also include the `Swarm-Index-Document` header set to the `index.html`. This will cause Bee to serve each directories `index.html` file as default when browsing to the directory root `/` url. We will also provide a custom error page, using the `Swarm-Error-Document` header.

docs/access-the-swarm/pinning.md

@@ -20,7 +20,7 @@ There are two flavours of pinning, *local* and *global*.
 If a node operator wants to keep content so that it can be accessed only by local users of that node, via the [APIs](/docs/api-reference/api-reference) or Gateway, chunks can be *pinned* either during upload, or retrospectively using the Swarm reference.
 
 :::caution
-Files pinned using local pinning will still not necessarily be available to the rest of the network. Read [global pinning](/docs/advanced/persistence#global-pinning) to find out how to keep your files available to the whole of the swarm.
+Files pinned using local pinning will still not necessarily be available to the rest of the network. Read [global pinning](/docs/access-the-swarm/pinning#global-pinning) to find out how to keep your files available to the whole of the swarm.
 :::
 
 ### Pin During Upload
@@ -87,7 +87,7 @@ The previous example showed how we can pin content upon upload. It is also possi
 To do so, we can send a `POST` request including the swarm reference to the files pinning endpoint.
 
 ```bash
-curl -XPOST http://localhost:1633/pin/files/7b344ea68c699b0eca8bb4cfb3a77eb24f5e4e8ab50d38165e0fb48368350e8f
+curl -XPOST http://localhost:1633/pin/7b344ea68c699b0eca8bb4cfb3a77eb24f5e4e8ab50d38165e0fb48368350e8f
 ``
 
 ```json
@@ -112,7 +112,7 @@ While the pin operation will attempt to fetch content from the network if it is
 
 ## Global Pinning
 
-[Local pinning](/docs/advanced/persistence#local-pinning) ensures that your own node does not delete uploaded files. But other nodes that store your
+[Local pinning](/docs/access-the-swarm/pinning#global-pinning) ensures that your own node does not delete uploaded files. But other nodes that store your
 chunks (because they fall within their *neighbourhood of responsibility*) may have deleted content
 that has not been accessed recently to make room for new chunks.
 
@@ -137,7 +137,7 @@ bee start\
 Next, we pin our file locally, as shown above.
 
 ```bash
-curl -H "swarm-pin: true" --data-binary @bee.mp4 localhost:1633/files\?bee.mp4
+curl -H "swarm-pin: true" --data-binary @bee.mp4 localhost:1633/bzz\?bee.mp4
 ```
 
 ```json
@@ -147,7 +147,7 @@ curl -H "swarm-pin: true" --data-binary @bee.mp4 localhost:1633/files\?bee.mp4
 Now, when we distribute links to our files, we must also specify the first two bytes of our
 overlay address as the *target*. If a chunk that has already been garbage collected by
 its storer nodes is requested, the storer node will send a message using
-[PSS](/docs/advanced/pss) to the Swarm neighbourhood defined by this prefix,
+[PSS](/docs/dapps-on-swarm/pss) to the Swarm neighbourhood defined by this prefix,
 of which our node is a member.
 
 Let's use the addresses API endpoint to find out our target prefix.
@@ -163,7 +163,7 @@ curl -s http://localhost:1635/addresses | jq .overlay
 Finally, we take the first two bytes of our overlay address, `320e` and include this when referencing our chunk.
 
 ```bash
-curl http://localhost:1633/files/7b344ea68c699b0eca8bb4cfb3a77eb24f5e4e8ab50d38165e0fb48368350e8f?targets=320e
+curl http://localhost:1633/bzz/7b344ea68c699b0eca8bb4cfb3a77eb24f5e4e8ab50d38165e0fb48368350e8f?targets=320e
 ```
 
 Now, even if our chunks are deleted, they will be repaired in the network by our local Bee node and will always be available to the whole swarm!

docs/access-the-swarm/store-with-encryption.md

@@ -0,0 +1,44 @@
+---
+title: Store with Encryption
+id: store-with-encryption
+---
+
+In Swarm, all data is public by default. To protect sensitive content, it must be encrypted so that only authorised users are able to decrypt and then view the plaintext content. 
+
+The Bee client provides a facility to encrypt files and directories while uploading which are only able to be read by users with access to the corresponding decryption key.
+
+# Encrypt and Upload a File
+
+To encrypt a file simply include the `Swarm-Encrypt: true` header with your HTTP request.
+
+```bash
+curl -F file=@bee.jpg -H "Swarm-Encrypt: true" http://localhost:1633/files
+```
+
+When successful, the Bee client will return a 64 byte reference, instead of the usual 32 bytes.
+
+```json
+{"reference":"f7b1a45b70ee91d3dbfd98a2a692387f24db7279a9c96c447409e9205cf265baef29bf6aa294264762e33f6a18318562c86383dd8bfea2cec14fae08a8039bf3"}
+```
+
+Here we see that, when using the Bee node's encryption function, the reference hash that is returned is 128 hex characters long. The first 64 characters of this are the familiar Swarm address - the reference that allows us to retrieve the data from the swarm - it is the same as the reference we would get uploading unencrypted files to using Bee it is safe to share.
+
+The second second part of the reference is a 64 character decryption key which is required to decrypt the referenced content and view the original data in the clear, this is sensitive key material and must be kept private.
+
+It is important that this data is not be sent in requests to a public gateway as this would mean that gateway would be able to decrypt your data. However, if you are running a node on your local machine, you may safely use the api bound to `localhost`. The key material is never exposed to the network so your data remains safe.
+
+:::info
+Encryption is disabled by default on all Swarm Gateways to keep your data safe. [Install Bee on your computer](/docs/installation/quick-start) to use the encryption feature.
+:::
+
+# Download and Decrypt a File
+
+To retrieve your file, simply supply the full 64 byte string to the files endpoint, and the Bee client will download and decrypt all the relevant chunks and restore them to their original format.
+
+```bash
+curl -OJ http://localhost:1633/files/f7b1a45b70ee91d3dbfd98a2a692387f24db7279a9c96c447409e9205cf265baef29bf6aa294264762e33f6a18318562c86383dd8bfea2cec14fae08a8039bf3
+```
+
+:::danger
+Never use public gateways when requesting full encrypted references, the hash contains sensitive key information which should be kept private. Run [your own node](/docs/installation/quick-start) to get to use Bee's encryption features.
+:::

docs/access-the-swarm/upload-a-directory.md

@@ -76,7 +76,7 @@ Other files are served at their relative paths, e.g.
 
 [http://localhost:1633/bzz/b25c89a...214917b/assets/style.css](http://localhost:1633/bzz/b25c89a401d9f26811680476619a1eb4a4e189e614bc6161cbfd8b343214917b/assets/style.css) 
 
-Once your data has been [fully processed into the network](/docs/advanced/tags), you will then be able to retrieve it from any Bee node.
+Once your data has been [fully processed into the network](/docs/access-the-swarm/syncing), you will then be able to retrieve it from any Bee node.
 
 [https://gateway.ethswarm.org/bzz/b25c89a...214917b/index.html](https://gateway.ethswarm.org/bzz/b25c89a401d9f26811680476619a1eb4a4e189e614bc6161cbfd8b343214917b/)
 

docs/access-the-swarm/upload-and-download.md

@@ -39,17 +39,17 @@ Once running, a file can be uploaded by making an HTTP POST request to the `file
 Here, you must specify your *batch id* in the Swarm-Postage-Batch-Id header as follows.
 
 ```bash
-curl -H "Swarm-Postage-Batch-Id: 78a26be9b42317fe6f0cbea3e47cbd0cf34f533db4e9c91cf92be40eb2968264" -F file=@bee.jpg http://localhost:1633/files
+curl -H "Swarm-Postage-Batch-Id: 78a26be9b42317fe6f0cbea3e47cbd0cf34f533db4e9c91cf92be40eb2968264" -F file=@bee.jpg http://localhost:1633/bzz
 ```
 
 We may also pass the appropriate mime type in the `Content-Type` header, and a file name to the `name` query parameter so that the file will be correctly handled by web browsers and other applications.
 
 ```bash
-curl --data-binary @bee.jpg  -H "Swarm-Postage-Batch-Id: 78a26be9b42317fe6f0cbea3e47cbd0cf34f533db4e9c91cf92be40eb2968264" -H "Content-Type: video/jpg" "http://localhost:1633/files?name=bee.jpg"
+curl --data-binary @bee.jpg  -H "Swarm-Postage-Batch-Id: 78a26be9b42317fe6f0cbea3e47cbd0cf34f533db4e9c91cf92be40eb2968264" -H "Content-Type: video/jpg" "http://localhost:1633/bzz?name=bee.jpg"
 ```
 
 :::danger
-Data uploaded to the swarm is always public. In Swarm, sensitive files must be [encrypted](/docs/installation/store-with-encryption) before uploading to ensure their contents always remains private.
+Data uploaded to the swarm is always public. In Swarm, sensitive files must be [encrypted](/docs/access-the-swarm/store-with-encryption) before uploading to ensure their contents always remains private.
 :::
 
 When succesful, a json formatted response will be returned, containing a **swarm reference** or **hash** which is the *address* of the uploaded file, for example:
@@ -62,7 +62,7 @@ Keep this *address* safe, as we'll use it to retrieve our content later on.
 In Swarm, every piece of data has a unique *address* which is a unique and reproducible cryptographic hash digest. If you upload the same file twice, you will always receive the same hash. This makes working with data in Swarm super secure!
 
 :::info
-If you are uploading a large file it is useful to track the status of your upload as it is processed into the network. Head over to the advanced usage section to learn how to [follow the status of your upload](/docs/advanced/tags). 
+If you are uploading a large file it is useful to track the status of your upload as it is processed into the network. Head over to the advanced usage section to learn how to [follow the status of your upload](/docs/access-the-swarm/syncing). 
 
 Once your file has been **completely synced with the network**, you will be able to turn off your computer and other nodes will take over to serve the data for you!
 :::
@@ -74,17 +74,17 @@ Once your file is uploaded into Swarm, it can be retrieved with a simple HTTP GE
 Substitute the *hash* in the last part of the url to be the reference to your own data.
 
 ```bash
-curl -OJ http://localhost:1633/files/042d4fe94b946e2cb51196a8c136b8cc335156525bf1ad7e86356c2402291dd4
+curl -OJ http://localhost:1633/bzz/042d4fe94b946e2cb51196a8c136b8cc335156525bf1ad7e86356c2402291dd4
 ```
 
 You may even simply navigate to the URL in your browser:
 
-[http://localhost:1633/files/042d4fe...2291dd4](http://localhost:1633/files/042d4fe94b946e2cb51196a8c136b8cc335156525bf1ad7e86356c2402291dd4)
+[http://localhost:1633/bzz/042d4fe...2291dd4](http://localhost:1633/bzz/042d4fe94b946e2cb51196a8c136b8cc335156525bf1ad7e86356c2402291dd4)
 
 ## Public Gateways
 
 To share files with someone who isn't running a Bee node yet, simply change the host in the link to be one of our public gateways. Send the link to your friends, and they will be able to download the file too!
 
-[https://gateway.ethswarm.org/files/042d4fe...2291dd4](https://gateway.ethswarm.org/files/042d4fe94b946e2cb51196a8c136b8cc335156525bf1ad7e86356c2402291dd4)
+[https://gateway.ethswarm.org/bzz/042d4fe...2291dd4](https://gateway.ethswarm.org/bzzd/042d4fe94b946e2cb51196a8c136b8cc335156525bf1ad7e86356c2402291dd4)
 
 <!-- If you are unable to download your file from a different Bee node, you may be experiencing connection issues, see [troubleshooting connectivity](/docs/troubleshooting/connectivitiy) for assistance. -->

docs/api-reference/api-reference.md

@@ -21,7 +21,7 @@ Detailed information about Bee API endpoint can be found here:
 The debug-API is disabled by default but be enabled by setting the `enable-debug-api` configuration option to `true`. The debug-API exposes functionality to inspect the state of your Bee node while it is running, as well as some other features that should not be exposed to the public internet. The Debug API runs on port `:1635` by default.
 
 :::info
-For a new installation of Bee, the debug API endpoint is not yet exposed for security reasons. To enable the debug API endpoints, set `debug-api-enable` to `true` in your [configuration file](/docs/installation/configuration#configuring-bee-installed-using-a-package-manager) and restart your Bee service.
+For a new installation of Bee, the debug API endpoint is not yet exposed for security reasons. To enable the debug API endpoints, set `debug-api-enable` to `true` in your [configuration file](/docs/working-with-bee/configuration) and restart your Bee service.
 :::
 
 - <a href="/debug-api" target="_blank" rel="noopener noreferrer">Debug API reference.</a>,

docs/bee-developers/starting-a-test-network.md

@@ -3,7 +3,7 @@ title: Starting a Test Network
 id: starting-a-test-network
 ---
 
-A test network can be used to test your applications in an isolated environment before you deploy to Swarm mainnet. It can be started by overriding the default configuration values of your Swarm node. Throughout this tutorial, we will make use of configuration files to configure the nodes but of course you can also do the same using flags or environment variables (see [Start your node](/docs/installation/configuration)). 
+A test network can be used to test your applications in an isolated environment before you deploy to Swarm mainnet. It can be started by overriding the default configuration values of your Swarm node. Throughout this tutorial, we will make use of configuration files to configure the nodes but of course you can also do the same using flags or environment variables (see [Start your node](/docs/working-with-bee/configuration)). 
 
 ## Start a network on your own computer
 ### Configuration

docs/bee-developers/useful-dev-info.md

@@ -49,7 +49,7 @@ Developers can gain an additional level of insight into the node by enabling `tr
   - Start jaeger:
 `docker run -p 6831:6831/udp -p 16686:16686 jaegertracing/all-in-one:latest`
 
-  - start locally two bee nodes (different data dirs and ports) and connect them (see "Start a test network" in the [advanced section](/docs/advanced/starting-a-test-network)) with `--tracing` flag provided for both nodes
+  - start locally two bee nodes (different data dirs and ports) and connect them (see "Start a test network" in the [advanced section](/docs/bee-developers/starting-a-test-network)) with `--tracing` flag provided for both nodes
 
 - Make a call to the PingPong API on one of the two nodes (`curl -XPOST localhost:1735/pingpong/<overlay address other node>`).
 

docs/dapps-on-swarm/bee-js.md

@@ -5,7 +5,7 @@ id: bee-js
 
 Bee-js is Bee's complementary javascript library. It is the technology underpinning the [swarm-cli](/docs/working-with-bee/bee-tools) and [bee-dashboard](/docs/working-with-bee/bee-tools) tools and is a powerful tool for building completely decentralised apps.
 
-For more information on how to develop with Bee without blowing all your gBZZ, read [this guide](/docs/dapps-on-swarm/develop-on-swarm)
+For more information on how to develop with Bee without blowing all your gBZZ, read [this guide](/docs/dapps-on-swarm/develop-on-bee)
 
 See the [bee-js](https://bee-js.ethswarm.org/) documentation for detailed information on using and installing the library.
 

docs/dapps-on-swarm/feeds.md

@@ -6,7 +6,7 @@ id: feeds
 Swarm feeds cleverly combine [single owner chunks](/docs/dapps-on-swarm/chunk-types) into a data structure which enables you to have static addresses for your mutable content. This means that you can signpost your data for other Bees, and then update at will.
 
 :::info
-Although it's possible to interact with feeds directly, it can be involve a little data juggling and crypto magic. For the easiest route, see [the bee-js feeds functionality](/docs/dapps-on-swarm/bee-js) and [swarm-cli](/docs/using-swarm/bee-tools), or for the super 1337, share your implementations in other languages in the [#develop-on-swarm](https://discord.gg/C6dgqpxZkU) channel of our [Discord Server](https://discord.gg/wdghaQsGq5).
+Although it's possible to interact with feeds directly, it can be involve a little data juggling and crypto magic. For the easiest route, see [the bee-js feeds functionality](/docs/dapps-on-swarm/bee-js) and [swarm-cli](/docs/working-with-bee/bee-tools), or for the super 1337, share your implementations in other languages in the [#develop-on-swarm](https://discord.gg/C6dgqpxZkU) channel of our [Discord Server](https://discord.gg/wdghaQsGq5).
 :::
 
 ### What are Feeds?
@@ -15,7 +15,7 @@ A feed is a collection of Single Owner Chunks with predicatable addresses. This
 
 ### Creating and Updating a Feed
 
-In order to edit a feed, you will need to sign your chunks using an Ethereum keypair. For the intrepid, check out the [The Book of Swarm](https://gateway.ethswarm.org/bzz/latest.bookofswarm.eth/) on precise details on how to do this. For the rest of us, both [bee-js](/docs/dapps-on-swarm/bee-js) and [swarm-cli](/docs/using-swarm/bee-tools) provide facilities to achieve this using javascript and a node-js powered command line tool respectively.
+In order to edit a feed, you will need to sign your chunks using an Ethereum keypair. For the intrepid, check out the [The Book of Swarm](https://gateway.ethswarm.org/bzz/latest.bookofswarm.eth/) on precise details on how to do this. For the rest of us, both [bee-js](/docs/dapps-on-swarm/bee-js) and [swarm-cli](/docs/working-with-bee/bee-tools) provide facilities to achieve this using javascript and a node-js powered command line tool respectively.
 
 ### No More ENS Transaction Charges
 
@@ -31,4 +31,4 @@ Use [bee-js](/docs/dapps-on-swarm/bee-js) to use feeds to store values as a simp
 
 #### Store the History of a File
 
-Use [swarm-cli](/docs/using-swarm/bee-tools) to store a file at the same location, and update whenever you like without changing the address.
+Use [swarm-cli](/docs/working-with-bee/bee-tools) to store a file at the same location, and update whenever you like without changing the address.