November 2014 - tor-commits - lists.torproject.org

[webwml/master] fix tails logo size
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit e8e09d2698448b32906737ec126b57227291eb39 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Fri Nov 14 20:03:57 2014 +0000 fix tails logo size --- images/tails_logo.png | Bin 21522 -> 38306 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/tails_logo.png b/images/tails_logo.png index df5f52e..926ba9b 100644 Binary files a/images/tails_logo.png and b/images/tails_logo.png differ

1 0

[webwml/master] Update tails logo img tag
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 1f532ecb3c4c37060330a2b1fc19c9afd5f725b2 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Fri Nov 14 20:08:42 2014 +0000 Update tails logo img tag the image has been resized, no need to have width and height anymore. --- en/index.wml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/en/index.wml b/en/index.wml index bc5acf5..b6f8740 100644 --- a/en/index.wml +++ b/en/index.wml @@ -57,9 +57,7 @@ --> <td> <div class="project"> - <a href="https://tails.boum.org/"><img width="75" - height="75" - src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> + <a href="https://tails.boum.org/"><img src="$(IMGROOT)/tails_logo.png" alt="Tails Logo"></a> <h3><a href="https://tails.boum.org/">Tails</a></h3> <p>Live CD/USB operating system preconfigured to use Tor safely.</p>

1 0

[webwml/master] Merge branch 'master' into staging
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit c8d45d4a02dfde72f5cbc119b05c51b4167dc407 Merge: 1f532ec d1f6a0c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Nov 17 00:51:59 2014 +0100 Merge branch 'master' into staging images/icon-TorBirdy.jpg | Bin 3239 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[webwml/staging] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit c48c6e365a0b18635fb4395d3c1b4000ebd794a7 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Mon Nov 17 01:10:33 2014 +0000 Update README.md typo in one of the examples --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c6adc4..974188d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ your commits to. Make sure you're in `webwml` directory, and run: git remote add pick-a-name your-git-url _Example:_ - `git remote tpo-gh git@github.com:mrphs/tpo.git` + `git remote add tpo-gh git@github.com:mrphs/tpo.git` __Step 2:__ Create and switch to a new branch.

1 0

