[tor-commits] [webwml/master] Bug 24881: consolidate relay setup information (new guide)

[hiro@xxxxxxxxxxxxxx]

commit 41b9624bf787a6dc50b0e52a587ca58259ab59fd
Author: nusenu <nusenu-github@xxxxxxxxxx>
Date:   Fri Jan 19 18:54:14 2018 +0000

    Bug 24881: consolidate relay setup information (new guide)
    
    - Add new entry to sidenav: Tor Relay Guide
    - Remove sidenav entry "Installing Tor on Fedora/CentOS"
    - Remove rpms.wml
    - Remove sidenav entry "Configuring a Relay graphically"
    (but do not remove the page itself to not break old urls)
    - Remove sidenav entry "Configuring a Relay manually"
    (but do not remove the page itself to not break old urls)
---
 docs/en/rpms.wml    | 47 -----------------------------------------------
 docs/en/sidenav.wmi | 12 +++---------
 2 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml
deleted file mode 100644
index cf779c65..00000000
--- a/docs/en/rpms.wml
+++ /dev/null
@@ -1,47 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: CentOS/Fedora Instructions" CHARSET="UTF-8"
-<div id="content" class="clearfix">
-  <div id="breadcrumbs">
-    <a href="<page index>">Home &raquo; </a>
-    <a href="<page docs/documentation>">Documentation &raquo; </a>
-    <a href="<page docs/rpms>">RPMs</a>
-  </div>
-  <div id="maincol"> 
-    <a id="rpms"></a>
-    <h2><a class="anchor" href="#rpms">Tor packages for RPM-based
-    linux distributions.</a></h2>
-    <br>
-    
-    <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3>
-
-    <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL";>EPEL</a>
-    packages for distribitons derived from RHEL.
-    </p>
-
-    
-    <a id="source"></a>
-    <h2><a class="anchor" href="#source">Building from source</a></h2>
-    <br>
-    
-    <p>
-    If you'd like to build from source, please follow the <a
-    href="<gitblob>doc/contrib/tor-rpm-creation.txt">RPM creation instructions</a>.
-    </p>
-    
-    <hr>
-    
-    <p>If you have suggestions for improving this document, please <a
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
-  </div>
-  <!-- END MAINCOL -->
-  <div id = "sidecol">
-#include "side.wmi"
-#include "info.wmi"
-  </div>
-  <!-- END SIDECOL -->
-</div>
-<!-- END CONTENT -->
-#include <foot.wmi>  
diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi
index 3b7b08dd..6ed5f45a 100644
--- a/docs/en/sidenav.wmi
+++ b/docs/en/sidenav.wmi
@@ -33,12 +33,12 @@
        'url'  => 'docs/installguide',
        'txt'  => 'Expert guides',
        'subelements' => [
+          {'url'  => '<wiki>TorRelayGuide',
+           'txt'  => 'The Tor Relay Guide',
+          },
           {'url'  => 'docs/debian',
            'txt'  => 'Installing Tor on Debian/Ubuntu',
           },
-          {'url'  => 'docs/rpms',
-           'txt'  => 'Installing Tor on Fedora/CentOS',
-          },
 	  {'url'  => 'docs/openbsd',
 	   'txt'  => 'Installing Tor on OpenBSD',
 	  },
@@ -48,12 +48,6 @@
           {'url'  => 'docs/tor-doc-osx',
            'txt'  => 'OSX',
           },
-          {'url'  => 'docs/tor-relay-debian',
-           'txt'  => 'Configuring a Relay manually',
-          },
-          {'url'  => 'docs/tor-doc-relay',
-           'txt'  => 'Configuring a Relay graphically',
-          },
           {'url'  => 'docs/tor-onion-service',
            'txt'  => 'Configuring an Onion Service',
           },



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits