Browse code

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)

nusenu authored on19/01/2018 19:54:14
Showing2 changed files
1 1
deleted file mode 100644
... ...
@@ -1,47 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#include "head.wmi" TITLE="Tor Project: CentOS/Fedora Instructions" CHARSET="UTF-8"
6
-<div id="content" class="clearfix">
7
-  <div id="breadcrumbs">
8
-    <a href="<page index>">Home &raquo; </a>
9
-    <a href="<page docs/documentation>">Documentation &raquo; </a>
10
-    <a href="<page docs/rpms>">RPMs</a>
11
-  </div>
12
-  <div id="maincol"> 
13
-    <a id="rpms"></a>
14
-    <h2><a class="anchor" href="#rpms">Tor packages for RPM-based
15
-    linux distributions.</a></h2>
16
-    <br>
17
-    
18
-    <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3>
19
-
20
-    <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a>
21
-    packages for distribitons derived from RHEL.
22
-    </p>
23
-
24
-    
25
-    <a id="source"></a>
26
-    <h2><a class="anchor" href="#source">Building from source</a></h2>
27
-    <br>
28
-    
29
-    <p>
30
-    If you'd like to build from source, please follow the <a
31
-    href="<gitblob>doc/contrib/tor-rpm-creation.txt">RPM creation instructions</a>.
32
-    </p>
33
-    
34
-    <hr>
35
-    
36
-    <p>If you have suggestions for improving this document, please <a
37
-    href="<page about/contact>">send them to us</a>. Thanks!</p>
38
-  </div>
39
-  <!-- END MAINCOL -->
40
-  <div id = "sidecol">
41
-#include "side.wmi"
42
-#include "info.wmi"
43
-  </div>
44
-  <!-- END SIDECOL -->
45
-</div>
46
-<!-- END CONTENT -->
47
-#include <foot.wmi>  
... ...
@@ -33,12 +33,12 @@
33 33
        'url'  => 'docs/installguide',
34 34
        'txt'  => 'Expert guides',
35 35
        'subelements' => [
36
+          {'url'  => '<wiki>TorRelayGuide',
37
+           'txt'  => 'The Tor Relay Guide',
38
+          },
36 39
           {'url'  => 'docs/debian',
37 40
            'txt'  => 'Installing Tor on Debian/Ubuntu',
38 41
           },
39
-          {'url'  => 'docs/rpms',
40
-           'txt'  => 'Installing Tor on Fedora/CentOS',
41
-          },
42 42
 	  {'url'  => 'docs/openbsd',
43 43
 	   'txt'  => 'Installing Tor on OpenBSD',
44 44
 	  },
... ...
@@ -48,12 +48,6 @@
48 48
           {'url'  => 'docs/tor-doc-osx',
49 49
            'txt'  => 'OSX',
50 50
           },
51
-          {'url'  => 'docs/tor-relay-debian',
52
-           'txt'  => 'Configuring a Relay manually',
53
-          },
54
-          {'url'  => 'docs/tor-doc-relay',
55
-           'txt'  => 'Configuring a Relay graphically',
56
-          },
57 51
           {'url'  => 'docs/tor-onion-service',
58 52
            'txt'  => 'Configuring an Onion Service',
59 53
           },