[webwml/staging] Update and rename README to README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 331982f836416ecff70a64c941c0e0f6c263460a Author: Nima Fatemi <mrphs(a)riseup.net> Date: Fri Nov 14 23:40:26 2014 +0000 Update and rename README to README.md - Applying markdown format and some prettifying. - Adding a note to arma's instruction. --- README | 79 ---------------------------------------------------------- README.md | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 79 deletions(-) diff --git a/README b/README deleted file mode 100644 index 80afdc5..0000000 --- a/README +++ /dev/null @@ -1,79 +0,0 @@ -To quickly get set up simply do the following... - - 1. Get the website's build dependencies. - - % sudo apt-get install wml asciidoc - - 2. Configure where to find your tor git repository. It needs this to make the - manual page. - - % git clone https://git.torproject.org/project/web/webwml.git - % cd webwml - % cp Makefile.local.sample Makefile.local - [ change the TORGIT in Makefile.local to point to your tor git repo ] - - 3. Make the website. - - % make - -You should now be able to point your browser at the locally generated site... - - file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en - --------------------------------------------------------------------------------- -Troubleshooting --------------------------------------------------------------------------------- - -* The build fails with "Invalid object name". - - If you get an error like... - - ---- Contents of STDERR channel: --------- - fatal: Invalid object name 'tor-0.2.6.1-alpha'. - asciidoc: FAILED: manpage document title is mandatory - No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. - - This means your tor repository is out of date. Update your tor git repository. - --------------------------------------------------------------------------------- -More detailed instructions from Roger --------------------------------------------------------------------------------- - -Here are the instructions I sent David Fifield when he asked about -editing the website. I hope they are useful for you too! --Roger - -Copy Makefile.local.sample to Makefile.local in your webwml/ directory. -Point TORGIT to a tor git. - -Then apt-get install wml and (alas) probably a shocking number of other -debs. Then you can type 'make' and it will build the website for you -locally. It's probably a smart move to see whether 'make' works before -you git commit any changes to the wml files. - -You can edit docs/en/pluggable-transports.wml (and that is -the right source file to edit, not the html). But go take a -look at that file. You'll notice it has a bunch of tags like -<version-torbrowserbundle>. If you're just bumping version -numbers, you probably just want to change the definition of those tags. -They're in include/versions.wmi - -(Every once in a while you may need to edit pluggable-transports.wml -too -- generally when you change the file name so drastically that just -changing the versions.wmi tags isn't enough.) - -Pushes to the master branch of the git repository will cause the -website to get re-built and published. Pushing to the staging branch -will update www-staging.torproject.org. - -Alas, https://www.torproject.org/dist/ isn't in version control. You -write to it by ssh'ing to dist-master.torproject.org and going to -/srv/dist-master.torproject.org/htdocs/ and then sticking your stuff -there. When you want it to go live, you run -"static-update-component dist.torproject.org" on dist-master. - -Weasel has hopes that somebody will write some scripts to make maintaining -packages in dist/ less awful -- automatically check that they have -signatures and that the sigs match, that the items on the website are in -fact in dist, only allow certain people to put files in certain places, -etc. One day! :) - diff --git a/README.md b/README.md new file mode 100644 index 0000000..173f97e --- /dev/null +++ b/README.md @@ -0,0 +1,82 @@ +# Building website locally + +To quickly get set up simply do the following + + __Step 1:__ Get the website's build dependencies. + + sudo apt-get install wml asciidoc + + __Step 2:__ Configure where to find your tor git repository. It needs this to make the + manual page. + + git clone https://git.torproject.org/project/web/webwml.git + cd webwml + cp Makefile.local.sample Makefile.local + +Note: Change the `TORGIT` in Makefile.local to point to your tor git repo. + + __Step 3:__ Make the website. + + make + +You should now be able to point your browser at the locally generated site... + + file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en + + +### Troubleshooting the build + +The build fails with "Invalid object name". + + If you get an error like... + + ---- Contents of STDERR channel: --------- + fatal: Invalid object name 'tor-0.2.6.1-alpha'. + asciidoc: FAILED: manpage document title is mandatory + No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. + + This means your tor repository is out of date. Update your tor git repository. + + +### More detailed instructions from Roger + +_Note: This section was written when website repo was still on svn, and it wasn't built automatically._ + +Here are the instructions I sent David Fifield when he asked about +editing the website. I hope they are useful for you too! --Roger + +Copy Makefile.local.sample to Makefile.local in your webwml/ directory. +Point TORGIT to a tor git. + +Then apt-get install wml and (alas) probably a shocking number of other +debs. Then you can type 'make' and it will build the website for you +locally. It's probably a smart move to see whether 'make' works before +you git commit any changes to the wml files. + +You can edit docs/en/pluggable-transports.wml (and that is +the right source file to edit, not the html). But go take a +look at that file. You'll notice it has a bunch of tags like +<version-torbrowserbundle>. If you're just bumping version +numbers, you probably just want to change the definition of those tags. +They're in include/versions.wmi + +(Every once in a while you may need to edit pluggable-transports.wml +too -- generally when you change the file name so drastically that just +changing the versions.wmi tags isn't enough.) + +Pushes to the master branch of the git repository will cause the +website to get re-built and published. Pushing to the staging branch +will update www-staging.torproject.org. + +Alas, https://www.torproject.org/dist/ isn't in version control. You +write to it by ssh'ing to dist-master.torproject.org and going to +/srv/dist-master.torproject.org/htdocs/ and then sticking your stuff +there. When you want it to go live, you run +"static-update-component dist.torproject.org" on dist-master. + +Weasel has hopes that somebody will write some scripts to make maintaining +packages in dist/ less awful -- automatically check that they have +signatures and that the sigs match, that the items on the website are in +fact in dist, only allow certain people to put files in certain places, +etc. One day! :) +

1 0

