From b6358992d5fd0b8d6ac9331c686b0ed11f366a40 Mon Sep 17 00:00:00 2001 From: Thibaut Courouble Date: Tue, 18 Dec 2018 15:02:15 -0500 Subject: [PATCH] Copy changes to reflect that DevDocs is now operated by freeCodeCamp --- .github/CONTRIBUTING.md | 2 +- COPYRIGHT | 6 +++--- README.md | 12 ++++++------ assets/javascripts/templates/error_tmpl.coffee | 6 +++--- .../templates/pages/about_tmpl.coffee | 17 ++++++----------- assets/stylesheets/components/_fail.scss | 2 -- views/unsupported.erb | 6 +++--- 7 files changed, 22 insertions(+), 29 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2b0c50af..d1f848bd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -35,7 +35,7 @@ Use the [Trello board](https://trello.com/b/6BmTulfx/devdocs-documentation) wher ## Contributing code and features 1. Search for existing issues; someone may already be working on a similar feature. -2. Before embarking on any significant pull request, please open an issue describing the changes you intend to make. Otherwise you risk spending a lot of time working on something I may not want to merge. This also tells other contributors that you're working on the feature. +2. Before embarking on any significant pull request, please open an issue describing the changes you intend to make. Otherwise you risk spending a lot of time working on something we may not want to merge. This also tells other contributors that you're working on the feature. 3. Follow the [coding conventions](#coding-conventions). 4. If you're modifying the Ruby code, include tests and ensure they pass. 5. Try to keep your pull request small and simple. diff --git a/COPYRIGHT b/COPYRIGHT index 719895e9..20b0d4b8 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -5,9 +5,9 @@ Copyright 2013-2018 Thibaut Courouble and other contributors file, You can obtain one at http://mozilla.org/MPL/2.0/. Please do not use the name DevDocs to endorse or promote products -derived from this software without my permission, except as may be -necessary to comply with the notice/attribution requirements. +derived from this software without the maintainers' permission, except +as may be necessary to comply with the notice/attribution requirements. -I also wish that any documentation file generated using this software +We also wish that any documentation file generated using this software be attributed to DevDocs. Let's be fair to all contributors by giving credit where credit's due. Thanks. \ No newline at end of file diff --git a/README.md b/README.md index 1a63f9eb..1bb75830 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# [DevDocs](https://devdocs.io) [![Build Status](https://travis-ci.org/freeCodeCamp/devdocs.svg?branch=master)](https://travis-ci.org/freeCodeCamp/devdocs) +# [DevDocs](https://devdocs.io) — API Documentation Browser [![Build Status](https://travis-ci.org/freeCodeCamp/devdocs.svg?branch=master)](https://travis-ci.org/freeCodeCamp/devdocs) -DevDocs combines multiple API documentations in a fast, organized, and searchable interface. +DevDocs combines multiple developer documentations in a clean and organized web UI with instant search, offline support, mobile version, dark theme, keyboard shortcuts, and more. -* Created by [Thibaut Courouble](https://thibaut.me) +DevDocs was created by [Thibaut Courouble](https://thibaut.me) and is operated by [freeCodeCamp](https://www.freecodecamp.org). Keep track of development news: @@ -14,7 +14,7 @@ Keep track of development news: ## Quick Start -Unless you wish to contribute to the project, I recommend using the hosted version at [devdocs.io](https://devdocs.io). It's up-to-date and works offline out-of-the-box. +Unless you wish to contribute to the project, we recommend using the hosted version at [devdocs.io](https://devdocs.io). It's up-to-date and works offline out-of-the-box. DevDocs is made of two pieces: a Ruby scraper that generates the documentation and metadata, and a JavaScript app powered by a small Sinatra app. @@ -138,9 +138,9 @@ Copyright 2013-2018 Thibaut Courouble and [other contributors](https://github.co This software is licensed under the terms of the Mozilla Public License v2.0. See the [COPYRIGHT](https://github.com/freeCodeCamp/devdocs/blob/master/COPYRIGHT) and [LICENSE](https://github.com/freeCodeCamp/devdocs/blob/master/LICENSE) files. -Please do not use the name DevDocs to endorse or promote products derived from this software without my permission, except as may be necessary to comply with the notice/attribution requirements. +Please do not use the name DevDocs to endorse or promote products derived from this software without the maintainers' permission, except as may be necessary to comply with the notice/attribution requirements. -I also wish that any documentation file generated using this software be attributed to DevDocs. Let's be fair to all contributors by giving credit where credit's due. Thanks! +We also wish that any documentation file generated using this software be attributed to DevDocs. Let's be fair to all contributors by giving credit where credit's due. Thanks! ## Questions? diff --git a/assets/javascripts/templates/error_tmpl.coffee b/assets/javascripts/templates/error_tmpl.coffee index 37e2b5e4..c4bf40ec 100644 --- a/assets/javascripts/templates/error_tmpl.coffee +++ b/assets/javascripts/templates/error_tmpl.coffee @@ -62,12 +62,12 @@ app.templates.unsupportedBrowser = """
  • iOS 10+

    - If you're unable to upgrade, I apologize. - I decided to prioritize speed and new features over support for older browsers. + If you're unable to upgrade, we apologize. + We decided to prioritize speed and new features over support for older browsers.

    Note: if you're already using one of the browsers above, check your settings and add-ons. The app uses feature detection, not user agent sniffing.

    - — Thibaut @DevDocs + — @DevDocs """ diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 51b5fdcf..bd68ea9d 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -11,16 +11,12 @@ app.templates.aboutPage = -> """

    DevDocs: API Documentation Browser

    -

    DevDocs combines multiple API documentations in a clean and organized web UI with instant search, offline support, mobile version, dark theme, keyboard shortcuts, and more. -

    +

    DevDocs combines multiple developer documentations in a clean and organized web UI with instant search, offline support, mobile version, dark theme, keyboard shortcuts, and more. +

    DevDocs is free and open source. It was created by Thibaut Courouble and is operated by freeCodeCamp.

    To keep up-to-date with the latest news:

    @@ -52,7 +48,6 @@ app.templates.aboutPage = -> """
    Where can I report bugs?
    In the issue tracker. Thanks! -

    For anything else, feel free to email me at thibaut@devdocs.io.

    Credits

    @@ -76,12 +71,12 @@ app.templates.aboutPage = -> """

    Privacy Policy

      -
    • devdocs.io ("App") is operated by Thibaut Courouble ("We"). -
    • We do not collect personal information. +
    • devdocs.io ("App") is operated by freeCodeCamp ("We"). +
    • We do not collect personal information through the app.
    • We use Google Analytics, Gauges and Sentry to collect anonymous traffic information and improve the app.
    • The app uses cookies to store user preferences.
    • By using the app, you signify your acceptance of this policy. If you do not agree to this policy, please do not use the app. -
    • If you have any questions regarding privacy, please email thibaut@devdocs.io. +
    • If you have any questions regarding privacy, please email privacy@freecodecamp.org.
    """ diff --git a/assets/stylesheets/components/_fail.scss b/assets/stylesheets/components/_fail.scss index 535100ac..c520977e 100644 --- a/assets/stylesheets/components/_fail.scss +++ b/assets/stylesheets/components/_fail.scss @@ -32,5 +32,3 @@ } ._fail-text:last-child { margin: 0; } - -._fail-link { float: right; } diff --git a/views/unsupported.erb b/views/unsupported.erb index ca90d4d8..a01b7c7e 100644 --- a/views/unsupported.erb +++ b/views/unsupported.erb @@ -16,11 +16,11 @@
  • iOS 10+

    • - If you're unable to upgrade, I apologize. - I decided to prioritize speed and new features over support for older browsers. + If you're unable to upgrade, we apologize. + We decided to prioritize speed and new features over support for older browsers.

    - — Thibaut @DevDocs + — @DevDocs