Skip to content

Commit 852702b

Browse files
authored
Merge branch 'main' into content-addressing-folders
2 parents 77fb979 + a404b79 commit 852702b

File tree

12 files changed

+74
-74
lines changed

12 files changed

+74
-74
lines changed

docs/concepts/glossary.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Glossary
33
sidebarDepth: 0
44
description: A glossary guide to key terminology for IPFS, the InterPlanetary File System.
55
related:
6-
'Guide to libp2p terminology': https://docs.libp2p.io/reference/glossary/
6+
'Guide to libp2p terminology': https://web.archive.org/web/20260130120408/https://docs.libp2p.io/reference/glossary/
77
'Guide to IPLD terminology': https://ipld.io/glossary/
88
'IPFS Course at ProtoSchool': https://proto.school/course/ipfs
99
---
@@ -104,7 +104,7 @@ Version 1 (v1) of the IPFS content identifier. This CID version contains some le
104104

105105
### Circuit relay
106106

107-
A [libp2p](#libp2p) term for transport protocol that routes traffic between two peers over a third-party [_relay_ peer](#relay-node). [More about Circuit Relay](https://docs.libp2p.io/concepts/circuit-relay/).
107+
A [libp2p](#libp2p) term for transport protocol that routes traffic between two peers over a third-party [_relay_ peer](#relay-node). [More about Circuit Relay](https://web.archive.org/web/20260128152445/https://docs.libp2p.io/concepts/nat/circuit-relay/).
108108

109109
### Circuit relay v1
110110

@@ -364,11 +364,11 @@ The Multiformats project is a collection of protocols that aim to future-proof s
364364

365365
### Multiplexer
366366

367-
Multiplexing allows for the creation of multiple virtual connections within a single [libp2p](#libp2p) connection. [More about Stream Multiplexing in libp2p docs](https://docs.libp2p.io/concepts/multiplex/overview/)
367+
Multiplexing allows for the creation of multiple "virtual" connections within a single [libp2p](#libp2p) connection. [More about Stream Multiplexing in libp2p docs](https://web.archive.org/web/20260128163648/https://docs.libp2p.io/concepts/multiplex/overview/)
368368

369369
### Mplex
370370

371-
mplex is a deprecated stream multiplexer that was designed in the early days of [libp2p](#libp2p). [More about mplex](https://docs.libp2p.io/concepts/multiplex/mplex/)
371+
mplex is a deprecated stream multiplexer that was designed in the early days of [libp2p](#libp2p). [More about mplex](https://web.archive.org/web/20250624193954/https://docs.libp2p.io/concepts/multiplex/mplex/)
372372

373373
## N
374374

@@ -404,7 +404,7 @@ In system architecture, a Peer is an equal player in the peer-to-peer model of d
404404

405405
### Peer routing
406406

407-
Peer routing is the process of discovering the network _route_ or address for a network peer using various methods. The primary peer routing mechanism in IPFS is a distributed hash table that uses the [Kademlia routing algorithm](dht.md#lookup-algorithm) to efficiently locate peers. However, other methods, like local discovery, are also used. Learn more in the [libp2p documentation](https://docs.libp2p.io/concepts/).
407+
Peer routing is the process of discovering the network _route_ or address for a network peer using various methods. The primary peer routing mechanism in IPFS is a distributed hash table that uses the [Kademlia routing algorithm](dht.md#lookup-algorithm) to efficiently locate peers. However, other methods, like local discovery, are also used. Learn more in the [libp2p documentation](https://web.archive.org/web/20251113174247/https://docs.libp2p.io/concepts/).
408408

409409
### Peer ID
410410

@@ -438,7 +438,7 @@ Publish-subscribe (Pubsub) is an experimental feature in IPFS. Publishers send m
438438

439439
### QUIC
440440

441-
QUIC (`/quic-v1`) is one of [libp2p](#libp2p) [transport](#transport) protocols. It provides an always-encrypted, stream-multiplexed connection built on top of UDP. [More about QUIC in libp2p](https://docs.libp2p.io/concepts/transports/quic/)
441+
QUIC (`/quic-v1`) is one of [libp2p](#libp2p) [transport](#transport) protocols. It provides an always-encrypted, stream-multiplexed connection built on top of UDP. [More about QUIC in libp2p](https://web.archive.org/web/20260128152146/https://docs.libp2p.io/concepts/transports/quic/)
442442

443443
## R
444444

@@ -452,7 +452,7 @@ In IPFS context, the practice of [pinning](#pinning) the same content to multipl
452452

453453
### Relay node
454454

455-
A means to establish connectivity between libp2p nodes (e.g., IPFS nodes) that wouldn't otherwise be able to establish a direct connection to each other. This may be due to nodes that are behind NAT (Network Address Translation), reverse proxies, firewalls, etc. See [Nodes > Relay](../concepts/nodes.md#relay) and [libp2p docs about Circuit Relay](https://docs.libp2p.io/concepts/nat/circuit-relay/).
455+
A means to establish connectivity between libp2p nodes (e.g., IPFS nodes) that wouldn't otherwise be able to establish a direct connection to each other. This may be due to nodes that are behind NAT (Network Address Translation), reverse proxies, firewalls, etc. See [Nodes > Relay](../concepts/nodes.md#relay) and [libp2p docs about Circuit Relay](https://web.archive.org/web/20260128152445/https://docs.libp2p.io/concepts/nat/circuit-relay/).
456456

457457
### Remote Pinning
458458

@@ -518,15 +518,15 @@ _Swarm_ is a term for the network of IPFS peers with which your local node has c
518518

519519
In [libp2p](#libp2p), a _switch_ is a component responsible for composing multiple [transports](#transport) into a single interface, allowing application code to [dial](#dialing) peers without having to specify which transport to use.
520520

521-
Switches also coordinate the _connection upgrade_ process, which promotes a _raw_ connection from the transport layer into one that supports [protocol negotiation](https://docs.libp2p.io/concepts/protocols/#protocol-negotiation), [stream multiplexing](../concepts/libp2p.md#stream-multiplexing), and secure communications.
521+
Switches also coordinate the _connection upgrade_ process, which promotes a _raw_ connection from the transport layer into one that supports [protocol negotiation](https://web.archive.org/web/20260113172348/https://docs.libp2p.io/concepts/protocols/#protocol-negotiation), [stream multiplexing](../concepts/libp2p.md#stream-multiplexing), and secure communications.
522522

523523
Sometimes called [swarm](#swarm) for historical reasons.
524524

525525
## T
526526

527527
### Transport
528528

529-
In [libp2p](#libp2p), transport refers to the technology that lets us move data from one machine to another. This may be a TCP, UDP ([QUIC](#quic)) network, a [WebSocket](#websocket) connection in a browser, or anything else capable of implementing the transport interface. [More about libp2p transports](https://docs.libp2p.io/concepts/transports/overview/)
529+
In [libp2p](#libp2p), transport refers to the technology that lets us move data from one machine to another. This may be a TCP, UDP ([QUIC](#quic)) network, a [WebSocket](#websocket) connection in a browser, or anything else capable of implementing the transport interface. [More about libp2p transports](https://web.archive.org/web/20260128152051/https://docs.libp2p.io/concepts/transports/overview/)
530530

531531
### Traversal
532532

@@ -556,22 +556,22 @@ Wide Area Network (WAN) is a type of (usually public) computer network that span
556556

557557
### WebRTC
558558

559-
WebRTC (Web Real-Time Communications) is a framework for real-time communication and in libp2p is used to establish browser-to-server and browser-to-browser connections between applications. [Libp2p](#libp2p) supports WebRTC as multiple [transports](#transport) (`/webrtc`, `/webrtc-direct`). [More about WebRTC in libp2p](https://docs.libp2p.io/concepts/transports/webrtc/)
559+
WebRTC (Web Real-Time Communications) is a framework for real-time communication and in libp2p is used to establish browser-to-server and browser-to-browser connections between applications. [Libp2p](#libp2p) supports WebRTC as multiple [transports](#transport) (`/webrtc`, `/webrtc-direct`). [More about WebRTC in libp2p](https://web.archive.org/web/20260128152341/https://docs.libp2p.io/concepts/transports/webrtc/)
560560

561561
### WebSocket
562562

563563
WebSockets are a way for web applications to maintain bidirectional communications with server-side processes, and are one of [transports](#transport) supported by [libp2p](#libp2p) (`/ws`). [More about libp2p WebSockets support](https://github.com/libp2p/specs/blob/master/websockets/README.md)
564564

565565
### WebTransport
566566

567-
WebTransport is a new specification that uses QUIC to offer an alternative to [WebSocket](#websocket). Conceptually, it can be considered WebSocket over [QUIC](#quic). [Libp2p](#libp2p) supports is indicated by `/webtransport` [Multiaddr](#multiaddr). [More about WebTransport in libp2p](https://docs.libp2p.io/concepts/transports/webtransport/)
567+
WebTransport is a new specification that uses QUIC to offer an alternative to [WebSocket](#websocket). Conceptually, it can be considered WebSocket over [QUIC](#quic). [Libp2p](#libp2p) supports is indicated by `/webtransport` [Multiaddr](#multiaddr). [More about WebTransport in libp2p](https://web.archive.org/web/20260128152314/https://docs.libp2p.io/concepts/transports/webtransport/)
568568

569569
## X
570570

571571
## Y
572572

573573
### Yamux
574574

575-
Yamux (Yet another Multiplexer) is a powerful stream [multiplexer](#multiplexer) used in [libp2p](#libp2p). [More about Yamux in libp2p docs](https://docs.libp2p.io/concepts/multiplex/yamux/)
575+
Yamux (Yet another Multiplexer) is a powerful stream [multiplexer](#multiplexer) used in [libp2p](#libp2p). [More about Yamux in libp2p docs](https://web.archive.org/web/20250917025649/https://docs.libp2p.io/concepts/multiplex/yamux/)
576576

577577
## Z

docs/concepts/ipns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ graph TB
110110
Publisher-- Cache -->Local-. GET .->Resolver-- Cache -->Local
111111
```
112112

113-
The self-certifying nature of IPNS records means that they are not tied to a specific transport protocol. In practice, most IPFS implementations rely on the [**DHT**](dht.md) and [**libp2p PubSub**](https://docs.libp2p.io/concepts/publish-subscribe/) to publish and resolve IPNS records.
113+
The self-certifying nature of IPNS records means that they are not tied to a specific transport protocol. In practice, most IPFS implementations rely on the [**DHT**](dht.md) and [**libp2p PubSub**](https://web.archive.org/web/20250827093310/https://docs.libp2p.io/concepts/publish-subscribe/) to publish and resolve IPNS records.
114114

115115
There are nuanced differences and trade-offs between the **DHT** and **PubSub** to be aware of.
116116

@@ -139,7 +139,7 @@ It's worth noting that publishing and resolving IPNS names using the DHT can be
139139

140140
#### IPNS over PubSub
141141

142-
IPNS over PubSub uses the [Libp2p PubSub](https://docs.libp2p.io/concepts/publish-subscribe/) to publish records and resolve names amongst **interested peers**.
142+
IPNS over PubSub uses the [Libp2p PubSub](https://web.archive.org/web/20250827093310/https://docs.libp2p.io/concepts/publish-subscribe/) to publish records and resolve names amongst **interested peers**.
143143

144144
This is achieved by deriving the PubSub topic name from the IPNS name so that each IPNS name has a unique topic.
145145

docs/concepts/libp2p.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ title: libp2p
33
sidebarDepth: 0
44
description: Learn about the libp2p protocol and why it's an important ingredient in how IPFS works.
55
related:
6-
'What is libp2p?': https://docs.libp2p.io/concepts/introduction/overview/
7-
'Foundational libp2p concepts': https://docs.libp2p.io/concepts/
8-
'Getting started with libp2p': https://docs.libp2p.io/guides/
6+
'What is libp2p?': https://web.archive.org/web/20260119023244/https://docs.libp2p.io/concepts/introduction/overview/
7+
'Foundational libp2p concepts': https://web.archive.org/web/20251113174247/https://docs.libp2p.io/concepts/
8+
'Getting started with libp2p': https://web.archive.org/web/20250624052058/https://docs.libp2p.io/guides/
99
---
1010

1111
# libp2p
@@ -44,33 +44,33 @@ libp2p was designed to address these limitations.
4444

4545
## Features
4646

47-
The features of libp2p are listed below. For more information on each feature, click the link to navigate to the appropriate page in the [official libp2p documentation](https://docs.libp2p.io).
47+
The features of libp2p are listed below. For more information on each feature, click the link to navigate to the appropriate page in the [official libp2p documentation](https://web.archive.org/web/20260128151944/https://docs.libp2p.io/).
4848

49-
- [Flexible addressing](https://docs.libp2p.io/concepts/addressing/)
49+
- [Flexible addressing](https://web.archive.org/web/20251224030222/https://docs.libp2p.io/concepts/addressing/)
5050

51-
- [Transport agnostic](https://docs.libp2p.io/concepts/transports/overview/)
51+
- [Transport agnostic](https://web.archive.org/web/20260128152051/https://docs.libp2p.io/concepts/transports/overview/)
5252

53-
- [Customizable security](https://docs.libp2p.io/concepts/secure-comm/overview/)
53+
- [Customizable security](https://web.archive.org/web/20250624052827/https://docs.libp2p.io/concepts/secure-comm/overview/)
5454

55-
- [Peer identity](https://docs.libp2p.io/concepts/fundamentals/peers/#peer-id)
55+
- [Peer identity](https://web.archive.org/web/20251112181025/https://docs.libp2p.io/concepts/fundamentals/peers/#peer-id)
5656

57-
- [Peer routing](https://docs.libp2p.io/concepts/appendix/glossary/#peer-routing)
57+
- [Peer routing](https://web.archive.org/web/20260130063617/https://docs.libp2p.io/concepts/appendix/glossary/#peer-routing)
5858

59-
- [NAT traversal](https://docs.libp2p.io/concepts/nat/)
59+
- [NAT traversal](https://web.archive.org/web/20260115071913/https://docs.libp2p.io/concepts/nat/)
6060

6161
### Publish/subscribe
6262

6363
_Publish/Subscribe_ (PubSub) is a messaging model where peers congregate around topics of interest and exchange messages accordingly. In IPFS, libp2p's PubSub system allows peers to easily join and communicate on topics in real time, providing a scalable and fault-tolerant solution for P2P communication.
6464

6565
One of the key challenges in P2P-based PubSub systems is the prompt and efficient delivery of messages to all subscribers, especially in large and dynamic networks. To overcome these challenges, IPFS utilizes libp2p's _GossipSub_ protocol, which operates by "gossiping" with peers about the messages they have received, enabling an efficient message delivery network.
6666

67-
Check out the [libp2p documentation](https://docs.libp2p.io/concepts/pubsub/overview/) to learn more about PubSub in libp2p.
67+
Check out the [libp2p documentation](https://web.archive.org/web/20260116065034/https://docs.libp2p.io/concepts/pubsub/overview/) to learn more about PubSub in libp2p.
6868

6969
## Additional resources
7070

71-
- [The libp2p documentation](https://docs.libp2p.io/)
71+
- [The libp2p documentation](https://web.archive.org/web/20260128151944/https://docs.libp2p.io/)
7272
- [The libp2p website](https://libp2p.io/)
73-
- [The libp2p connectivity site](https://connectivity.libp2p.io/)
73+
- [The libp2p connectivity site](https://web.archive.org/web/20251118040510/https://connectivity.libp2p.io/)
7474
- [The libp2p YouTube channel to libp2p](https://www.youtube.com/@libp2p630)
7575
- [The libp2p technical specifications](https://github.com/libp2p/specs)
7676
- [Protocol Labs Research - ResNetLab on Tour](https://research.protocol.ai/tutorials/resnetlab-on-tour/)

docs/how-to/websites-on-ipfs/deploy-github-action.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Deploy static apps to IPFS with GitHub Actions
33
description: Guide on how to setup GitHub Actions to deploy static sites/apps to IPFS using the IPFS Deploy Action.
4-
current-ipfs-version: v0.39.0
5-
current-ipfs-cluster-version: v1.1.4
4+
current-ipfs-version: v0.40.1
5+
current-ipfs-cluster-version: v1.1.5
66
---
77

88
# Deploy static apps to IPFS with GitHub Actions
@@ -170,7 +170,7 @@ You can also customize the Kubo version and [`ipfs add` parameters](https://docs
170170
uses: ipshipyard/ipfs-deploy-action@v1
171171
with:
172172
# ... other inputs ...
173-
kubo-version: 'v0.39.0' # Default, change if needed
173+
kubo-version: 'v0.40.1' # Default, change if needed
174174
ipfs-add-options: '--cid-version 1 --chunker size-1048576' # Default options
175175
```
176176

@@ -201,7 +201,7 @@ You can also configure additional IPFS Cluster options:
201201
# ... other inputs ...
202202
cluster-retry-attempts: '5' # Override number of retry attempts
203203
cluster-timeout-minutes: '15' # Override timeout in minutes per attempt
204-
ipfs-cluster-ctl-version: 'v1.1.4' # Default version
204+
ipfs-cluster-ctl-version: 'v1.1.5' # Default version
205205
cluster-pin-expire-in: '720h' # Optional: Set pin to expire after time period (e.g., 30 days)
206206
```
207207

docs/how-to/webtransport.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how your files are broken down into blocks in IPFS and how to
55

66
# WebTransport and Kubo
77

8-
[WebTransport](https://docs.libp2p.io/concepts/transports/webtransport/), a new libp2p transport protocol, allows browsers to contact [Kubo](../install/command-line.md) nodes, so instead of serving requests for other system level application nodes, you can serve requests directly to a browser. This guide will explain how WebTransport works, Kubo-WebTransport integration use cases, and how to get started with WebTransport in Kubo.
8+
[WebTransport](https://web.archive.org/web/20260128152314/https://docs.libp2p.io/concepts/transports/webtransport/), a new libp2p transport protocol, allows browsers to contact [Kubo](../install/command-line.md) nodes, so instead of serving requests for other system level application nodes, you can serve requests directly to a browser. This guide will explain how WebTransport works, Kubo-WebTransport integration use cases, and how to get started with WebTransport in Kubo.
99

1010
Kubo v0.16 introduced [optional support for WebTransport](https://github.com/ipfs/kubo/releases?q=0.16.0&expanded=true#-webtransport-new-experimental-transport), and Kubo v0.18 [enabled support by default](https://github.com/ipfs/kubo/blob/release-v0.18/docs/changelogs/v0.18.md#webtransport-enabled-by-default).
1111

@@ -46,6 +46,6 @@ To get started with using WebTransport with Kubo, you can use follow this GitHub
4646

4747
You can learn more about WebTransport with the following resources:
4848

49-
- [libp2p documentation: WebTransport](https://docs.libp2p.io/concepts/transports/webtransport/)
50-
- [connectivity.libp2p.io](https://connectivity.libp2p.io/#webtransport)
49+
- [libp2p documentation: WebTransport](https://web.archive.org/web/20260128152314/https://docs.libp2p.io/concepts/transports/webtransport/)
50+
- [connectivity.libp2p.io](https://web.archive.org/web/20251118040510/https://connectivity.libp2p.io/#webtransport)
5151
- [WebTransport spec](https://github.com/libp2p/specs/tree/master/webtransport)

0 commit comments

Comments
 (0)