Skip to content

Commit c9d0cfe

Browse files
committed
Further prep before going live
1 parent 11536a9 commit c9d0cfe

33 files changed

+2102
-52
lines changed

content/community.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ main {
44
}
55

66
h2 {
7-
margin: 2rem 0 0;
8-
text-align: left;
7+
margin: 0 0 1em;
98
}
109

content/community.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,29 @@ styles: /community.css
44
template: landing
55
---
66

7-
# Stay in Touch
7+
<section>
88

9-
## Discord
9+
## Collaboration isn't an afterthought, it's foundational to what and how we build.
10+
11+
### From our community calls to our sync protocol, we believe software should connect people, not silo them.
12+
13+
14+
### Discord
1015

1116
Follow along as we develop Automerge, see cool projects made by other folks in the community, and share projects of your own.
1217
* Join the [Discord](https://discord.gg/zKGe4DCfgR)
1318

14-
## Community Calls
19+
### Community Calls
1520

1621
Every month we host a 1-hour call to share behind-the-scenes info about the development of Automerge, preview new features, and spotlight demos made by members of the community. This is your chance to see what's coming next for Automerge.
1722
* Subscribe to the [Luma](https://luma.com/automerge)
1823

19-
## Ink & Switch
24+
### Upcoming Events
25+
* [Sync Conf](https://syncconf.dev) on Nov 12th, 2025 in San Francisco
26+
27+
### Ink & Switch
2028
Automerge was created by the industrial research lab Ink & Switch, and it serves as the foundation for many of their subsequent prototypes and explorations. Visit their website to read essays and lab notes about local-first software, malleable software, universal version control, and more.
2129
* Visit [Ink & Switch](https://www.inkandswitch.com)
2230

31+
32+
</section>

content/docs/guides/using-automerge-with-llms.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ We support the [llms.txt](https://llmstxt.org/) standard for making documentatio
77

88
We offer the following pages:
99

10-
<!-- needs to be an anchor link, because for markdown links a / is appended at the end -->
11-
12-
- <a href="/llms.txt" target="_blank">`llms.txt`</a> — a listing of the available pages
13-
- <a href="/llms-full.txt" target="_blank">`llms-full.txt`</a> — complete documentation
10+
- [llms.txt](/llms.txt) — a listing of the available pages
11+
- [llms-full.txt](/llms-full.txt) — complete documentation

content/docs/tutorial/local-sync.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ import { initTaskList } from "./components/TaskList.tsx";
3939
// highlight-start
4040
import {
4141
Repo,
42-
WebSocketClientAdapter,
42+
BroadcastChannelNetworkAdapter,
4343
IndexedDBStorageAdapter,
4444
} from "@automerge/react";
4545

4646
const repo = new Repo({
47-
network: [new WebSocketClientAdapter("wss://sync.automerge.org")],
47+
network: [new BroadcastChannelNetworkAdapter()],
4848
storage: new IndexedDBStorageAdapter(),
4949
});
5050

content/docs/tutorial/react.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ First modify the `TaskList` component:
6565

6666
```tsx title="src/components/TaskList.tsx"
6767
// ..
68-
// higlight-next-line
68+
// highlight-next-line
6969
import { type AutomergeUrl } from "@automerge/react";
7070

7171
// ..
@@ -214,7 +214,7 @@ export const TaskList: React.FC<{
214214
}> = ({ docUrl }) => {
215215
const [doc, changeDoc] = useDocument<TaskList>(docUrl, {
216216
// This hooks the `useDocument` into reacts suspense infrastructure so the whole component
217-
// only renderes once the document is loaded
217+
// only renders once the document is loaded
218218
suspense: true,
219219
});
220220

@@ -270,7 +270,7 @@ export const TaskList: React.FC<{
270270
}> = ({ docUrl }) => {
271271
const [doc, changeDoc] = useDocument<TaskList>(docUrl, {
272272
// This hooks the `useDocument` into reacts suspense infrastructure so the whole component
273-
// only renderes once the document is loaded
273+
// only renders once the document is loaded
274274
suspense: true,
275275
});
276276

@@ -342,7 +342,7 @@ export const TaskList: React.FC<{
342342
}> = ({ docUrl }) => {
343343
const [doc, changeDoc] = useDocument<TaskList>(docUrl, {
344344
// This hooks the `useDocument` into reacts suspense infrastructure so the whole component
345-
// only renderes once the document is loaded
345+
// only renders once the document is loaded
346346
suspense: true,
347347
});
348348

@@ -399,6 +399,6 @@ export const TaskList: React.FC<{
399399

400400
## Checking your work
401401

402-
We've finished wiring up the UI, we've got link sharing via the URL hash and storage and synchronisation between tabs. If you open the application in one tab, then copy the URL and open it in another you should be able to create new tasks, toggle their done state, and update the description and see the changes synchronise between tabs.
402+
We've finished wiring up the UI, we've got link sharing via the URL hash and storage and synchronization between tabs. If you open the application in one tab, then copy the URL and open it in another you should be able to create new tasks, toggle their done state, and update the description and see the changes synchronize between tabs.
403403

404404
Next, to sync over the network.

content/img/internal/arch.png

79.5 KB
Loading

content/img/internal/runtime1.png

29.5 KB
Loading

content/img/internal/runtime10.png

27.5 KB
Loading

content/img/internal/runtime11.png

53.8 KB
Loading

content/img/internal/runtime12.png

50.7 KB
Loading

0 commit comments

Comments
 (0)