Browse code

delete obsolete docs/en/rpms.wml

nusenu authored on 23/01/2018 15:41:06
Showing 1 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>  
48 0
\ No newline at end of file
Browse code

Add back file that was accidentally deleted

hiromipaw authored on 23/01/2018 14:25:40
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,47 @@
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>  
0 48
\ No newline at end of file
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 on 19/01/2018 19:54:14
Showing 1 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>  
Browse code

rpms.wml spelling

Sebastian Hahn authored on 07/07/2016 00:12:00
Showing 1 changed files
... ...
@@ -17,7 +17,7 @@
17 17
     
18 18
     <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3>
19 19
 
20
-    <p>Use native Fedora packages for Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> 
20
+    <p>Use native Fedora packages for the Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a>
21 21
     packages for distribitons derived from RHEL.
22 22
     </p>
23 23
 
Browse code

Direct RPM users to Fedora/EPEL packages

Ondrej Mikle authored on 05/07/2016 22:09:31
Showing 1 changed files
... ...
@@ -15,106 +15,12 @@
15 15
     linux distributions.</a></h2>
16 16
     <br>
17 17
     
18
-    <p><strong>Do not</strong> use the packages in the native repositories. They are
19
-    frequently out of date. That means you'll be missing stability and
20
-    security fixes.
21
-    </p>
22
-    
23
-    <p>
24
-    You'll need to set up our package repository before you can fetch
25
-    Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in
26
-    /etc/yum.repos.d/, create a file called
27
-    torproject.repo.  Edit this file with the following information:
28
-    </p>
29
-
30
-    <h3>Fedora 22/23 and EL6/7 packages</h3>
18
+    <h3>Fedora, RHEL, CentOS, Scientific Linux packages</h3>
31 19
 
32
-    <p>For Fedora 22, Fedora 23, RHEL 6, RHEL 7 (and clones), use following
33
-    repo file - substitute DISTRIBUTION with one of the following: fc/22, fc/23,
34
-    el/6, el/7 according to your distribution.
35
-    </p>
36
-    
37
-<pre>[tor]
38
-name=Tor repo
39
-enabled=1
40
-baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41
-gpgcheck=1
42
-gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43
-repo_gpgcheck=1
44
-
45
-[tor-source]
46
-name=Tor source repo
47
-enabled=1
48
-autorefresh=0
49
-baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
50
-gpgcheck=1
51
-gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
52
-repo_gpgcheck=1
53
-</pre>
54
-    <p>
55
-    The key's fingerprint should be:
20
+    <p>Use native Fedora packages for Fedora distribution or <a href="https://fedoraproject.org/wiki/EPEL">EPEL</a> 
21
+    packages for distribitons derived from RHEL.
56 22
     </p>
57
-<pre>E273 44C4 BD24 BEDF E4F4  C741 803F EFB7 F4B8 5E0F</pre>
58 23
 
