From 573c29ac5bff3b0c66c96ce8d3170ce5ea4e7b86 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Jan 16 2020 20:27:42 +0000 Subject: Merge branch 'cboltz-typos' into 'production' fix typos in the previous commits See merge request infra/salt!310 --- diff --git a/bin/generate_redmine_page.pl b/bin/generate_redmine_page.pl index 6061a44..2526c99 100755 --- a/bin/generate_redmine_page.pl +++ b/bin/generate_redmine_page.pl @@ -71,7 +71,7 @@ $0 Usage Information: -d | --pillardir : Path to the files with the Pillar information. -t | --tableonly : Print only the HTML table (for inclusion in Redmine). - -r | --dumpforredmine : Print including a short manual for direct copy and past into the Redmine wiki. + -r | --dumpforredmine : Print including a short manual for direct copy and paste into the Redmine wiki. -h | --help : This help Use this script to generate a HTML page (or just a HTML table), based on the diff --git a/pillar/id/keyserver2_infra_opensuse_org.sls b/pillar/id/keyserver2_infra_opensuse_org.sls index addd224..2bf73fd 100644 --- a/pillar/id/keyserver2_infra_opensuse_org.sls +++ b/pillar/id/keyserver2_infra_opensuse_org.sls @@ -17,4 +17,4 @@ grains: partners: - keyserver1.infra.opensuse.org weburls: - - https://keyserver1.opensuse.org + - https://keyserver2.opensuse.org