daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From 597856130181473bff35f225d87b05c5825b1670 Mon Sep 17 00:00:00 2001
1ff636
From: Lukas Nykryn <lnykryn@redhat.com>
1ff636
Date: Wed, 15 Apr 2015 14:04:52 +0200
1ff636
Subject: [PATCH] Revert "man: switch yum to dnf for Fedora"
1ff636
1ff636
This reverts commit 74a6d87d0cd1f2213869e168b6ca55eded6f4ae8.
1ff636
1ff636
Conflicts:
1ff636
	man/systemd-nspawn.xml
1ff636
---
1ff636
 man/custom-html.xsl    | 12 ------------
1ff636
 man/systemd-nspawn.xml |  4 +---
1ff636
 2 files changed, 1 insertion(+), 15 deletions(-)
1ff636
1ff636
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
c62b8e
index 706b95a1c4..1df824cbbc 100644
1ff636
--- a/man/custom-html.xsl
1ff636
+++ b/man/custom-html.xsl
1ff636
@@ -60,18 +60,6 @@
1ff636
   
1ff636
 </xsl:template>
1ff636
 
1ff636
-<xsl:template match="citerefentry[@project='mankier']">
1ff636
-  
1ff636
-    <xsl:attribute name="href">
1ff636
-      <xsl:text>https://www.mankier.com/</xsl:text>
1ff636
-      <xsl:value-of select="manvolnum"/>
1ff636
-      <xsl:text>/</xsl:text>
1ff636
-      <xsl:value-of select="refentrytitle"/>
1ff636
-    </xsl:attribute>
1ff636
-    <xsl:call-template name="inline.charseq"/>
1ff636
-  
1ff636
-</xsl:template>
1ff636
-
1ff636
 <xsl:template match="citerefentry[@project='archlinux']">
1ff636
   
1ff636
     <xsl:attribute name="href">
1ff636
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
c62b8e
index 65b4c2f294..cbd44d4aba 100644
1ff636
--- a/man/systemd-nspawn.xml
1ff636
+++ b/man/systemd-nspawn.xml
1ff636
@@ -98,7 +98,6 @@
1ff636
     container.</para>
1ff636
 
1ff636
     <para>Use a tool like
1ff636
-    <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
1ff636
     <citerefentry project='die-net'><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
1ff636
     <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
1ff636
     or
1ff636
@@ -668,7 +667,7 @@
1ff636
     <example>
1ff636
       <title>Build and boot a minimal Fedora distribution in a container</title>
1ff636
 
1ff636
-      <programlisting># dnf -y --releasever=21 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd dnf fedora-release vim-minimal
1ff636
+      <programlisting># yum -y --releasever=21 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
1ff636
 # systemd-nspawn -bD /srv/mycontainer</programlisting>
1ff636
 
1ff636
       <para>This installs a minimal Fedora distribution into the
1ff636
@@ -729,7 +728,6 @@
1ff636
     <para>
1ff636
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
1ff636
       <citerefentry project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
1ff636
-      <citerefentry project='mankier'><refentrytitle>dnf</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
1ff636
       <citerefentry project='die-net'><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
1ff636
       <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
1ff636
       <citerefentry project='archlinux'><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,