59
-    <h3>Name clash warning</h3>
60
-
61
-    <p>There is identically named 'tor' package in the EPEL and Fedora
62
-    repositories. Due to this unfortunate name clash, the packages might
63
-    "update over one another", depending on patchversion.  Solution is to use
64
-    <tt>Exclude=tor</tt> line in the relevant <tt>/etc/yum.repos.d/</tt>
65
-    file.
66
-    </p> 
67
-    
68
-    <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
69
-    line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>.
70
-    For Fedora, you usually need that exclude in fedora.repo and
71
-    fedora-updates.repo file.
72
-    </p>
73
-    
74
-    <h3>Package installation and running</h3>
75
-
76
-    <p>
77
-    Once you have the repo file, install Tor using (yum will ask about the
78
-    key's fingerprint the first time):
79
-    </p>
80
-<pre>yum install tor</pre>
81
-    
82
-    <p>
83
-    Start Tor using:
84
-    </p>
85
-<pre>service tor start</pre>
86
-    
87
-    <p>
88
-    Now Tor is installed and running. Move on to <a href="<page
89
-    docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix"
90
-    instructions.
91
-    </p>
92
-    
93
-    <p style="font-size: small">
94
-    The DNS name <code>deb.torproject.org</code> is actually a set of independent
95
-    servers in a DNS round-robin configuration.  If for some reason you cannot
96
-    use it, you might be able to access one of the individual servers
97
-    instead.  Try
98
-    <code>deb-master.torproject.org</code>,
99
-    <code>mirror.netcologne.de</code> or
100
-    <code>tor.mirror.youam.de</code>.
101
-    </p>
102
-    
103
-    <hr>
104
-    
105
-    <hr>
106
-    
107
-    <h2>Alpha/development packages</a></h2>
108
-    <br>
109
-    
110
-    <p>
111
-    There is a repository that contains packages for latest alpha branch of Tor.
112
-    If you'd like to experiment with them, use one of the above repo files, just
113
-    change the baseurl to (similarly to previous section, substitute
114
-    DISTRIBUTION based on your distribution; for source rpms use "SRPMS" instead
115
-    of $basearch):
116
-    </p>
117
-<pre>baseurl=https://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTION/$basearch/</pre>
118 24
     
119 25
     <a id="source"></a>
120 26
     <h2><a class="anchor" href="#source">Building from source</a></h2>
Browse code

Explicit mention of exclude=tor for fedora.repo

Ondrej Mikle authored on 04/01/2016 10:29:32
Showing 1 changed files
... ...
@@ -67,7 +67,8 @@ repo_gpgcheck=1
67 67
     
68 68
     <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
69 69
     line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>.
70
-    For Fedora, you usually need that exclude in fedora-updates.repo file.
70
+    For Fedora, you usually need that exclude in fedora.repo and
71
+    fedora-updates.repo file.
71 72
     </p>
72 73
     
73 74
     <h3>Package installation and running</h3>
Browse code

Explicit mention of exclude=tor for fedora-updates

Ondrej Mikle authored on 04/01/2016 10:27:05
Showing 1 changed files
... ...
@@ -67,6 +67,7 @@ repo_gpgcheck=1
67 67
     
68 68
     <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
69 69
     line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>.
70
+    For Fedora, you usually need that exclude in fedora-updates.repo file.
70 71
     </p>
71 72
     
72 73
     <h3>Package installation and running</h3>
Browse code

Bump RPM package info for Fedora 23

Ondrej Mikle authored on 10/11/2015 16:54:19
Showing 1 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 21/22 and EL6/7 packages</h3>
30
+    <h3>Fedora 22/23 and EL6/7 packages</h3>
31 31
 
32
-    <p>For Fedora 21, Fedora 22, RHEL 6, RHEL 7 (and clones), use following
33
-    repo file - substitute DISTRIBUTION with one of the following: fc/21, fc/22,
32
+    <p>For Fedora 22, Fedora 23, RHEL 6, RHEL 7 (and clones), use following
33
+    repo file - substitute DISTRIBUTION with one of the following: fc/22, fc/23,
34 34
     el/6, el/7 according to your distribution.
35 35
     </p>
36 36
     
Browse code

Remove expired RPM key from RPM page

Ondrej Mikle authored on 27/09/2015 01:09:35
Showing 1 changed files
... ...
@@ -40,7 +40,6 @@ enabled=1
40 40
 baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41 41
 gpgcheck=1
42 42
 gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43
-       https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.2012.asc
44 43
 repo_gpgcheck=1
45 44
 
46 45
 [tor-source]
... ...
@@ -50,15 +49,12 @@ autorefresh=0
50 49
 baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
51 50
 gpgcheck=1
52 51
 gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
53
-       https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.2012.asc
54 52
 repo_gpgcheck=1
55 53
 </pre>
56 54
     <p>
57
-    The keys' fingerprint should be (for RPM-GPG-KEY-torproject.org*asc above,
58
-    yum will ask about the fingerprint, first one is the newer one):
55
+    The key's fingerprint should be:
59 56
     </p>
60
-<pre>E273 44C4 BD24 BEDF E4F4  C741 803F EFB7 F4B8 5E0F
61
-3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
57
+<pre>E273 44C4 BD24 BEDF E4F4  C741 803F EFB7 F4B8 5E0F</pre>
62 58
 
63 59
     <h3>Name clash warning</h3>
64 60
 
Browse code

