Skip to content

Commit 2808747

Browse files
modem_downjeremyn
authored andcommitted
Bring docs into line with Markdown style guide (EFForg#14423)
1 parent a1e928d commit 2808747

File tree

5 files changed

+710
-182
lines changed

5 files changed

+710
-182
lines changed

docs/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# HTTPS Everywhere Documentation
22

3-
The markdown files contained in this path provide documentation for contributing to HTTPS Everywhere. These files are also templates that can be used to generate the markup for HTTPS Everywhere pages under `https://www.eff.org/https-everywhere`. To do so, install the program `pandoc` and run
3+
The markdown files contained in this path provide documentation for
4+
contributing to HTTPS Everywhere. These files are also templates that can be
5+
used to generate the markup for HTTPS Everywhere pages under
6+
`https://www.eff.org/https-everywhere`. To do so, install the program `pandoc`
7+
and run
48

59
pandoc faq.md
610

7-
Copy the output, excluding the header on the first line, to the source of the relevant page within the CMS. Note that some of the pages are dynamically generated and are not generated from templates contained here.
11+
Copy the output, excluding the header on the first line, to the source of the
12+
relevant page within the CMS. Note that some of the pages are dynamically
13+
generated and are not generated from templates contained here.

docs/en_US/development.md

Lines changed: 77 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,94 @@
22

33
### Pointers for developers
44

5-
- **License:** GPL version 3+ (although most of the code is GPL-2 compatible)
6-
- **Source code:** Available via Git with `git clone https://github.com/EFForg/https-everywhere.git`. You can fork and open pull requests using Github at [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere).
7-
- **Translations:** If you would like to help translate HTTPS Everywhere into another language, you can do that [through Transifex](https://www.transifex.com/otf/torproject/).
8-
- **Bug tracker:** Use the [GitHub issue tracker](https://github.com/EFForg/https-everywhere/issues/) or the [Tor Project issue tracker](https://trac.torproject.org/projects/tor/report/19). For the Tor Project issue tracker, you can make an account or use the anonymous one — "cypherpunks"/"writecode". You won't see replies unless you put an email address in the CC field. Bugs that are caused by rulesets should be tagged "httpse-ruleset-bug", and can be viewed [in this report](https://trac.torproject.org/projects/tor/report/48).
9-
- **Mailing lists:** The [https-everywhere](https://lists.eff.org/mailman/listinfo/https-everywhere) list ([archives](https://lists.eff.org/pipermail/https-everywhere/)) is for discussing the project as a whole; the [https-everywhere-rules](https://lists.eff.org/mailman/listinfo/https-everywhere-rules) mailing list ([archives](https://lists.eff.org/pipermail/https-everywhere-rules)) is for discussing the [rulesets](https://www.eff.org/https-everywhere/rulesets) and their contents, including patches and git pull requests.
10-
- **IRC:** `#https-everywhere` on `irc.oftc.net`; if you don't have an IRC client application already installed, you can [use this webchat interface](https://webchat.oftc.net/?channels=#https-everywhere). If you ask a question, be sure to stay in the channel — someone may reply a few hours or a few days later.
5+
* **License:** GPL version 3+ (although most of the code is GPL-2 compatible)
6+
* **Source code:** Available via Git with `git clone
7+
https://github.com/EFForg/https-everywhere.git`. You can fork and open pull
8+
requests using Github at
9+
[https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere).
10+
* **Translations:** If you would like to help translate HTTPS Everywhere into
11+
another language, you can do that [through
12+
Transifex](https://www.transifex.com/otf/torproject/).
13+
* **Bug tracker:** Use the [GitHub issue
14+
tracker](https://github.com/EFForg/https-everywhere/issues/) or the [Tor
15+
Project issue tracker](https://trac.torproject.org/projects/tor/report/19).
16+
For the Tor Project issue tracker, you can make an account or use the
17+
anonymous one — "cypherpunks"/"writecode". You won't see replies unless you
18+
put an email address in the CC field. Bugs that are caused by rulesets
19+
should be tagged "httpse-ruleset-bug", and can be viewed [in this
20+
report](https://trac.torproject.org/projects/tor/report/48).
21+
* **Mailing lists:** The
22+
[https-everywhere](https://lists.eff.org/mailman/listinfo/https-everywhere)
23+
list ([archives](https://lists.eff.org/pipermail/https-everywhere/)) is for
24+
discussing the project as a whole; the
25+
[https-everywhere-rules](https://lists.eff.org/mailman/listinfo/https-everywhere-rules)
26+
mailing list
27+
([archives](https://lists.eff.org/pipermail/https-everywhere-rules)) is for
28+
discussing the [rulesets](https://www.eff.org/https-everywhere/rulesets)
29+
and their contents, including patches and git pull requests.
30+
* **IRC:** `#https-everywhere` on `irc.oftc.net`; if you don't have an IRC
31+
client application already installed, you can [use this webchat
32+
interface](https://webchat.oftc.net/?channels=#https-everywhere). If you
33+
ask a question, be sure to stay in the channel — someone may reply a few
34+
hours or a few days later.
1135

1236
### Testing and contributing changes to the source code
1337

14-
HTTPS Everywhere consists of a large number of rules for switching sites from HTTP to HTTPS. You can read more about how to write these rules [here](https://www.eff.org/https-everywhere/rulesets).
38+
HTTPS Everywhere consists of a large number of rules for switching sites from
39+
HTTP to HTTPS. You can read more about how to write these rules
40+
[here](https://www.eff.org/https-everywhere/rulesets).
1541

16-
If you want to create new rules to submit to us, we expect them to be in the src/chrome/content/rules directory. That directory also contains a useful script, make-trivial-rule, to create a simple rule for a specified domain. There is also a script called trivial-validate.py, to check all the pending rules for several common errors and oversights. For example, if you wanted to make a rule for the example.com domain, you could run
42+
If you want to create new rules to submit to us, we expect them to be in the
43+
src/chrome/content/rules directory. That directory also contains a useful
44+
script, make-trivial-rule, to create a simple rule for a specified domain.
45+
There is also a script called trivial-validate.py, to check all the pending
46+
rules for several common errors and oversights. For example, if you wanted to
47+
make a rule for the example.com domain, you could run
1748

1849
bash ./make-trivial-rule example.com
1950

20-
inside the rules directory. This would create Example.com.xml, which you could then take a look at and edit based on your knowledge of any specific URLs at example.com that do or don't work in HTTPS.
51+
inside the rules directory. This would create Example.com.xml, which you could
52+
then take a look at and edit based on your knowledge of any specific URLs at
53+
example.com that do or don't work in HTTPS.
2154

22-
Before submitting your change, you should test it in Firefox and/or Chrome, as applicable. You can build the latest version of the extension and run it in a standalone Firefox profile using:
55+
Before submitting your change, you should test it in Firefox and/or Chrome, as
56+
applicable. You can build the latest version of the extension and run it in a
57+
standalone Firefox profile using:
2358

2459
bash ./test.sh --justrun
2560

2661
Similarly, to build and run in a standalone Chromium profile, run:
2762

2863
bash ./run-chromium.sh
2964

30-
You should thoroughly test your changes on the target site: Navigate to as wide a variety of pages as you can find. Try to comment or log in if applicable. Make sure everything still works properly.
65+
You should thoroughly test your changes on the target site: Navigate to as wide
66+
a variety of pages as you can find. Try to comment or log in if applicable.
67+
Make sure everything still works properly.
3168

3269
After running your manual tests, run the automated tests and the fetch tests:
3370

3471
bash ./test.sh
3572

3673
bash ./fetch-test.sh
3774

38-
This will catch some of the most common types of errors, but is not a guaranteed of correctness.
75+
This will catch some of the most common types of errors, but is not a
76+
guaranteed of correctness.
3977

40-
Once you've tested your changes, you can submit them for review via any of the following:
78+
Once you've tested your changes, you can submit them for review via any of the
79+
following:
4180

42-
- Open a pull request at [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere).
43-
- Email https-everywhere-rules@eff.org to tell us about your changes. You can use the following command to create a patch file: `git format-patch`
81+
* Open a pull request at
82+
[https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere).
83+
* Email https-everywhere-rules@eff.org to tell us about your changes. You can
84+
use the following command to create a patch file: `git format-patch`
4485

4586
### A quick HOWTO on working with Git
4687

47-
You may want to also look at the [Git Reference](http://gitref.org/), [GitHub Help Site](https://help.github.com/) and the [Tor Project's Git documentation](https://gitweb.torproject.org/githax.git/tree/doc/Howto.txt) to fill in the gaps here, but the below should be enough to get the basics of the workflow down.
88+
You may want to also look at the [Git Reference](http://gitref.org/), [GitHub
89+
Help Site](https://help.github.com/) and the [Tor Project's Git
90+
documentation](https://gitweb.torproject.org/githax.git/tree/doc/Howto.txt) to
91+
fill in the gaps here, but the below should be enough to get the basics of the
92+
workflow down.
4893

4994
First, tell git your name:
5095

@@ -55,25 +100,35 @@ Then, get a copy of the 'origin' repository:
55100
git clone https://github.com/EFForg/https-everywhere.git
56101
cd https-everywhere
57102

58-
Alternatively, if you already have a Github account, you can create a "fork" of the repository on Github at [https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere). See [this page](https://help.github.com/articles/fork-a-repo) for a tutorial.
103+
Alternatively, if you already have a Github account, you can create a "fork" of
104+
the repository on Github at
105+
[https://github.com/EFForg/https-everywhere](https://github.com/EFForg/https-everywhere).
106+
See [this page](https://help.github.com/articles/fork-a-repo) for a tutorial.
59107

60-
Once you have a local copy of the repository, create a new branch for your changes and check it out:
108+
Once you have a local copy of the repository, create a new branch for your
109+
changes and check it out:
61110

62111
git checkout -b my-new-rules master
63112

64-
When you want to send us your work, you'll need to add any new files to the index with git add:
113+
When you want to send us your work, you'll need to add any new files to the
114+
index with git add:
65115

66116
git add ./src/chrome/content/rules/MyRule1.xml
67117
git add ./src/chrome/content/rules/MyRule2.xml
68118

69-
You can now commit your changes to the local branch. To make things easier, you should commit each xml file individually:
119+
You can now commit your changes to the local branch. To make things easier, you
120+
should commit each xml file individually:
70121

71122
git commit ./src/chrome/content/rules/MyRule1.xml
72123
git commit ./src/chrome/content/rules/MyRule2.xml
73124

74-
Now, you need a place to publish your changes. You can create a github account here: [https://github.com/join](https://help.github.com/). [https://help.github.com/](https://help.github.com/) describes the account creation process and some other github-specific things.
125+
Now, you need a place to publish your changes. You can create a github account
126+
here: [https://github.com/join](https://help.github.com/).
127+
[https://help.github.com/](https://help.github.com/) describes the account
128+
creation process and some other github-specific things.
75129

76-
Once you have created your account and added your remote in your local checkout, you want to push your branch to your github remote:
130+
Once you have created your account and added your remote in your local
131+
checkout, you want to push your branch to your github remote:
77132

78133
git push github my-new-rules:my-new-rules
79134

0 commit comments

Comments
 (0)