From 90b77d4c5bff42afb1e7fb51848eb4763e6304a6 Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Sun, 11 Oct 2026 00:28:16 +0700 Subject: [PATCH 1/2] docs: spell license the US way and list the same exclusions --- CONTRIBUTING.md | 16 +++++++++------- LICENSE-CONTENT | 6 +++--- README.md | 18 +++++++++--------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e82fe6bc..937c6e05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ the most valuable contributions to it are usually not code. The site claims things about a real product that real people pay for, so: - Do not claim a feature TablePro does not have. -- Do not describe a competitor inaccurately. If you are comparing, be fair — +- Do not describe a competitor inaccurately. If you are comparing, be fair: a comparison page that oversells us is worse than no page. - Cite a version when a claim depends on one. @@ -46,8 +46,8 @@ CI runs the same three. It will not fix style for you. ## What does not belong here -Anything touching licences, payments, customer accounts or personal data is -handled by a separate application — see [docs/architecture.md](docs/architecture.md). +Anything touching licenses, payments, customer accounts or personal data is +handled by a separate application. See [docs/architecture.md](docs/architecture.md). If your change needs one of those, open an issue describing what you need rather than working around it. @@ -55,8 +55,8 @@ rather than working around it. By contributing you agree that: -- **Code** you contribute is licensed under the [MIT licence](LICENSE). -- **Content** you contribute — prose, blog posts, page copy — is licensed under +- **Code** you contribute is licensed under the [MIT license](LICENSE). +- **Content** you contribute (prose, blog posts, page copy) is licensed under [CC BY-NC 4.0](LICENSE-CONTENT). Practically: anyone may reuse the code freely, and may share the writing with @@ -65,8 +65,10 @@ screenshots and stand up a competing commercial site with them. Do not commit images you do not have the rights to. Third-party logos under `public/images/sponsors/` belong to their owners and are used with permission; -neither licence above extends to them. The TablePro logo files under -`public/images/brand/` are trademarks, not covered by either licence. The brand +neither license above extends to them. The TablePro logo files under +`public/images/brand/` and the site icons (`public/logo.png`, +`public/images/logo.png`, `public/apple-touch-icon.png` and +`public/favicon.ico`) are trademarks, not covered by either license. The brand guidelines text is CC BY 4.0. After the app icon changes, regenerate the PNG files in `public/images/brand/` with `scripts/brand-kit.sh ` (macOS, needs diff --git a/LICENSE-CONTENT b/LICENSE-CONTENT index e410a7d5..9ba6412c 100644 --- a/LICENSE-CONTENT +++ b/LICENSE-CONTENT @@ -2,7 +2,7 @@ Creative Commons Attribution-NonCommercial 4.0 International (CC BY-NC 4.0) Copyright (c) 2026 Ngo Quoc Dat (TablePro) -This licence covers the EDITORIAL CONTENT of this repository: +This license covers the EDITORIAL CONTENT of this repository: - resources/blog/** blog posts - resources/data/** comparison and database page copy @@ -11,9 +11,9 @@ This licence covers the EDITORIAL CONTENT of this repository: - public/og/** generated social cards The source code in this repository is licensed separately under the MIT -licence. See LICENSE. +license. See LICENSE. -Excluded from this licence: +Excluded from this license: - third-party logos under public/images/sponsors and the icons and screenshots under public/images/integrations, which are the property diff --git a/README.md b/README.md index f15320c7..387fcc24 100644 --- a/README.md +++ b/README.md @@ -109,28 +109,28 @@ tests skip unless the SSR bundle is built; that is expected locally. ## What is not here -Buying a licence, signing in to an account and subscribing to the newsletter +Buying a license, signing in to an account and subscribing to the newsletter are handled by the TablePro backend, which is a separate application. Forms on these pages `POST` to those endpoints and get JSON back. -If you are working on one of those forms, stub the response or proxy it — see +If you are working on one of those forms, stub the response or proxy it. See [docs/architecture.md](docs/architecture.md) for the contract and the options. ## Contributing -See [CONTRIBUTING.md](CONTRIBUTING.md). Content contributions — a blog post, a -comparison page, a typo fix, better copy — are as welcome as code. +See [CONTRIBUTING.md](CONTRIBUTING.md). Content contributions (a blog post, a +comparison page, a typo fix, better copy) are as welcome as code. -## Licence +## License -Two licences, because code and writing want different terms: +Two licenses, because code and writing want different terms: -- **Code** — [MIT](LICENSE). Use it however you like. -- **Content** — [CC BY-NC 4.0](LICENSE-CONTENT). Covers the prose in +- **Code**: [MIT](LICENSE). Use it however you like. +- **Content**: [CC BY-NC 4.0](LICENSE-CONTENT). Covers the prose in `resources/blog`, the page copy in `resources/data` and `resources/js`, and the images under `public/images` and `public/og`. Share and adapt it with attribution, but not commercially. -Neither licence covers: +Neither license covers: - the third-party logos under `public/images/sponsors` and the integration icons and screenshots under `public/images/integrations`, which belong to From ffe82de94c543809a3c39e341f446cba9dc5ced1 Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Sun, 11 Oct 2026 00:31:46 +0700 Subject: [PATCH 2/2] docs: spell license the US way in the CC terms and issue templates --- .github/ISSUE_TEMPLATE/bug.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- LICENSE-CONTENT | 4 ++-- docs/architecture.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 1a428bb5..ba7264c0 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -13,6 +13,6 @@ labels: bug **Browser and OS** -Note: anything to do with buying a licence, signing in, or the app itself is +Note: anything to do with buying a license, signing in, or the app itself is handled elsewhere — email support@tablepro.app instead, this repository only covers the website. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4c6de0e4..839e9541 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -3,6 +3,6 @@ contact_links: - name: A problem with the TablePro app itself url: https://github.com/TableProApp/TablePro/issues about: Bugs and feature requests for the macOS app live in the app repository. - - name: Licence, billing or account help + - name: License, billing or account help url: mailto:support@tablepro.app about: Anything involving your purchase or account. diff --git a/LICENSE-CONTENT b/LICENSE-CONTENT index 9ba6412c..7caaa7c1 100644 --- a/LICENSE-CONTENT +++ b/LICENSE-CONTENT @@ -36,13 +36,13 @@ YOU ARE FREE TO: UNDER THE FOLLOWING TERMS: Attribution — You must give appropriate credit, provide a link to this - licence, and indicate if changes were made. + license, and indicate if changes were made. NonCommercial — You may not use the material for commercial purposes. No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the - licence permits. + license permits. The full legal text is available at: diff --git a/docs/architecture.md b/docs/architecture.md index 33aebb1b..90890534 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -168,7 +168,7 @@ page: the registry drops every path the map answers. ## What it does not serve -Buying a licence, signing in to an account and subscribing to the newsletter are +Buying a license, signing in to an account and subscribing to the newsletter are handled by the TablePro backend, which is a separate application and not part of this repository. Requests to those paths never reach this code.