Browse code

update readme to know about git

Roger Dingledine authored on20/10/2014 02:34:18
Showing1 changed files
... ...
@@ -1,13 +1,13 @@
1 1
 Here are the instructions I sent David Fifield when he asked about
2 2
 editing the website. I hope they are useful for you too! --Roger
3 3
 
4
-See the Makefile.local file in your website/trunk/ directory. Uncomment
5
-TORGIT and point it to a tor git.
4
+Copy Makefile.local.sample to Makefile.local in your webwml/ directory.
5
+Point TORGIT to a tor git.
6 6
 
7 7
 Then apt-get install wml and (alas) probably a shocking number of other
8 8
 debs. Then you can type 'make' and it will build the website for you
9 9
 locally. It's probably a smart move to see whether 'make' works before
10
-you svn commit any changes to the wml file.
10
+you git commit any changes to the wml files.
11 11
 
12 12
 You can edit docs/en/pluggable-transports.wml (and that is
13 13
 the right source file to edit, not the html). But go take a
... ...
@@ -21,14 +21,14 @@ too -- generally when you change the file name so drastically that just
21 21
 changing the versions.wmi tags isn't enough.)
22 22
 
23 23
 Pushes to the master branch of the git repository will cause the
24
-website to get re-built and published.  pushing to the staging branch
24
+website to get re-built and published. Pushing to the staging branch
25 25
 will update www-staging.torproject.org.
26 26
 
27 27
 Alas, https://www.torproject.org/dist/ isn't in version control. You
28
-write to it by ssh'ing to staticiforme.torproject.org and going to
28
+write to it by ssh'ing to dist-master.torproject.org and going to
29 29
 /srv/dist-master.torproject.org/htdocs/ and then sticking your stuff
30 30
 there. When you want it to go live, you run
31
-static-update-component dist.torproject.org on staticiforme.
31
+"static-update-component dist.torproject.org" on dist-master.
32 32
 
33 33
 Weasel has hopes that somebody will write some scripts to make maintaining
34 34
 packages in dist/ less awful -- automatically check that they have