Update RPM page to show newly added RPM signing key (rotation due to old key expiration)

Ondrej Mikle authored on 10/08/2015 17:16:39
Showing 1 changed files
... ...
@@ -40,6 +40,8 @@ enabled=1
40 40
 baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41 41
 gpgcheck=1
42 42
 gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43
+       https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.2012.asc
44
+repo_gpgcheck=1
43 45
 
44 46
 [tor-source]
45 47
 name=Tor source repo
... ...
@@ -48,12 +50,15 @@ autorefresh=0
48 50
 baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
49 51
 gpgcheck=1
50 52
 gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
53
+       https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.2012.asc
54
+repo_gpgcheck=1
51 55
 </pre>
52 56
     <p>
53
-    The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above,
54
-    yum will ask about the fingerprint):
57
+    The keys' fingerprint should be (for RPM-GPG-KEY-torproject.org*asc above,
58
+    yum will ask about the fingerprint, first one is the newer one):
55 59
     </p>
56
-<pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
60
+<pre>E273 44C4 BD24 BEDF E4F4  C741 803F EFB7 F4B8 5E0F
61
+3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
57 62
 
58 63
     <h3>Name clash warning</h3>
59 64
 
Browse code

Update RPM page with Fedora 22 info

Ondrej Mikle authored on 27/05/2015 21:34:32
Showing 1 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 20/21 and EL6/7 packages</h3>
30
+    <h3>Fedora 21/22 and EL6/7 packages</h3>
31 31
 
32
-    <p>For Fedora 20, Fedora 21, RHEL 6, RHEL 7 (and clones), use following
33
-    repo file - substitute DISTRIBUTION with one of the following: fc/20, fc/21,
32
+    <p>For Fedora 21, Fedora 22, RHEL 6, RHEL 7 (and clones), use following
33
+    repo file - substitute DISTRIBUTION with one of the following: fc/21, fc/22,
34 34
     el/6, el/7 according to your distribution.
35 35
     </p>
36 36
     
Browse code

Update RPM page with Fedora 21 info

Ondrej Mikle authored on 10/12/2014 14:37:58
Showing 1 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 19/20 and EL6/7 packages</h3>
30
+    <h3>Fedora 20/21 and EL6/7 packages</h3>
31 31
 
32
-    <p>For Fedora 19, Fedora 20, RHEL 6, RHEL 7 (and clones), use following
33
-    repo file - substitute DISTRIBUTION with one of the following: fc/19, fc/20,
32
+    <p>For Fedora 20, Fedora 21, RHEL 6, RHEL 7 (and clones), use following
33
+    repo file - substitute DISTRIBUTION with one of the following: fc/20, fc/21,
34 34
     el/6, el/7 according to your distribution.
35 35
     </p>
36 36
     
Browse code

https-ify some rpm urls

Sebastian Hahn authored on 19/10/2014 23:14:54
Showing 1 changed files
... ...
@@ -37,17 +37,17 @@
37 37
 <pre>[tor]
38 38
 name=Tor repo
39 39
 enabled=1
40
-baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
40
+baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41 41
 gpgcheck=1
42
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
42
+gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43 43
 
44 44
 [tor-source]
45 45
 name=Tor source repo
46 46
 enabled=1
47 47
 autorefresh=0
48
-baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
48
+baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
49 49
 gpgcheck=1
50
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
50
+gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
51 51
 </pre>
52 52
     <p>
53 53
     The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above,
... ...
@@ -111,7 +111,7 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
111 111
     DISTRIBUTION based on your distribution; for source rpms use "SRPMS" instead
112 112
     of $basearch):
113 113
     </p>
114
-<pre>baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTION/$basearch/</pre>
114
+<pre>baseurl=https://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTION/$basearch/</pre>
115 115
     
116 116
     <a id="source"></a>
117 117
     <h2><a class="anchor" href="#source">Building from source</a></h2>
Browse code

we don't have opensuse RPMs, apparently

Sebastian Hahn authored on 19/10/2014 23:02:00
Showing 1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 # Revision: $Revision$
3 3
 # Translation-Priority: 3-low
4 4
 