[webwml/staging] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit e547d2e21cc2bf7a2430a2d26fc1826e9768edcd Author: Nima Fatemi <mrphs(a)riseup.net> Date: Mon Nov 17 01:10:00 2014 +0000 Update README.md wrapping the text at 79 chars per line --- README.md | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0295897..9c6adc4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,15 @@ # How to contribute -Thanks for being interested to work on the website, I tried to make a simple how-to for you to quickly get you setup: +Thanks for being interested to work on the website, I tried to make a simple +how-to for you to quickly get you setup: __Step 1:__ Clone the git repo. git clone https://git.torproject.org/project/web/webwml.git cd webwml -__Step 1b:__ Create a bare public repository (i.e on Github), where you'd push your commits to. Make sure you're in `webwml` directory, and run: +__Step 1b:__ Create a bare public repository (i.e on Github), where you'd push +your commits to. Make sure you're in `webwml` directory, and run: git remote add pick-a-name your-git-url @@ -16,17 +18,20 @@ _Example:_ __Step 2:__ Create and switch to a new branch. -_In the following example, I've named my branch "docs" as I'm planning to work on the documentations._ +_In the following example, I've named my branch "docs" as I'm planning to work +on the documentations._ git checkout -b docs -__Step 3:__ Now you can start working on website and make changes. Once you're done, commit and push it to your public repo. +__Step 3:__ Now you can start working on website and make changes. Once you're +done, commit and push it to your public repo. _Example:_ git push tpo-gh docs -__Step 4:__ Open a new ticket on [trac](https://trac.torproject.org) with a link to your shiny new repo/branch. +__Step 4:__ Open a new ticket on [trac](https://trac.torproject.org) with a +link to your shiny new repo/branch. # Building website Torproject website is being built and published automatically. @@ -36,7 +41,8 @@ To quickly get set up and build website locally, simply follow these steps: sudo apt-get install wml asciidoc - __Step 2:__ Configure where to find your tor git repository. It needs this to make the + __Step 2:__ Configure where to find your tor git repository. It needs this +to make the manual page. git clone https://git.torproject.org/project/web/webwml.git @@ -63,14 +69,17 @@ The build fails with "Invalid object name". ---- Contents of STDERR channel: --------- fatal: Invalid object name 'tor-0.2.6.1-alpha'. asciidoc: FAILED: manpage document title is mandatory - No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. + No manpage because of asciidoc error or file not available from git at + /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. - This means your tor repository is out of date. Update your tor git repository. + This means your tor repository is out of date. Update your tor git +repository. ### More detailed instructions from Roger -_Note: This section was written when website repo was still on svn, and it wasn't built automatically._ +_Note: This section was written when website repo was still on svn, and it +wasn't built automatically._ Here are the instructions I sent David Fifield when he asked about editing the website. I hope they are useful for you too! --Roger @@ -109,4 +118,3 @@ packages in dist/ less awful -- automatically check that they have signatures and that the sigs match, that the items on the website are in fact in dist, only allow certain people to put files in certain places, etc. One day! :) -

1 0

[webwml/staging] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit eac5838540e53d0c506d883ba947b9e786a28566 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Sat Nov 15 00:52:44 2014 +0000 Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 173f97e..7372063 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Building website locally - -To quickly get set up simply do the following +# Building website +Torproject website is being built and published automatically. +To quickly get set up and build website locally, simply follow these steps: __Step 1:__ Get the website's build dependencies.

1 0

[webwml/staging] fix tails logo size
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 08bc424e615dfc844d1ae8ea5dd61ab7c4816d3f Author: Nima Fatemi <mrphs(a)riseup.net> Date: Fri Nov 14 20:03:57 2014 +0000 fix tails logo size resizing png to 75x75. --- images/tails_logo.png | Bin 38306 -> 4375 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/tails_logo.png b/images/tails_logo.png index 926ba9b..811315c 100644 Binary files a/images/tails_logo.png and b/images/tails_logo.png differ

1 0

[webwml/staging] Update README.md
by sebastian＠torproject.org 17 Nov '14

17 Nov '14

commit 3d0e13aaf37a0050f6158a719803f248c6f2d933 Author: Nima Fatemi <mrphs(a)riseup.net> Date: Sat Nov 15 01:43:25 2014 +0000 Update README.md Add how to contribute --- README.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/README.md b/README.md index 7372063..0295897 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,33 @@ +# How to contribute + +Thanks for being interested to work on the website, I tried to make a simple how-to for you to quickly get you setup: + +__Step 1:__ Clone the git repo. + + git clone https://git.torproject.org/project/web/webwml.git + cd webwml + +__Step 1b:__ Create a bare public repository (i.e on Github), where you'd push your commits to. Make sure you're in `webwml` directory, and run: + + git remote add pick-a-name your-git-url + +_Example:_ + `git remote tpo-gh git@github.com:mrphs/tpo.git` + +__Step 2:__ Create and switch to a new branch. + +_In the following example, I've named my branch "docs" as I'm planning to work on the documentations._ + + git checkout -b docs + +__Step 3:__ Now you can start working on website and make changes. Once you're done, commit and push it to your public repo. + +_Example:_ + + git push tpo-gh docs + +__Step 4:__ Open a new ticket on [trac](https://trac.torproject.org) with a link to your shiny new repo/branch. + # Building website Torproject website is being built and published automatically. To quickly get set up and build website locally, simply follow these steps:

1 0

[webwml/master] Remove old torbirdy logo, pointed out by mrphs
by sebastian＠torproject.org 16 Nov '14

16 Nov '14

commit d1f6a0cad2dc0748fc6810902bc27e937a704b3b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Nov 17 00:51:06 2014 +0100 Remove old torbirdy logo, pointed out by mrphs This also caused an issue on case-insensitive file systems. --- images/icon-TorBirdy.jpg | Bin 3239 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/icon-TorBirdy.jpg b/images/icon-TorBirdy.jpg deleted file mode 100644 index 3a4b937..0000000 Binary files a/images/icon-TorBirdy.jpg and /dev/null differ

1 0