From c5c93320b7709281adb4af9c0e5b3e08a0bb63bb Mon Sep 17 00:00:00 2001 From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:21:32 +0100 Subject: [PATCH] Run prettier (#3806) --- docs/data-ai/capture-data/advanced/how-sync-works.md | 4 ++++ docs/manage/_index.md | 2 +- docs/manage/troubleshoot/alert.md | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/data-ai/capture-data/advanced/how-sync-works.md b/docs/data-ai/capture-data/advanced/how-sync-works.md index b5b877b76e..2a9c89e832 100644 --- a/docs/data-ai/capture-data/advanced/how-sync-works.md +++ b/docs/data-ai/capture-data/advanced/how-sync-works.md @@ -29,7 +29,11 @@ Data capture is frequently used with cloud sync. You can start and stop capture and sync independently. You can also enable cloud sync without data capture and it will sync data in either the sync directory or in the additional sync paths configured in the `viam-server` config. If a file in either the data capture directory or any of the sync paths ends with .capture it will be treated as a file with data that was captured by data capture. +<<<<<<< HEAD If it ends in .prog it will be ignored as this extension is used by data capture to denote that a file is a capture file that's currently being written to. +======= +If it ends in `.prog` it will be ignored as this extension is used by data capture to denote that a file is a capture file that's currently being written to. +>>>>>>> e29141c98 (Run prettier) If a file is in the capture directory or one of its descendants or any of the additional sync paths or their descendants and doesn't have .prog nor .capture extensions, it will be treated as an arbitrary file and, like .capture files, synced if data sync is enabled and the robot is able to connect to [the Viam app](https://app.viam.com). {{% /tab %}} diff --git a/docs/manage/_index.md b/docs/manage/_index.md index 35ad02317c..fc17f40493 100644 --- a/docs/manage/_index.md +++ b/docs/manage/_index.md @@ -51,4 +51,4 @@ Viam's fleet management tooling allows you to remotely deploy and manage softwar Platform diagram with team management elements highlighted Platform diagram with monitoring elements highlighted - \ No newline at end of file + diff --git a/docs/manage/troubleshoot/alert.md b/docs/manage/troubleshoot/alert.md index 773e53ddb1..35224147e8 100644 --- a/docs/manage/troubleshoot/alert.md +++ b/docs/manage/troubleshoot/alert.md @@ -65,7 +65,6 @@ If you are on another operating system, telegraf will be installed automatically {{% /expand%}} - {{< alert title="Note" color="note" >}} You must run `viam-server` with `sudo` to monitor machine performance metrics. {{< /alert >}} @@ -671,7 +670,7 @@ To configure your trigger by using **JSON** mode instead of **Builder** mode, pa { "name": "trigger-1", "event": { - "type": "part_offline", + "type": "part_offline" }, "notifications": [ {