5
-#include "head.wmi" TITLE="Tor Project: CentOS/Fedora/OpenSUSE Instructions" CHARSET="UTF-8"
5
+#include "head.wmi" TITLE="Tor Project: CentOS/Fedora Instructions" CHARSET="UTF-8"
6 6
 <div id="content" class="clearfix">
7 7
   <div id="breadcrumbs">
8 8
     <a href="<page index>">Home &raquo; </a>
Browse code

update to rpm instructions from ondrej (bug 12734)

Roger Dingledine authored on 29/07/2014 19:46:57
Showing 1 changed files
... ...
@@ -27,22 +27,22 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 19/20 and EL6 packages</h3>
30
+    <h3>Fedora 19/20 and EL6/7 packages</h3>
31 31
 
32
-    <p>For Fedora 19, Fedora 20, RHEL 6 (and clones), use following repo file - 
33
-    substitute DISTRIBUTION with one of the following: fc/19, fc/20 or el/6
34
-    according to your distribution.
32
+    <p>For Fedora 19, Fedora 20, RHEL 6, RHEL 7 (and clones), use following
33
+    repo file - substitute DISTRIBUTION with one of the following: fc/19, fc/20,
34
+    el/6, el/7 according to your distribution.
35 35
     </p>
36 36
     
37 37
 <pre>[tor]
38
-name=Tor experimental repo
38
+name=Tor repo
39 39
 enabled=1
40 40
 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41 41
 gpgcheck=1
42 42
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43 43
 
44 44
 [tor-source]
45
-name=Tor experimental source repo
45
+name=Tor source repo
46 46
 enabled=1
47 47
 autorefresh=0
48 48
 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
... ...
@@ -55,6 +55,19 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
55 55
     </p>
56 56
 <pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
57 57
 
58
+    <h3>Name clash warning</h3>
59
+
60
+    <p>There is identically named 'tor' package in the EPEL and Fedora
61
+    repositories. Due to this unfortunate name clash, the packages might
62
+    "update over one another", depending on patchversion.  Solution is to use
63
+    <tt>Exclude=tor</tt> line in the relevant <tt>/etc/yum.repos.d/</tt>
64
+    file.
65
+    </p> 
66
+    
67
+    <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
68
+    line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>.
69
+    </p>
70
+    
58 71
     <h3>Package installation and running</h3>
59 72
 
60 73
     <p>
Browse code

Added note that Fedora 20 RPM packages are available.

Ondrej Mikle authored on 23/12/2013 14:35:45
Showing 1 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 18/19 and EL6 packages</h3>
30
+    <h3>Fedora 19/20 and EL6 packages</h3>
31 31
 
32
-    <p>For Fedora 18, Fedora 19, RHEL 6 (and clones), use following repo file - 
33
-    substitute DISTRIBUTION with one of the following: fc/18, fc/19 or el/6
32
+    <p>For Fedora 19, Fedora 20, RHEL 6 (and clones), use following repo file - 
33
+    substitute DISTRIBUTION with one of the following: fc/19, fc/20 or el/6
34 34
     according to your distribution.
35 35
     </p>
36 36
     
Browse code

Removed EL5 listing from RPMs packages page. EL5 is no longer supported.

Ondrej Mikle authored on 14/12/2013 17:01:16
Showing 1 changed files
... ...
@@ -55,32 +55,6 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
55 55
     </p>
56 56
 <pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
57 57
 
58
-    <h3>EL5 packages</h3>
59
-
60
-    <p>Packages for RHEL 5 (and clones) are signed with different key due to
61
-    old rpm limitations, put this repo file in /etc/yum.repos.d/ directory:
62
-    </p>
63
-    
64
-<pre>[tor]
65
-name=Tor experimental repo
66
-enabled=1
67
-baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/
68
-gpgcheck=1
69
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
70
-
71
-[tor-source]
72
-name=Tor experimental source repo
73
-enabled=1
74
-autorefresh=0
75
-baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/SRPMS
76
-gpgcheck=1
77
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
78
-</pre>
79
-    <p>
80
-    Fingerprint of RPM-GPG-KEY-torproject.org.EL5.asc key above should be:
81
-    </p>
82
-<pre>9D27 0E2A 351C B4CB 6D95  78AF F8E7 95F8 B4D4 03EA</pre>
83
-
84 58
     <h3>Package installation and running</h3>
