Skip to content

Commit acd707d

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 3c2ee5c + 48ae7b1 commit acd707d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+690
-524
lines changed

.github/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ newIssueWelcomeComment: >
1515
- "Status" labels will show if this is ready to be worked on, blocked, or in progress.
1616
- "Need" labels will indicate if additional input or analysis is required.
1717
18-
Finally, remember to use https://discuss.ipfs.io if you just need general support.
18+
Finally, remember to use https://discuss.ipfs.tech if you just need general support.
1919
2020
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
2121
# Comment to be posted to on PRs from first time contributors in your repository

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ You can learn more about [pull requests on GitHub](https://help.github.com/en/gi
115115

116116
### Discuss
117117

118-
You can also contribute to the project without specifically writing content for the site. Many discussions are happening all around the project. Protocol Labs, and by extension, IPFS, is a collaborative company that relies heavily on the community. We need your opinions and input! If you have an idea about a topic or want to weigh in on a discussion, feel free to have your say either on [GitHub](https://github.com/ipfs/ipfs-docs/issues) or on the [IPFS forums](https://discuss.ipfs.io/).
118+
You can also contribute to the project without specifically writing content for the site. Many discussions are happening all around the project. Protocol Labs, and by extension, IPFS, is a collaborative company that relies heavily on the community. We need your opinions and input! If you have an idea about a topic or want to weigh in on a discussion, feel free to have your say either on [GitHub](https://github.com/ipfs/ipfs-docs/issues) or on the [IPFS forums](https://discuss.ipfs.tech/).
119119

120120
## Tools
121121

@@ -143,4 +143,4 @@ This app helps to simplify your writing. It's easy to ramble on while writing, w
143143

144144
## Just Ask
145145

146-
After all that, if you're still not sure how to contribute to this project just post a question on the [IPFS forum](https://discuss.ipfs.io/), or join us on IRC at `#ipfs`.
146+
After all that, if you're still not sure how to contribute to this project just post a question on the [IPFS forum](https://discuss.ipfs.tech/), or join us on IRC at `#ipfs`.

README.md

Lines changed: 90 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,77 @@
1-
![IPFS documentation logo.](ipfs-docs-header.png)
2-
[![Build status icon.](https://img.shields.io/circleci/project/github/ipfs/ipfs-docs/master.svg?style=flat-square)](https://circleci.com/gh/ipfs/ipfs-docs)
3-
[![Made by icon.](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](https://protocol.ai/)
4-
[![Project icon.](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.tech/)
5-
6-
This repository organizes overall documentation issues across the IPFS project.
7-
8-
**If you'd just like to read the IPFS docs, we recommend the website version of the info contained in this repo! https://docs.ipfs.tech**
9-
10-
## Get involved
11-
12-
We would **love ❤️ your help** to improve existing items or make new ones even better! [We also have bounties available](https://github.com/ipfs/devgrants/projects/1)!
13-
14-
### Issues
15-
16-
If you find something wrong within this repository, please raise an [issue here →](https://github.com/ipfs/ipfs-docs/issues). Unless the issue is urgent, updates will be batch-merged into `main` on Tuesdays or Thursdays.
17-
18-
### Bounties
19-
20-
You can earn the undying love of the IPFS community _and_ make some money by closing an issue with the [`bounty` tag](https://github.com/ipfs/ipfs-docs/issues?q=is%3Aopen+is%3Aissue+label%3Abounty)! Submissions must be production-ready and meet all the specifications listed on the issue page. Check out the [current list of open bounties →](https://github.com/ipfs/devgrants/projects/1)
21-
22-
If you are attempting to close an issue, great! Thanks for the help! Please leave a comment within the issue requesting to be assigned to that issue **before** submitting a pull request. This minimizes the chance of multiple different contributors duplicating work by submitting pull requests for the same issue. If you submit a pull request to an issue _without_ first being assigned to it, that pull request may not be accepted.
23-
24-
### Suggestions
25-
26-
Everyone has an opinion when it comes to docs, and **that's a good thing**! Having folks from different backgrounds add to a discussion empowers everyone within that discussion. So if you've got something to add or would like to bring up a topic for discussion about the IPFS Docs project, please do so! [Just create an issue using the `kind/question` tag!](https://github.com/ipfs/ipfs-docs/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fquestion).
1+
<p align="center">
2+
<img align="center" src="ipfs-docs-header.png" width="1000">
3+
</p>
274

28-
#### Pull requests welcome
5+
<div align="center">
6+
<h3> IPFS powers the distributed web </h3>
7+
<br>
298

30-
Feel free to submit pull requests with any changes you'd like to see! If you're simply changing a typo or editing out a styling bug, you can add `ciskip` to the title of your pull request to stop Filecorgi from running. Once merged, the website is updated automatically within 5-10 minutes.
9+
[![Made by icon.](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](https://protocol.ai/)
10+
[![Project icon.](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.tech/)
11+
[![Build status icon.](https://img.shields.io/circleci/project/github/ipfs/ipfs-docs/master.svg?style=flat-square)](https://circleci.com/gh/ipfs/ipfs-docs)
12+
![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)
13+
</div>
14+
15+
<!-- TOC -->
16+
- [Project set up](#project-set-up)
17+
- [Run locally](#run-locally)
18+
- [Troubleshooting](#troubleshooting)
19+
- [Digital envelope routines initialization error](#digital-envelope-routines-initialization-error)
20+
- [Contribute to documentation](#contribute-to-documentation)
21+
- [Issues](#issues)
22+
- [Bounties](#bounties)
23+
- [Suggestions](#suggestions)
24+
- [Pull requests welcome](#pull-requests-welcome)
25+
- [Style and configuration guide](#style-and-configuration-guide)
26+
- [Static-site generator](#static-site-generator)
27+
- [Automated deployments](#automated-deployments)
28+
- [Translation](#translation)
29+
- [Core members](#core-members)
30+
- [License](#license)
31+
<!-- /TOC -->
32+
33+
---
34+
35+
Welcome to the official IPFS documentation. The Interplanetary File System (IPFS) is a distributed, peer-to-peer network for storing and accessing files, websites, applications, and data. Protocol Labs is the primary maintainer of the IPFS documentation and will review all issues and pull requests created in this repository.
36+
37+
**If you'd just like to read the IPFS documentation, we recommend the [website version](https://docs.ipfs.tech).**
3138

3239
## Project set up
3340

34-
If you want to build this site locally, run the following:
41+
### Run locally
42+
43+
To build the site locally, follow the steps below.
3544

3645
1. Clone this repository:
3746

3847
```bash
3948
git clone https://github.com/ipfs/ipfs-docs.git
4049
```
4150

42-
1. Move into the `ipfs-docs` folder and install the NPM dependencies:
51+
2. Move into the `ipfs-docs` folder and install the NPM dependencies:
4352

4453
```bash
4554
cd ipfs-docs
4655
npm install
4756
```
4857

49-
1. Boot up the application in _dev mode_:
58+
3. Boot up the application in _dev mode_:
5059

5160
```bash
5261
npm start
5362
```
5463

55-
1. Open [localhost:8080](http://localhost:8080) in your browser.
56-
1. Close the local server with `CTRL` + `c`.
57-
1. To restart the local server, run `npm start` from within the `ipfs-docs` folder.
64+
4. Open [localhost:8080](http://localhost:8080) in your browser.
65+
5. Close the local server with `CTRL` + `c`.
66+
6. To restart the local server, run `npm start` from within the `ipfs-docs` folder.
5867

59-
## Troubleshooting
68+
### Troubleshooting
6069

61-
If you're having trouble setting up the site locally, check here for solutions to some common problems.
70+
If you're having trouble setting up the site locally, check this section for solutions to common issues.
6271

63-
### Digital envelope routines initialization error
72+
#### Digital envelope routines initialization error
6473

65-
The following error message may display when using Node.js version 18.0.0 when attempting to locally deploy this project for the first time:
74+
The following error message may display when using Node.js version 18.0.0 when attempting to deploy this project for the first time:
6675

6776
```shell
6877
opensslErrorStack: [ 'error:03000086:digital envelope routines::initialization error' ],
@@ -75,7 +84,7 @@ To solve this error, perform the following steps:
7584

7685
1. Open a terminal.
7786
2. Navigate into the `ipfs-docs` folder:
78-
87+
7988
```bash
8089
cd ipfs-docs
8190
```
@@ -92,7 +101,47 @@ To solve this error, perform the following steps:
92101
npm start
93102
```
94103

95-
You can now return to the [Project set-up](#project-set-up) section above and continue on with the steps. You can also check [this issue in the Webpack GitHub repository](https://github.com/webpack/webpack/issues/14532) for more information about this error.
104+
You can return to the [Project set-up](#project-set-up) section above and continue with the steps. You can also check [this issue in the Webpack GitHub repository](https://github.com/webpack/webpack/issues/14532) for more information about this error.
105+
106+
## Contribute to documentation
107+
108+
We would **love ❤️ your help** to improve existing items or make new ones even better! [We also have bounties available](https://github.com/ipfs/devgrants/projects/1)!
109+
110+
### Issues
111+
112+
If you find something wrong within this repository, please raise an issue [here →](https://github.com/ipfs/ipfs-docs/issues). Unless the issue is urgent, updates will be batch-merged into `main` on Tuesdays or Thursdays.
113+
114+
### Bounties
115+
116+
You can earn the undying love of the IPFS community, _and_ get rewarded by closing an issue containing the [`bounty` tag](https://github.com/ipfs/ipfs-docs/issues?q=is%3Aopen+is%3Aissue+label%3Abounty). Submissions must be production-ready and meet all the specifications listed on the issue page. To get started, check out the [current list of open bounties →](https://github.com/ipfs/devgrants/projects/1).
117+
118+
If you are attempting to close an issue, great! Thanks for the help! Please leave a comment within the issue requesting to be assigned to that issue **before** submitting a pull request. This minimizes the chance of multiple contributors duplicating work by submitting pull requests for the same issue. If you submit a pull request to an issue _without_ first being assigned to it, your pull request may not be accepted.
119+
120+
### Suggestions
121+
122+
Everyone has an opinion when it comes to documentation, and **that's a good thing**! Having folks from different backgrounds add to a discussion empowers everyone within that discussion, so if you've got something to add or would like to bring up a topic for discussion about the documentation, please do so! Create an issue using the [`kind/question` tag](https://github.com/ipfs/ipfs-docs/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fquestion).
123+
124+
### Pull requests welcome
125+
126+
Feel free to submit pull requests with any changes you'd like to see. If you're simply changing a typo or editing a styling bug, you can add `ciskip` to the title of your pull request to stop Filecorgi from running. Once merged, the website is updated automatically within 5-10 minutes.
127+
128+
## Style and configuration guide
129+
130+
A writing style and template guide is in the process of being written that contributors can use as a guideline.
131+
132+
### Static-site generator
133+
134+
The IPFS documentation site uses the [VuePress static website generator](https://vuepress.vuejs.org/) to convert the Markdown guides into a documentation website. All the documentation is written in Markdown; follow the [VuePress Markdown documentation](https://vuepress.github.io/guide/markdown.html) for information on how to write markdown files for VuePress.
135+
136+
### Automated deployments
137+
138+
When opening a pull request, CI scripts will run against your feature branch to test your changes.
139+
140+
The CI/CD production workflow builds on the `main` branch and deploys the documentation site on [fleek](https://fleek.co/). The site reflects the latest commit on `main`.
141+
142+
### Translation
143+
144+
Please stay tuned on the steps to translate the documentation.
96145

97146
## Core members
98147

@@ -101,4 +150,4 @@ You can now return to the [Project set-up](#project-set-up) section above and co
101150

102151
## License
103152

104-
All software code is copyright (c) Protocol Labs, Inc. under the **MIT license**. Other written documentation and content is copyright (c) Protocol Labs, Inc. under the [**Creative Commons Attribution-Share-Alike License**](https://creativecommons.org/licenses/by/4.0/).
153+
All software code is copyright (c) Protocol Labs, Inc. under the **MIT license**. Other written documentation and content are copyright (c) Protocol Labs, Inc. under the [**Creative Commons Attribution-Share-Alike License**](https://creativecommons.org/licenses/by/4.0/).

docs/.vuepress/config.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ module.exports = {
7777
'install/ipfs-companion',
7878
'install/command-line',
7979
['install/ipfs-updater', 'Updater'],
80-
'install/server-infrastructure',
81-
'install/recent-releases'
80+
'install/server-infrastructure'
8281
]
8382
},
8483
{
@@ -153,7 +152,7 @@ module.exports = {
153152
['/concepts/case-study-fleek', 'Fleek'],
154153
['/concepts/case-study-likecoin', 'LikeCoin'],
155154
['/concepts/case-study-morpheus', 'Morpheus.Network'],
156-
['/concepts/case-study-openbazaar', 'OpenBazaar']
155+
['/concepts/case-study-snapshot', 'Snapshot']
157156
]
158157
},
159158
{
@@ -286,12 +285,12 @@ module.exports = {
286285
'IPFS newsletter'
287286
],
288287
'/community/contribute/ways-to-contribute',
289-
['https://discuss.ipfs.io/', 'IPFS forums'],
288+
['https://discuss.ipfs.tech/', 'IPFS forums'],
290289
'/community/chat',
291290
['https://proto.school/events', 'ProtoSchool workshops'],
292291
['https://www.meetup.com/members/249142444/', 'Meetups'],
293292
'/community/social-media',
294-
['https://awesome.ipfs.io', 'Awesome IPFS'],
293+
['https://awesome.ipfs.tech', 'Awesome IPFS'],
295294
[
296295
'https://www.youtube.com/channel/UCdjsUXJ3QawK4O5L1kqqsew',
297296
'YouTube'

docs/.vuepress/head.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,10 @@ module.exports = [
4848
content: '/browserconfig.xml'
4949
}
5050
],
51-
['meta', { name: 'theme-color', content: '#5bbad5' }]
51+
['meta', { name: 'theme-color', content: '#5bbad5' }],
52+
['script', {
53+
defer: true,
54+
'data-domain': "docs.ipfs.tech",
55+
src: "https://plausible.io/js/plausible.js"
56+
}, ``],
5257
]

docs/.vuepress/redirects

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@
3535
/introduction/how-ipfs-works/ /concepts/how-ipfs-works
3636
/introduction/overview/ /concepts/what-is-ipfs
3737
/introduction/usage/ /how-to/command-line-quick-start
38-
/recent-releases/ /install/recent-releases
39-
/recent-releases/go-ipfs-0-5/ /install/recent-releases
40-
/recent-releases/go-ipfs-0-5/features/ /install/recent-releases
41-
/recent-releases/go-ipfs-0-5/fixes/ /install/recent-releases
42-
/recent-releases/go-ipfs-0-5/install/ /install/recent-releases
43-
/recent-releases/go-ipfs-0-5/troubleshooting/ /install/recent-releases
44-
/recent-releases/go-ipfs-0-5/update-procedure/ /install/recent-releases
45-
/recent-releases/go-ipfs-0-6/ /install/recent-releases
46-
/recent-releases/go-ipfs-0-6/features/ /install/recent-releases
47-
/recent-releases/go-ipfs-0-6/install/ /install/recent-releases
48-
/recent-releases/go-ipfs-0-6/update-procedure/ /install/recent-releases
49-
/recent-releases/go-ipfs-0-7/ /install/recent-releases
50-
/recent-releases/go-ipfs-0-7/features/ /install/recent-releases
51-
/recent-releases/go-ipfs-0-7/install/ /install/recent-releases
52-
/recent-releases/go-ipfs-0-7/update-procedure/ /install/recent-releases
38+
/install/recent-releases/ https://github.com/ipfs/kubo/releases
39+
/install/recent-releases/go-ipfs-0-5/ https://github.com/ipfs/kubo/releases
40+
/install/recent-releases/go-ipfs-0-5/features/ https://github.com/ipfs/kubo/releases
41+
/install/recent-releases/go-ipfs-0-5/fixes/ https://github.com/ipfs/kubo/releases
42+
/install/recent-releases/go-ipfs-0-5/install/ https://github.com/ipfs/kubo/releases
43+
/install/recent-releases/go-ipfs-0-5/troubleshooting/ https://github.com/ipfs/kubo/releases
44+
/install/recent-releases/go-ipfs-0-5/update-procedure/ https://github.com/ipfs/kubo/releases
45+
/install/recent-releases/go-ipfs-0-6/ https://github.com/ipfs/kubo/releases
46+
/install/recent-releases/go-ipfs-0-6/features/ https://github.com/ipfs/kubo/releases
47+
/install/recent-releases/go-ipfs-0-6/install/ https://github.com/ipfs/kubo/releases
48+
/install/recent-releases/go-ipfs-0-6/update-procedure/ https://github.com/ipfs/kubo/releases
49+
/install/recent-releases/go-ipfs-0-7/ https://github.com/ipfs/kubo/releases
50+
/install/recent-releases/go-ipfs-0-7/features/ https://github.com/ipfs/kubo/releases
51+
/install/recent-releases/go-ipfs-0-7/install/ https://github.com/ipfs/kubo/releases
52+
/install/recent-releases/go-ipfs-0-7/update-procedure/ https://github.com/ipfs/kubo/releases
5353
/reference/api/ /reference
5454
/reference/api/cli/ /reference/kubo/cli
5555
/reference/cli/ /reference/kubo/cli

docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ ProtoSchool's self-guided [interactive tutorials](https://proto.school/tutorials
5353

5454
Are you looking for inspiration? You can find a huge collection of awesome community projects over at Awesome IPFS.
5555

56-
[Check out Awesome IPFS now →](https://awesome.ipfs.io/)
56+
[Check out Awesome IPFS now →](https://awesome.ipfs.tech/)
5757

5858
![The Awesome IPFS homepage.](./images/awesome-ipfs.png =740x420)
5959

6060
## Be part of the IPFS community
6161

62-
IPFS has a bustling community of designers, developers, writers, and activists who are all helping to improve the project. You can join in by attending a local meetup, helping out at a conference, chatting online through [Discord](https://discord.com/invite/KKucsCpZmY), or joining a discussion in [the IPFS forum](https://discuss.ipfs.io/).
62+
IPFS has a bustling community of designers, developers, writers, and activists who are all helping to improve the project. You can join in by attending a local meetup, helping out at a conference, chatting online through [Discord](https://discord.com/invite/KKucsCpZmY), or joining a discussion in [the IPFS forum](https://discuss.ipfs.tech/).
6363

6464
[Find out more in the Community section →](community/README.md)

docs/basics/ipfs-implementations.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
---
2-
title: IPFS Implementations
3-
description: Learn about the various IPFS implementations available for different usecases
2+
title: "IPFS implementations"
3+
description: "There isn't one canonical IPFS implemetnation. Learn about the various IPFS implementations available for different usecases."
44
---
55

6+
# IPFS implementations
67

7-
**There isn't one canonical IPFS implementation.**
8-
9-
There is so much to explore in this space that it's ideal to have a plethora of implementations experimenting and optimizing for various usecases.
10-
11-
Below is a list of IPFS implementations that we know of in name alphabetical order.
12-
If you're aware of more, please add!
8+
There isn't one canonical IPFS implementation. There is so much to explore in this space that it's ideal to have a plethora of implementations experimenting and optimizing for various usecases. Below is a list of IPFS implementations that we know of in name alphabetical order. If you're aware of more, please add!
139

1410
::: tip
1511
Looking into implementing IPFS yourself?
1612
Relevant specifications are listed in [ipfs/specs](https://github.com/ipfs/specs/).
1713
:::
1814

19-
20-
2115
| Name | URL | Language(s) | What it's trying to do |
2216
|------------------|-------------------------------------------------------------------------|------------------------|--------------------------------------------------------------------------------------------------------------------------|
2317
| auspinner | <https://github.com/2color/auspinner> | go | CLI tool to deal with the pinning service API and upload files through bitswap. |

0 commit comments

Comments
 (0)