From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <c.heiss@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 1DF70B8AEC
for <pve-devel@lists.proxmox.com>; Mon, 11 Mar 2024 13:30:15 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 068968522
for <pve-devel@lists.proxmox.com>; Mon, 11 Mar 2024 13:29:45 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Mon, 11 Mar 2024 13:29:44 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D48FC48908
for <pve-devel@lists.proxmox.com>; Mon, 11 Mar 2024 13:29:43 +0100 (CET)
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 11 Mar 2024 13:29:07 +0100
Message-ID: <20240311122938.565228-2-c.heiss@proxmox.com>
X-Mailer: git-send-email 2.43.1
In-Reply-To: <20240311122938.565228-1-c.heiss@proxmox.com>
References: <20240311122938.565228-1-c.heiss@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.005 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pve-devel] [PATCH docs v2 1/5] package-repos: improve wording
partly based on pmg-docs
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 11 Mar 2024 12:30:15 -0000
Some sentences are phrased better and more expansive in pmg-docs, so
take them from there and adapt them as needed.
Rephrases some redundant parts (e.g. enterprise repo introduction) and
moves the email/changelog paragraph to the top, since that applies to
all repos.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Changes v1 -> v2:
* deduplicate email/changelog paragraph, move to top
* deduplicate enterprise repo introduction sentence
* very slightly reword some phrases
pve-package-repos.adoc | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/pve-package-repos.adoc b/pve-package-repos.adoc
index b0c2a95..4586f70 100644
--- a/pve-package-repos.adoc
+++ b/pve-package-repos.adoc
@@ -8,6 +8,10 @@ endif::wiki[]
{pve} uses http://en.wikipedia.org/wiki/Advanced_Packaging_Tool[APT] as its
package management tool like any other Debian-based system.
+{pve} automatically checks for package updates on a daily basis. The `root@pam`
+user is notified via email about available updates. From the GUI, The
+'Changelog' button can be used to see more details about the selected update.
+
Repositories in {pve}
~~~~~~~~~~~~~~~~~~~~~
@@ -57,21 +61,18 @@ deb http://security.debian.org/debian-security bookworm-security main contrib
{pve} Enterprise Repository
~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This is the default, stable, and recommended repository, available for all {pve}
-subscription users. It contains the most stable packages and is suitable for
-production use. The `pve-enterprise` repository is enabled by default:
+This is the recommended repository and available for all {pve} subscription
+users. It contains the most stable packages and is suitable for production use.
+The `pve-enterprise` repository is enabled by default:
.File `/etc/apt/sources.list.d/pve-enterprise.list`
----
deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise
----
-The `root@pam` user is notified via email about available updates. Click the
-'Changelog' button in the GUI to see more details about the selected update.
-
-You need a valid subscription key to access the `pve-enterprise` repository.
-Different support levels are available. Further details can be found at
-{pricing-url}.
+Please note that you need a valid subscription key to access the
+`pve-enterprise` repository. We offer different support levels, which you can
+find further details about at {pricing-url}.
NOTE: You can disable this repository by commenting out the above line using a
`#` (at the start of the line). This prevents error messages if your host does
@@ -82,9 +83,10 @@ repository in that case.
{pve} No-Subscription Repository
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This is the recommended repository for testing and non-production use. Its
-packages are not as heavily tested and validated. You don't need a subscription key
-to access the `pve-no-subscription` repository.
+As the name suggests, you do not need a subscription key to access
+this repository. It can be used for testing and non-production
+use. It's not recommended to use this on production servers, as these
+packages are not always as heavily tested and validated.
We recommend to configure this repository in `/etc/apt/sources.list`.
--
2.43.1