85 59
 
86 60
     <p>
Browse code

rpm creation document has been moved

Moritz Bartl authored on 12/08/2013 14:45:03
Showing 1 changed files
... ...
@@ -132,7 +132,7 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.E
132 132
     
133 133
     <p>
134 134
     If you'd like to build from source, please follow the <a
135
-    href="<gitblob>doc/tor-rpm-creation.txt">RPM creation instructions</a>.
135
+    href="<gitblob>doc/contrib/tor-rpm-creation.txt">RPM creation instructions</a>.
136 136
     </p>
137 137
     
138 138
     <hr>
Browse code

Update RPM page to mention Fedora 19

Ondrej Mikle authored on 25/07/2013 15:33:53
Showing 1 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 17/18 and EL6 packages</h3>
30
+    <h3>Fedora 18/19 and EL6 packages</h3>
31 31
 
32
-    <p>For Fedora 17, Fedora 18, RHEL 6 (and clones), use following repo file - 
33
-    substitute DISTRIBUTION with one of the following: fc/17, fc/18 or el/6
32
+    <p>For Fedora 18, Fedora 19, RHEL 6 (and clones), use following repo file - 
33
+    substitute DISTRIBUTION with one of the following: fc/18, fc/19 or el/6
34 34
     according to your distribution.
35 35
     </p>
36 36
     
Browse code

RPMs: Fedora 18 packages note

Ondrej Mikle authored on 10/03/2013 19:18:01
Showing 1 changed files
... ...
@@ -27,10 +27,10 @@
27 27
     torproject.repo.  Edit this file with the following information:
28 28
     </p>
29 29
 
30
-    <h3>Fedora 16/17 and EL6 packages</h3>
30
+    <h3>Fedora 17/18 and EL6 packages</h3>
31 31
 
32
-    <p>For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - 
33
-    substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6
32
+    <p>For Fedora 17, Fedora 18, RHEL 6 (and clones), use following repo file - 
33
+    substitute DISTRIBUTION with one of the following: fc/17, fc/18 or el/6
34 34
     according to your distribution.
35 35
     </p>
36 36
     
Browse code

Removed notice about RPM break, since new packages landed safely at deb.torproject.org

Ondrej Mikle authored on 27/12/2012 00:15:13
Showing 1 changed files
... ...
@@ -20,13 +20,6 @@
20 20
     security fixes.
21 21
     </p>
22 22
     
23
-    <p><strong>Notice:</strong> there will be a break in updates of RPM
24
-    repositories, expected until around 2012-12-20. Latest versions packaged are
25
-    0.2.3.24-rc and 0.2.4.5-alpha. In the meantime, <a
26
-    href="<gitblob>doc/tor-rpm-creation.txt">building from source</a> will be
27
-    necessary.
28
-    </p>
29
-    
30 23
     <p>
31 24
     You'll need to set up our package repository before you can fetch
32 25
     Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in
Browse code

Notice on RPM updates break

Ondrej Mikle authored on 28/10/2012 16:56:07
Showing 1 changed files
... ...
@@ -20,6 +20,13 @@
20 20
     security fixes.
21 21
     </p>
22 22
     
23
+    <p><strong>Notice:</strong> there will be a break in updates of RPM
24
+    repositories, expected until around 2012-12-20. Latest versions packaged are
25
+    0.2.3.24-rc and 0.2.4.5-alpha. In the meantime, <a
26
+    href="<gitblob>doc/tor-rpm-creation.txt">building from source</a> will be
27
+    necessary.
28
+    </p>
29
+    
23 30
     <p>
24 31
     You'll need to set up our package repository before you can fetch
25 32
     Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in
Browse code

Added note about repository with alpha RPMs. In sample rpm repo files, changed 'tor-experimental' to 'tor'

Ondrej Mikle authored on 23/09/2012 01:26:52
Showing 1 changed files
... ...
@@ -34,14 +34,14 @@
34 34
     according to your distribution.
35 35
     </p>
36 36
     
