Skip to content

Commit

Permalink
Merge master (#4)
Browse files Browse the repository at this point in the history
* add Twitter Handles 3,000 Images Per Second

* Fix grammar in document store section (donnemartin#247)

* Fix typo in Twitter timeline and search solution (donnemartin#251)

* Update document-store to document store (donnemartin#255)

* Enable Python syntax highlighting in Pastebin sample code (donnemartin#257)

* Fix broken SQL link in Scaling AWS exercise (donnemartin#258)

Fix broken SQL link in Scaling AWS exercise

* Update HDFS design link to the latest version (donnemartin#275)

* Enable syntax highlighting in all python code snippets (donnemartin#268)

* Translate language list (donnemartin#252)

* Add Ebook generation script (donnemartin#207)

* Add availability in numbers section (donnemartin#237)

* Update language lists in translations (donnemartin#280)

* Add Hebrew translation link (donnemartin#286)

* zh-Hans: Translate Pastebin solution (donnemartin#273)

* ja: Fix typo of Big-O notation in KVS section (donnemartin#292)

* JA: Fix mistranslation in Horizontal scaling section

- The Japanese translation is ambiguous about “vertical scaling” means scaling out or scaling up.
- The word “expensive” is missing in the Japanese translation.

* JA: Fix mistranslation in Reverse proxy (web server) section

- Fix mistranslation of parallel structure. (not information/blacklist/limit, but hide/blacklist/limit)

* ja: Fix mistranslation in "Horizontal scaling"

* JA: Fix mistranslation in Weak consistency section (donnemartin#299)

* JA: Fix mistranslation in Push CDNs section (donnemartin#300)

* JA: Fix mistranslation in Federation section (donnemartin#303)

* ja: Fix translation in "Anki flashcards" (donnemartin#306)

* ja: Fix translation in “Disadvantage(s): load balancer” (donnemartin#307)

* ja: Fix translation in Service Discovery section (donnemartin#308)

* Add API security checklist (donnemartin#328)

* zh-Hans: Change translation in SQL tuning (donnemartin#318)

* ja: Fix mistranslation in SQL tuning section (donnemartin#305)

* Change raise NotImplemented to raise NotImplementedError (donnemartin#345)

* Fix broken round robin links (donnemartin#351)

* Fix broken CAP theorem link (donnemartin#355)

* Fix broken link in CAP theorem section (donnemartin#348)

* zh-cn: Sync with upstream to keep it up-to-date (donnemartin#374)

* Revert "zh-cn: Sync with upstream to keep it up-to-date (donnemartin#374)" (donnemartin#391)

This reverts commit 301b9d8.

donnemartin#374 overwrote the English version of the solutions

* zh-Hans: Translate solutions (donnemartin#392)

* Update "Scaling up to your first 10 million users" link (donnemartin#411)

* Add missing comma in Mint solution (donnemartin#399)

* Fix single point of failure typo (donnemartin#398)

* Fix layer 7 load balancers typo (donnemartin#317)

* Update contributing guidelines for translations (donnemartin#434)

* Add pull request template (donnemartin#435)

* Add status of translations (donnemartin#436)

* Highlight translation request (donnemartin#437)

* Resolve donnemartin#164 - Fix phrasing with availability and partition tolerance (donnemartin#350)

* Check dependencies in Ebook gen script (donnemartin#406)

* Fix typo: Change replication to federation (donnemartin#418)

* Update Twitter back-of-the-envelope calculations (donnemartin#414)

* Fix typos in Twitter and web crawler exercises (donnemartin#438)

* Fix donnemartin#313: Clarify availability patterns (donnemartin#439)

* Add system design template link (donnemartin#433)

* kr: Fix Korean translation link in language index (donnemartin#340)

* Fix Mint exercise bugs and typos (donnemartin#409)

* Remove redundant SQL index in Pastebin exercise (donnemartin#405)

* Additional question, build an exchange

fixes donnemartin#281

* Add CAP theorem video link (donnemartin#400)

* Fix loop bug in deck of cards exercise (donnemartin#396)

* Update dead links (donnemartin#321)

* Add links for latency based and geolocation based routing (donnemartin#319)

* Clarify CDN advantages (donnemartin#310)

* Change disk to HDD for clarity (donnemartin#295)

* Update README.md

* Remove extraneous __init__.py (donnemartin#393)

* Remove Imgur dependency by storing images locally (donnemartin#168)

* Fix donnemartin#335: Update OSI image to Open Systems Interconnection (donnemartin#447)

* Fix translations link in PR template (donnemartin#451)

* Update broken HBase architecture link (donnemartin#481)

* Fix Celery URL (donnemartin#486)

* Fixing the indieflashblog address with archive.org since website has been discontinued

* Fix LRU cache link (donnemartin#505)

* Fix capitalization of Dropbox (donnemartin#511)

* Update GitHub Engineering Blog link

* Fix memcache architecture URL (donnemartin#631)

* Fix # 650: Replace broken weighted round robin link (donnemartin#651)

* Fix typos (donnemartin#661)

Co-authored-by: fluency03 <fluency.03@gmail.com>
Co-authored-by: Chang Liu <fluency03@users.noreply.github.com>
Co-authored-by: glusa8 <glusa8@berkeley.edu>
Co-authored-by: yiksanchan <evan.chanyiksan@gmail.com>
Co-authored-by: Manas Karekar <manaskarekar@users.noreply.github.com>
Co-authored-by: Sean Han <hanxiaobow@gmail.com>
Co-authored-by: Donne Martin <donne.martin@gmail.com>
Co-authored-by: leontyr <leontyr@gmail.com>
Co-authored-by: Simon Knott <simoknott@gmail.com>
Co-authored-by: minhaz <minhazav@gmail.com>
Co-authored-by: Kevin Xu <kevin.xu.v@gmail.com>
Co-authored-by: Yuya Ma'emichi <6386129+Wintus@users.noreply.github.com>
Co-authored-by: SATO Yusuke <yusuke.sato.zz@gmail.com>
Co-authored-by: Duy Nguyen Hoang <nhduy88@gmail.com>
Co-authored-by: Brandon <brandonJY@users.noreply.github.com>
Co-authored-by: Christian Clauss <cclauss@me.com>
Co-authored-by: Dan Choi <ygdanchoi@gmail.com>
Co-authored-by: vyq <qvc246+github@gmail.com>
Co-authored-by: Danny Jung <3496334+dannyjung90@users.noreply.github.com>
Co-authored-by: 根号三 <imsqrtthree@gmail.com>
Co-authored-by: userstartupideas <64709217+userstartupideas@users.noreply.github.com>
Co-authored-by: Alexander Teno <5354921+alexanderteno@users.noreply.github.com>
Co-authored-by: panguncle <54489480+panguncle@users.noreply.github.com>
Co-authored-by: shiyujiucsb <16054786+shiyujiucsb@users.noreply.github.com>
Co-authored-by: Neesara <neethums333@gmail.com>
Co-authored-by: Sainadh Devireddy <sainadh976@gmail.com>
Co-authored-by: Kevin Liu <kevinliu23@gmail.com>
Co-authored-by: Kofi Forson <kofif7kofi@gmail.com>
Co-authored-by: Agade09 <n.sillitoe@gmail.com>
Co-authored-by: Nachiket Acharya <nachiket.acharya@microsoft.com>
Co-authored-by: Rahil <rahilrshk@gmail.com>
Co-authored-by: Youngchul Bang <youngchul@gmail.com>
Co-authored-by: Vladimir Mikhaylov <38596482+vemikhaylov@users.noreply.github.com>
Co-authored-by: John Richardson <42470533+John-Richardson@users.noreply.github.com>
Co-authored-by: Harry Moreno <morenoh149@gmail.com>
Co-authored-by: Manas Gupta <guptamanas1998@gmail.com>
Co-authored-by: Joilson Cisne <joilsoncisne@gmail.com>
Co-authored-by: Ganessh Kumar <rpganesshkumar@gmail.com>
Co-authored-by: Varsha Muzumdar <varsha.vjm@gmail.com>
Co-authored-by: Noe Brito <n.o.brito@hotmail.com>
Co-authored-by: Adam Dobrawy <ad-m@users.noreply.github.com>
Co-authored-by: Daniel Julius Lasiman <dj.lasiman@gmail.com>
Co-authored-by: Isetty Ravi Teja Kumar <iravitejakumar@gmail.com>
Co-authored-by: Ryo Shibayama <j02521@gmail.com>
Co-authored-by: Peter Yao <peteryao7@gmail.com>
Co-authored-by: Abdalla Mohamed <sharpcodex@gmail.com>
Co-authored-by: Laurent Erignoux <lerignoux@gmail.com>
Co-authored-by: Trần Tiến Đức <trantienduchn@gmail.com>
Co-authored-by: ayyjohn <alecjohnson55@gmail.com>
Co-authored-by: Lawrence Chou <lawrencechou1024@gmail.com>
Co-authored-by: Nnachevvv <44066540+Nnachevvv@users.noreply.github.com>
Co-authored-by: mleers <mleers4@gmail.com>
Co-authored-by: Kian-Meng Ang <kianmeng.ang@gmail.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 65 changed files with 3,434 additions and 296 deletions.
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## Review the Contributing Guidelines

Before submitting a pull request, verify it meets all requirements in the [Contributing Guidelines](https://github.com/donnemartin/system-design-primer/blob/master/CONTRIBUTING.md).

### Translations

See the [Contributing Guidelines](https://github.com/donnemartin/system-design-primer/blob/master/CONTRIBUTING.md). Verify you've:

* Tagged the [language maintainer](https://github.com/donnemartin/system-design-primer/blob/master/TRANSLATIONS.md)
* Prefixed the title with a language code
* Example: "ja: Fix ..."
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Byte-compiled / optimized / DLL files
*.epub
__pycache__/
*.py[cod]

Expand Down
34 changes: 20 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,33 @@ If you are not familiar with pull requests, review the [pull request docs](https
We'd like for the guide to be available in many languages. Here is the process for maintaining translations:

* This original version and content of the guide is maintained in English.
* Translations follow the content of the original. Unfortunately, contributors must speak at least some English, so that translations do not diverge.
* Each translation has a maintainer to update the translation as the original evolves and to review others' changes. This doesn't require a lot of time, but review by the maintainer is important to maintain quality.
* Translations follow the content of the original. Contributors must speak at least some English, so that translations do not diverge.
* Each translation has a maintainer to update the translation as the original evolves and to review others' changes. This doesn't require a lot of time, but a review by the maintainer is important to maintain quality.

See [Translations](TRANSLATIONS.md).

### Changes to translations

* Changes to content should be made to the English version first, and then translated to each other language.
* Changes that improve translations should be made directly on the file for that language. PRs should only modify one language at a time.
* Submit a PR with changes to the file in that language. Each language has a maintainer, who reviews changes in that language. Then the primary maintainer @donnemartin merges it in.
* Prefix PRs and issues with language codes if they are for that translation only, e.g. "es: Improve grammar", so maintainers can find them easily.
* Changes that improve translations should be made directly on the file for that language. Pull requests should only modify one language at a time.
* Submit a pull request with changes to the file in that language. Each language has a maintainer, who reviews changes in that language. Then the primary maintainer [@donnemartin](https://github.com/donnemartin) merges it in.
* Prefix pull requests and issues with language codes if they are for that translation only, e.g. "es: Improve grammar", so maintainers can find them easily.
* Tag the translation maintainer for a code review, see the list of [translation maintainers](TRANSLATIONS.md).
* You will need to get a review from a native speaker (preferably the language maintainer) before your pull request is merged.

### Adding translations to new languages

Translations to new languages are always welcome, especially if you can maintain the translation!

* Check existing issues to see if a translation is in progress or stalled. If so, offer to help.
* If it is not in progress, file an issue for your language so people know you are working on it and we can arrange. Confirm you are native level in the language and are willing to maintain the translation, so it's not orphaned.
* To get it started, fork the repo, then submit a PR with the single file README-xx.md added, where xx is the language code. Use standard [IETF language tags](https://www.w3.org/International/articles/language-tags/), i.e. the same as is used by Wikipedia, *not* the code for a single country. These are usually just the two-letter lowercase code, for example, `fr` for French and `uk` for Ukrainian (not `ua`, which is for the country). For languages that have variations, use the shortest tag, such as `zh-Hant`.
* Invite friends to review if possible. If desired, feel free to invite friends to help your original translation by letting them fork your repo, then merging their PRs.
* Add links to your translation at the top of every README*.md file. (For consistency, the link should be added in alphabetical order by ISO code, and the anchor text should be in the native language.)
* When done, indicate on the PR that it's ready to be merged into the main repo.
* Once accepted, your PR will be squashed into a single commit into the `master` branch.
Translations to new languages are always welcome! Keep in mind a translation must be maintained.

* Do you have time to be a maintainer for a new language? Please see the list of [translations](TRANSLATIONS.md) and tell us so we know we can count on you in the future.
* Check the [translations](TRANSLATIONS.md), issues, and pull requests to see if a translation is in progress or stalled. If it's in progress, offer to help. If it's stalled, consider becoming the maintainer if you can commit to it.
* If a translation has not yet been started, file an issue for your language so people know you are working on it and we'll coordinate. Confirm you are native level in the language and are willing to maintain the translation, so it's not orphaned.
* To get started, fork the repo, then submit a pull request to the main repo with the single file README-xx.md added, where xx is the language code. Use standard [IETF language tags](https://www.w3.org/International/articles/language-tags/), i.e. the same as is used by Wikipedia, *not* the code for a single country. These are usually just the two-letter lowercase code, for example, `fr` for French and `uk` for Ukrainian (not `ua`, which is for the country). For languages that have variations, use the shortest tag, such as `zh-Hant`.
* Feel free to invite friends to help your original translation by having them fork your repo, then merging their pull requests to your forked repo. Translations are difficult and usually have errors that others need to find.
* Add links to your translation at the top of every README-XX.md file. For consistency, the link should be added in alphabetical order by ISO code, and the anchor text should be in the native language.
* When you've fully translated the English README.md, comment on the pull request in the main repo that it's ready to be merged.
* You'll need to have a complete and reviewed translation of the English README.md before your translation will be merged into the `master` branch.
* Once accepted, your pull request will be squashed into a single commit into the `master` branch.

### Translation template credits

Expand Down
Loading

0 comments on commit 27b3e2b

Please sign in to comment.