summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-01-12 11:32:53 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-01-12 16:05:59 +0100
commit717e92ceb96471251f8242ad4f4c45cc2c68ecc9 (patch)
treec02ef4a7308b461fc16887428c2bc75fadf5e717 /docs
parentdocs: import the Journal JSON Format description as subsection (diff)
downloadsystemd-717e92ceb96471251f8242ad4f4c45cc2c68ecc9.tar.xz
systemd-717e92ceb96471251f8242ad4f4c45cc2c68ecc9.zip
man+docs: adjust links to the new page
Diffstat (limited to 'docs')
-rw-r--r--docs/JOURNAL_FILE_FORMAT.md16
-rw-r--r--docs/PORTABILITY_AND_STABILITY.md2
2 files changed, 8 insertions, 10 deletions
diff --git a/docs/JOURNAL_FILE_FORMAT.md b/docs/JOURNAL_FILE_FORMAT.md
index c2a9780f41..f9c9fcb314 100644
--- a/docs/JOURNAL_FILE_FORMAT.md
+++ b/docs/JOURNAL_FILE_FORMAT.md
@@ -7,11 +7,9 @@ SPDX-License-Identifier: LGPL-2.1-or-later
# Journal File Format
-_Note that this document describes the binary on-disk format of journals
-only. For interfacing with web technologies there's the [Journal JSON
-Format](https://www.freedesktop.org/wiki/Software/systemd/json). For transfer
-of journal data across the network there's the [Journal Export
-Format](https://www.freedesktop.org/wiki/Software/systemd/export)._
+_Note that this document describes the binary on-disk format of journals only.
+For interfacing with web technologies there's the [Journal JSON Format](https://systemd.io/JOURNAL_EXPORT_FORMATS#journal-json-format).
+For transfer of journal data across the network there's the [Journal Export Format](https://systemd.io/JOURNAL_EXPORT_FORMATS#journal-export-format)._
The systemd journal stores log data in a binary format with several features:
@@ -39,8 +37,8 @@ some additional interfaces for you.
If you need access to the raw journal data in serialized stream form without C
API our recommendation is to make use of the [Journal Export
-Format](https://www.freedesktop.org/wiki/Software/systemd/export), which you can
-get via "journalctl -o export" or via systemd-journal-gatewayd. The export
+Format](https://systemd.io/JOURNAL_EXPORT_FORMATS#journal-export-format), which you can
+get via `journalctl -o export` or via `systemd-journal-gatewayd`. The export
format is much simpler to parse, but complete and accurate. Due to its
stream-based nature it is not indexed.
@@ -48,8 +46,8 @@ _Or, to put this in other words: this low-level document is probably not what
you want to use as base of your project. You want our [C
API](https://www.freedesktop.org/software/systemd/man/sd-journal.html) instead!
And if you really don't want the C API, then you want the [Journal Export
-Format](https://www.freedesktop.org/wiki/Software/systemd/export) instead! This
-document is primarily for your entertainment and education. Thank you!_
+Format or Journal JSON Format](https://systemd.io/JOURNAL_EXPORT_FORMATS) instead!
+This document is primarily for your entertainment and education. Thank you!_
This document assumes you have a basic understanding of the journal concepts,
the properties of a journal entry and so on. If not, please go and read up,
diff --git a/docs/PORTABILITY_AND_STABILITY.md b/docs/PORTABILITY_AND_STABILITY.md
index 674fe89b94..0b92fda27b 100644
--- a/docs/PORTABILITY_AND_STABILITY.md
+++ b/docs/PORTABILITY_AND_STABILITY.md
@@ -100,7 +100,7 @@ And now, here's the list of (hopefully) all APIs that we have introduced with sy
| [Network](https://www.freedesktop.org/software/systemd/man/systemd.network.html) & [Netdev file format](https://www.freedesktop.org/software/systemd/man/systemd.netdev.html) | File format | yes | yes | no | no | - | no |
| [Link file format](https://www.freedesktop.org/software/systemd/man/systemd.link.html) | File format | yes | yes | no | no | - | no |
| [Journal File Format](https://systemd.io/JOURNAL_FILE_FORMAT) | File format | yes | yes | - | maybe | - | no |
-| [Journal Export Format](https://www.freedesktop.org/wiki/Software/systemd/export) | File format | yes | yes | - | yes | - | no |
+| [Journal Export Format](https://systemd.io/JOURNAL_EXPORT_FORMATS#journal-export-format) | File format | yes | yes | - | yes | - | no |
| [Cooperation in cgroup tree](https://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups) | Treaty | yes | yes | libvirt | yes | libvirt | no |
| [Password Agents](https://systemd.io/PASSWORD_AGENTS) | Socket+Files | yes | yes | - | yes | - | no |
| [udev multi-seat properties](https://www.freedesktop.org/software/systemd/man/sd-login.html) | udev Property | yes | yes | X11, gdm | no | - | no |