37
-<pre>[tor-experimental]
37
+<pre>[tor]
38 38
 name=Tor experimental repo
39 39
 enabled=1
40 40
 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
41 41
 gpgcheck=1
42 42
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
43 43
 
44
-[tor-experimental-source]
44
+[tor-source]
45 45
 name=Tor experimental source repo
46 46
 enabled=1
47 47
 autorefresh=0
... ...
@@ -61,14 +61,14 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
61 61
     old rpm limitations, put this repo file in /etc/yum.repos.d/ directory:
62 62
     </p>
63 63
     
64
-<pre>[tor-experimental]
64
+<pre>[tor]
65 65
 name=Tor experimental repo
66 66
 enabled=1
67 67
 baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/
68 68
 gpgcheck=1
69 69
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
70 70
 
71
-[tor-experimental-source]
71
+[tor-source]
72 72
 name=Tor experimental source repo
73 73
 enabled=1
74 74
 autorefresh=0
... ...
@@ -114,6 +114,18 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.E
114 114
     
115 115
     <hr>
116 116
     
117
+    <h2>Alpha/development packages</a></h2>
118
+    <br>
119
+    
120
+    <p>
121
+    There is a repository that contains packages for latest alpha branch of Tor.
122
+    If you'd like to experiment with them, use one of the above repo files, just
123
+    change the baseurl to (similarly to previous section, substitute
124
+    DISTRIBUTION based on your distribution; for source rpms use "SRPMS" instead
125
+    of $basearch):
126
+    </p>
127
+<pre>baseurl=http://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTION/$basearch/</pre>
128
+    
117 129
     <a id="source"></a>
118 130
     <h2><a class="anchor" href="#source">Building from source</a></h2>
119 131
     <br>
Browse code

Reorder a sentence on the rpm page

Sebastian Hahn authored on 07/09/2012 15:46:24
Showing 1 changed files
... ...
@@ -17,12 +17,13 @@
17 17
     
18 18
     <p><strong>Do not</strong> use the packages in the native repositories. They are
19 19
     frequently out of date. That means you'll be missing stability and
20
-    security fixes. Repositories contain i686 and x86_64 builds.
20
+    security fixes.
21 21
     </p>
22 22
     
23 23
     <p>
24 24
     You'll need to set up our package repository before you can fetch
25
-    Tor.  Assuming yum, in /etc/yum.repos.d/, create a file called
25
+    Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in
26
+    /etc/yum.repos.d/, create a file called
26 27
     torproject.repo.  Edit this file with the following information:
27 28
     </p>
28 29
 
Browse code

Nicer formatting for RPM instructions

Ondrej Mikle authored on 07/09/2012 15:42:07
Showing 1 changed files
... ...
@@ -26,6 +26,8 @@
26 26
     torproject.repo.  Edit this file with the following information:
27 27
     </p>
28 28
 
29
+    <h3>Fedora 16/17 and EL6 packages</h3>
30
+
29 31
     <p>For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - 
30 32
     substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6
31 33
     according to your distribution.
... ...
@@ -52,8 +54,10 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
52 54
     </p>
53 55
 <pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
54 56
 
57
+    <h3>EL5 packages</h3>
58
+
55 59
     <p>Packages for RHEL 5 (and clones) are signed with different key due to
56
-    old rpm limitations, use this repo file:
60
+    old rpm limitations, put this repo file in /etc/yum.repos.d/ directory:
57 61
     </p>
58 62
     
59 63
 <pre>[tor-experimental]
... ...
@@ -76,11 +80,19 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.E
76 80
     </p>
77 81
 <pre>9D27 0E2A 351C B4CB 6D95  78AF F8E7 95F8 B4D4 03EA</pre>
78 82
 
83
+    <h3>Package installation and running</h3>
84
+
79 85
     <p>
