Skip to content

Commit afcabe7

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/ipip-0513-routing-v1-200-for-empty
2 parents 1d072cc + d5638bc commit afcabe7

36 files changed

+1664
-1140
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,5 @@ jobs:
5151
with:
5252
name: website-build-${{ github.run_id }}
5353
path: ${{ env.BUILD_PATH }}
54-
retention-days: 1
54+
retention-days: 1
55+
include-hidden-files: true

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
# Full git history is needed to get a proper list of changed files within `super-linter`
2020
fetch-depth: 0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
out/
22
node_modules/
33
super-linter.log
4+
node_modules/

.markdownlint.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
"single-trailing-newline": false,
1010
"link-fragments": false,
1111
"line-length": false,
12-
"blanks-around-fences": false
12+
"blanks-around-fences": false,
13+
"no-inline-html": false
1314
}

ARCHITECTURE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
> [!NOTE]
44
> This document contains historical notes about IPFS architecture from ~2015. For current specifications, please refer to https://specs.ipfs.tech/
55
6-
**Authors(s)**:
6+
**Author(s)**:
77
- [Juan Benet](https://github.com/jbenet)
88
- [David Dias](https://github.com/daviddias)
99

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ install:
1212

1313
website: clean install
1414
npx spec-generator -c .config.json
15+
touch out/.nojekyll
1516

1617
watch: clean install
1718
npx spec-generator -c .config.json -w

package-lock.json

Lines changed: 282 additions & 1089 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "",
1010
"license": "",
1111
"private": true,
12-
"devDependencies": {
13-
"spec-generator": "^1.6.0"
12+
"dependencies": {
13+
"spec-generator": "^1.6.1"
1414
}
1515
}

src/architecture/principles.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ editors:
1818
url: https://protocol.ai/
1919
tags: ['architecture']
2020
order: 0
21+
xref:
22+
- trustless-gateway
23+
- http-routing-v1
2124
---
2225

2326
The IPFS stack is a suite of specifications and tools that share two key characteristics:

src/bitswap-protocol.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ editors:
2929
name: Protocol Labs
3030
url: https://protocol.ai/
3131
tags: ['exchange', 'routing']
32-
order: 1
32+
order: 2
3333
---
3434

3535
Bitswap is a libp2p data exchange protocol for sending and receiving content

0 commit comments

Comments
 (0)