Skip to content

Commit 6e6567a

Browse files
authored
Merge branch 'main' into patch-1
2 parents cad2d86 + 5a56c1f commit 6e6567a

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

.github/workflows/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- id: checkout
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v5
1111
- id: link-check
1212
uses: gaurav-nelson/github-action-markdown-link-check@v1
1313
with:

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
with:
3434
# - For PRs: PR head commit
3535
# - For pushes: the pushed commit

.github/workflows/close-empty-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Close empty issues and templates
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: Run empty issues closer action
1616
uses: rickstaa/empty-issues-closer-action@v1
1717
env:

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
cid: ${{ steps.deploy.outputs.cid }}
2929
steps:
3030
- name: Download build artifact
31-
uses: actions/download-artifact@v4
31+
uses: actions/download-artifact@v5
3232
with:
3333
name: docs-build-${{ github.event.workflow_run.id }}
3434
path: ${{ env.BUILD_PATH }}

.github/workflows/reveiwdog-languagetool.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: languagetool
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- name: Check Spelling
1313
uses: reviewdog/action-languagetool@v1
1414
with:

.github/workflows/update-on-new-ipfs-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout ipfs-docs
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
- name: Find latest kubo tag
1515
id: latest_ipfs
1616
uses: ./.github/actions/latest-kubo-tag

.github/workflows/vale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: pr-content-check
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- id: files
1515
name: Get changed files
1616
env:

docs/concepts/nodes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ sidebarDepth: 2
66

77
# Nodes
88

9-
Participants in the IPFS network are called _nodes_. A _node_ is an instance of an implementation IPFS that you run on your local computer (directly or via a browser) to store files and connect to the IPFS network. They're the most crucial aspect of IPFS. Without IPFS nodes, there would be no IPFS Network.
9+
Participants in the IPFS network are called _nodes_. A _node_ is an instance of an implementation of IPFS that you run on your local computer (directly or via a browser) to store files and connect to the IPFS network. They're the most crucial aspect of IPFS. Without IPFS nodes, there would be no IPFS Network.
1010

1111
You're likely to see the term _node_ throughout the IPFS docs, issues, and related code. It's a very general term, so its meaning depends on the context. There are three main categories of nodes: IPFS nodes, data nodes, and libp2p nodes for applications.
1212

13-
* __IPFS Nodes__ are programs that run on a computer that can exchange data with other IPFS nodes. They go by several different names, but we refer to them by a different term, depending on the context:
13+
* __IPFS nodes__ are programs that run on a computer that can exchange data with other IPFS nodes. They go by several different names, but we refer to them by a different term, depending on the context:
1414

1515
* _node_: Use _node_ when you're referring to an individual point on the network. It's a very general term. For example, when you open IPFS Desktop, you establish yourself as a node with the potential to interact with other nodes. See [Configure a node](../how-to/configure-node.md).
1616
* _peer_: Use _peer_ when you're talking about the relationship of one node (even your own) to other nodes. It refers to their relationship as equals, with no central authority, so your node is a peer to other peers. See [Observe peers](../how-to/observe-peers.md) and [Peering with content providers](../how-to/peering-with-content-providers.md).
1717
* _daemon_: Use _daemon_ when talking about a node's activity status. When a node is online and running in the background, listening for requests for its data, it's called a _daemon_. See [Take your node online](../how-to/command-line-quick-start.md#take-your-node-online). Note that an IPFS Helia _node_ in the browser is not generally referred to as a _daemon_. However, in the context of this document, we will refer to a Helia _instance_ acting as a _node_ in the browser as a _daemon_ . For more information, see the [Helia documentation](https://github.com/ipfs/helia/wiki).
18-
* _instance_: Use _instance_ when talking about a library or program, such as a Go or JS version, running on as an IPFS node at a particular point in time. The peer ID is the same, so it's still the same _node_ as far as the IPFS network is concerned. See [Kubo](../reference/go/api.md) and [Helia](../reference/js/api.md#TODO_JS_IPFS_DEPRECATION).
18+
* _instance_: Use _instance_ when talking about a library or program, such as a Go or JS version, running as an IPFS node at a particular point in time. The peer ID is the same, so it's still the same _node_ as far as the IPFS network is concerned. See [Kubo](../reference/go/api.md) and [Helia](../reference/js/api.md#TODO_JS_IPFS_DEPRECATION).
1919

2020
* __Data nodes__, Use _data nodes_ when talking about actual pieces of data on IPFS, such as DAG nodes, UnixFS nodes, and IPLD nodes. When you add a file with the `ipfs add myfile.txt` command, IPFS breaks them up into several nodes that each contain a chunk of the file and are linked to each other. See [Merkle Directed Acyclic Graphs (DAGs)](../concepts/merkle-dag.md), [Unix File System (UnixFS)](../concepts/file-systems.md#unix-file-system-unixfs), and stay tuned for [InterPlanetary Linked Data (IPLD) model](../concepts/ipld.md) docs, which is in progress.
2121

22-
* __libp2p peer__ Use _libp2p peer_ when talking about libp2p nodes on which you can build applications. They're usually referred to as _peers_ in libp2p, because it provides solutions for essential peer-to-peer elements like transport, security, peer routing, and content discovery. See [concepts](../concepts/libp2p.md)
22+
* __libp2p peer__ Use _libp2p peer_ when talking about libp2p nodes on which you can build applications. They're usually referred to as _peers_ in libp2p, because it provides solutions for essential peer-to-peer operations like transport, security, routing, and content discovery. See [concepts](../concepts/libp2p.md)
2323

2424

2525
## Types
@@ -83,4 +83,4 @@ The [HTTP API](https://specs.ipfs.tech/routing/http-routing-v1/) can used to res
8383

8484
## Implementations
8585

86-
[Read more about IPFS implementations](./ipfs-implementations.md)
86+
[Read more about IPFS implementations](./ipfs-implementations.md)

docs/concepts/privacy-and-encryption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The other half of the equation when considering the prospect of IPFS traffic mon
3535
While a long string of letters and numbers may not be a "Johnny Appleseed" level of human-readable specificity, your PeerID is still a long-lived, unique identifier for your node. Keep in mind that it's possible to do a DHT lookup on your PeerID and, particularly if your node is regularly running from the same location (like your home), find your IP address. (It's possible to [reset your PeerID](../reference/kubo/cli.md#ipfs-key-rotate) if necessary, but similarly to changing your user ID on legacy web apps and services, is likely to involve extra effort.) Additionally, longer-term monitoring of the public IPFS network could yield information about what CIDs your node is requesting and/or reproviding and when.
3636

3737

38-
### Encryption
38+
## Encryption
3939

4040
There are two types of encryption in a network: _transport-encryption_ and _content-encryption_.
4141

@@ -57,4 +57,4 @@ IPFS uses transport-encryption but not content encryption. This means that your
5757
- [Lit Protocol](https://litprotocol.com/)
5858
- [OrbitDB](https://github.com/orbitdb)
5959
- [Peergos](https://peergos.org/)
60-
- [Textile](https://www.textile.io/)
60+
- [Textile](https://www.textile.io/)

0 commit comments

Comments
 (0)