80
-    Then install Tor by running:
86
+    Once you have the repo file, install Tor using (yum will ask about the
87
+    key's fingerprint the first time):
81 88
     </p>
82 89
 <pre>yum install tor</pre>
83 90
     
91
+    <p>
92
+    Start Tor using:
93
+    </p>
94
+<pre>service tor start</pre>
95
+    
84 96
     <p>
85 97
     Now Tor is installed and running. Move on to <a href="<page
86 98
     docs/tor-doc-unix>#using">step two</a> of the "Tor on Linux/Unix"
Browse code

Updated RPM instructions for EL5 due to separate rpm signing key

Ondrej Mikle authored on 07/09/2012 15:13:16
Showing 1 changed files
... ...
@@ -17,7 +17,7 @@
17 17
     
18 18
     <p><strong>Do not</strong> use the packages in the native repositories. They are
19 19
     frequently out of date. That means you'll be missing stability and
20
-    security fixes.
20
+    security fixes. Repositories contain i686 and x86_64 builds.
21 21
     </p>
22 22
     
23 23
     <p>
... ...
@@ -25,6 +25,12 @@
25 25
     Tor.  Assuming yum, in /etc/yum.repos.d/, create a file called
26 26
     torproject.repo.  Edit this file with the following information:
27 27
     </p>
28
+
29
+    <p>For Fedora 16, Fedora 17, RHEL 6 (and clones), use following repo file - 
30
+    substitute DISTRIBUTION with one of the following: fc/16, fc/17 or el/6
31
+    according to your distribution.
32
+    </p>
33
+    
28 34
 <pre>[tor-experimental]
29 35
 name=Tor experimental repo
30 36
 enabled=1
... ...
@@ -40,17 +46,36 @@ baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
40 46
 gpgcheck=1
41 47
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
42 48
 </pre>
43
-    <p>
44
-    If you wish to track the experimental releases of Tor, you should substitute
45
-    DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17
46
-    </p>
47
-
48 49
     <p>
49 50
     The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above,
50 51
     yum will ask about the fingerprint):
51 52
     </p>
52 53
 <pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
53 54
 
55
+    <p>Packages for RHEL 5 (and clones) are signed with different key due to
56
+    old rpm limitations, use this repo file:
57
+    </p>
58
+    
59
+<pre>[tor-experimental]
60
+name=Tor experimental repo
61
+enabled=1
62
+baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/$basearch/
63
+gpgcheck=1
64
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
65
+
66
+[tor-experimental-source]
67
+name=Tor experimental source repo
68
+enabled=1
69
+autorefresh=0
70
+baseurl=http://deb.torproject.org/torproject.org/rpm/el/5/SRPMS
71
+gpgcheck=1
72
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.EL5.asc
73
+</pre>
74
+    <p>
75
+    Fingerprint of RPM-GPG-KEY-torproject.org.EL5.asc key above should be:
76
+    </p>
77
+<pre>9D27 0E2A 351C B4CB 6D95  78AF F8E7 95F8 B4D4 03EA</pre>
78
+
54 79
     <p>
55 80
     Then install Tor by running:
56 81
     </p>
Browse code

Patch by Ondrej

Peter Palfrader authored on 27/08/2012 22:52:57
Showing 1 changed files
... ...
@@ -45,6 +45,12 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
45 45
     DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17
46 46
     </p>
47 47
 
48
+    <p>
49
+    The keys's fingerprint should be (for RPM-GPG-KEY-torproject.org.asc above,
50
+    yum will ask about the fingerprint):
51
+    </p>
52
+<pre>3B9E EEB9 7B1E 827B CF0A  0D96 8AF5 653C 5AC0 01F1</pre>
53
+
48 54
     <p>
49 55
     Then install Tor by running:
50 56
     </p>
Browse code

<pre> implicitly closes <p>, fix it for rpms

Sebastian Hahn authored on 24/08/2012 15:52:13
Showing 1 changed files
... ...
@@ -24,6 +24,7 @@
24 24
     You'll need to set up our package repository before you can fetch
25 25
     Tor.  Assuming yum, in /etc/yum.repos.d/, create a file called
26 26
     torproject.repo.  Edit this file with the following information:
27
+    </p>
27 28
 <pre>[tor-experimental]
28 29
 name=Tor experimental repo
29 30
 enabled=1
... ...
@@ -39,10 +40,11 @@ baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
39 40
 gpgcheck=1
40 41
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
41 42
 </pre>
42
-    
43
+    <p>
43 44
     If you wish to track the experimental releases of Tor, you should substitute
44
-    DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17</p>
45
-    
45
+    DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17
46
+    </p>
47
+
46 48
     <p>
47 49
     Then install Tor by running:
48 50
     </p>
Browse code

Maybe that makes vertical spacing better. Who knows, it's HTML ...

Peter Palfrader authored on 24/08/2012 15:38:14
Showing 1 changed files
... ...
@@ -37,7 +37,8 @@ enabled=1
37 37
 autorefresh=0
38 38
 baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
39 39
 gpgcheck=1
40
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc</pre>
40
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
41
+</pre>
41 42
     
42 43
     If you wish to track the experimental releases of Tor, you should substitute
43 44
     DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17</p>
Browse code

Patch docs/rpm per Ondrej's instructions, II

Peter Palfrader authored on 24/08/2012 15:35:03
Showing 1 changed files
... ...
@@ -27,7 +27,7 @@
27 27
 <pre>[tor-experimental]
28 28
 name=Tor experimental repo
29 29
 enabled=1
30
-baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/$basearch/
30
+baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
31 31
 gpgcheck=1
32 32
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
33 33
 
... ...
@@ -35,18 +35,13 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.a
35 35
 name=Tor experimental source repo
36 36
 enabled=1
37 37
 autorefresh=0
38
-baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/SRPMS
38
+baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
39 39
 gpgcheck=1
40 40
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc</pre>
41 41
     
42
-    If you wish to track the stable releases of Tor, you should substitute
43
-    DISTRIBUTION with one of the following: centos4, centos5, fc13,
44
-    fc14, fc15, suse</p>
42
+    If you wish to track the experimental releases of Tor, you should substitute
43
+    DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17</p>
45 44
     
46
-    <p>To track experimental releases, substitute DISTRIBUTION with one of these:
47
-    centos4-experimental, centos5-experimental, fc13-experimental,
48
-    fc14-experimental, suse-experimental</p>
49
-
50 45
     <p>
51 46
     Then install Tor by running:
52 47
     </p>
Browse code

Patch docs/rpm per Ondrej's instructions

Peter Palfrader authored on 24/08/2012 15:27:38
Showing 1 changed files
... ...
@@ -24,14 +24,20 @@
24 24
     You'll need to set up our package repository before you can fetch
25 25
     Tor.  Assuming yum, in /etc/yum.repos.d/, create a file called
26 26
     torproject.repo.  Edit this file with the following information:
27
-<pre>[torproject]
28
-name=Tor and Vidalia
27
+<pre>[tor-experimental]
28
+name=Tor experimental repo
29
+enabled=1
30
+baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/$basearch/
31
+gpgcheck=1
32
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
33
+
34
+[tor-experimental-source]
35
+name=Tor experimental source repo
29 36
 enabled=1
30 37
 autorefresh=0
31
-baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/
32
-type=rpm-md
38
+baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/SRPMS
33 39
 gpgcheck=1
34
-gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org</pre>
40
+gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc</pre>
35 41
     
36 42
     If you wish to track the stable releases of Tor, you should substitute
37 43
     DISTRIBUTION with one of the following: centos4, centos5, fc13,
Browse code

updated rpms.wml to include fc15

Runa A. Sandvik authored on 19/09/2011 09:12:57
Showing 1 changed files
... ...
@@ -34,7 +34,8 @@ gpgcheck=1
34 34
 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org</pre>
35 35
     
36 36
     If you wish to track the stable releases of Tor, you should substitute
37
-    DISTRIBUTION with one of the following: centos4, centos5, fc13, fc14, suse</p>
37
+    DISTRIBUTION with one of the following: centos4, centos5, fc13,
38
+    fc14, fc15, suse</p>
38 39
     
39 40
     <p>To track experimental releases, substitute DISTRIBUTION with one of these:
40 41
     centos4-experimental, centos5-experimental, fc13-experimental,
Browse code

update the step two link.

Andrew Lewman authored on 02/08/2011 01:59:39
Showing 1 changed files
... ...
@@ -47,7 +47,7 @@ gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org</
47 47
     
48 48
     <p>
49 49
     Now Tor is installed and running. Move on to <a href="<page