[devdocsgjs/wip/andyholmes/upstream-merge: 59/59] Merge remote-tracking branch 'upstream/main' into wip/andyholmes/upstream-merge
- From: Andy Holmes <andyholmes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devdocsgjs/wip/andyholmes/upstream-merge: 59/59] Merge remote-tracking branch 'upstream/main' into wip/andyholmes/upstream-merge
- Date: Fri, 15 Jul 2022 21:40:03 +0000 (UTC)
commit 9426d95652e51b3800d480ef4c1f3f9bda5e7044
Merge: 4047f4c0 d8ebee43
Author: Andy Holmes <andrew g r holmes gmail com>
Date: Fri Jul 15 14:39:19 2022 -0700
Merge remote-tracking branch 'upstream/main' into wip/andyholmes/upstream-merge
.github/CONTRIBUTING.md | 2 +-
.github/ISSUE_TEMPLATE/config.yml | 4 +-
.github/workflows/build.yml | 6 +-
.github/workflows/schedule-doc-report.yml | 4 +-
.github/workflows/test.yml | 4 +-
.tool-versions | 1 +
Gemfile.lock | 4 +-
README.md | 8 +-
.../javascripts/templates/pages/about_tmpl.coffee | 13 +-
.../templates/pages/root_tmpl.coffee.erb | 5 +-
assets/stylesheets/application.css.scss | 2 +-
assets/stylesheets/pages/{_c.scss => _cppref.scss} | 2 +-
assets/stylesheets/pages/_groovy.scss | 0
assets/stylesheets/pages/_haproxy.scss | 0
docs/adding-docs.md | 2 +-
docs/maintainers.md | 32 +--
lib/docs/filters/c/entries.rb | 3 +
lib/docs/filters/c/fix_urls.rb | 11 -
lib/docs/filters/cpp/entries.rb | 20 +-
lib/docs/filters/cpp/fix_urls.rb | 11 -
lib/docs/filters/{c => cppref}/clean_html.rb | 16 +-
lib/docs/filters/{c => cppref}/fix_code.rb | 2 +-
lib/docs/filters/docker/clean_html_old.rb | 37 ---
lib/docs/filters/docker/clean_html_very_old.rb | 22 --
lib/docs/filters/docker/entries.rb | 20 +-
lib/docs/filters/docker/entries_old.rb | 75 ------
lib/docs/filters/docker/entries_very_old.rb | 56 -----
lib/docs/filters/elixir/clean_html.rb | 2 +
lib/docs/filters/elixir/entries.rb | 4 +-
lib/docs/filters/fish/clean_html_sphinx.rb | 2 +-
lib/docs/filters/nginx/entries.rb | 2 +
lib/docs/filters/tensorflow/clean_html.rb | 1 +
lib/docs/filters/wordpress/clean_html.rb | 14 +-
lib/docs/scrapers/angular.rb | 160 ++-----------
lib/docs/scrapers/bootstrap.rb | 6 +-
lib/docs/scrapers/c.rb | 42 ----
lib/docs/scrapers/clojure.rb | 9 +-
lib/docs/scrapers/cpp.rb | 52 -----
lib/docs/scrapers/cppref/c.rb | 12 +
lib/docs/scrapers/cppref/cpp.rb | 19 ++
lib/docs/scrapers/cppref/cppref.rb | 33 +++
lib/docs/scrapers/deno.rb | 2 +-
lib/docs/scrapers/docker.rb | 255 ++++-----------------
lib/docs/scrapers/erlang.rb | 6 +-
lib/docs/scrapers/eslint.rb | 2 +-
lib/docs/scrapers/fish.rb | 8 +
lib/docs/scrapers/flow.rb | 2 +-
lib/docs/scrapers/git.rb | 2 +-
lib/docs/scrapers/gnu/gcc.rb | 10 +
lib/docs/scrapers/gnu/gnu_fortran.rb | 5 +
lib/docs/scrapers/haproxy.rb | 7 +-
lib/docs/scrapers/kotlin.rb | 4 +
lib/docs/scrapers/nginx.rb | 4 +-
lib/docs/scrapers/perl.rb | 21 +-
lib/docs/scrapers/phoenix.rb | 4 +-
lib/docs/scrapers/rust.rb | 2 +-
lib/docs/scrapers/spring_boot.rb | 5 +-
lib/docs/scrapers/tensorflow/tensorflow.rb | 7 +-
lib/docs/scrapers/tensorflow/tensorflow_cpp.rb | 5 +
lib/docs/scrapers/typescript.rb | 2 +-
lib/docs/scrapers/wordpress.rb | 2 +-
public/icons/docs/point_cloud_library/16.png | Bin 494 -> 876 bytes
public/icons/docs/point_cloud_library/16 2x png | Bin 894 -> 877 bytes
63 files changed, 317 insertions(+), 758 deletions(-)
---
diff --cc Gemfile.lock
index 3620960b,f91f2685..0b7c3bb1
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -132,8 -132,7 +132,8 @@@ GE
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
unix_utils (0.0.15)
+ xdg (4.2.0)
- yajl-ruby (1.4.2)
+ yajl-ruby (1.4.3)
PLATFORMS
ruby
diff --cc assets/javascripts/templates/pages/about_tmpl.coffee
index 1b08662e,f041b25d..7cce99e7
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@@ -17,14 -17,9 +17,14 @@@ app.templates.aboutPage = -> ""
<ul>
<li>Follow <a href="https://twitter.com/DevDocs";>@DevDocs</a> on Twitter
<li>Watch the repository on <a href="https://github.com/freeCodeCamp/devdocs/subscription";>GitHub</a>
<iframe class="_github-btn"
src="https://ghbtns.com/github-btn.html?user=freeCodeCamp&repo=devdocs&type=watch&count=true";
allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20" tabindex="-1"></iframe>
- <li>Join the <a href="https://gitter.im/FreeCodeCamp/DevDocs";>Gitter</a> chat room
+ <li>Join the <a href="https://discord.gg/PRyKn3Vbay";>Discord</a> chat room
</ul>
+ <h2 class="_lined-heading">About the GNOME JavaScript documentation</h2>
+
+ <p>Documentation is generated with <code>g-ir-doc-tool</code> which is part of the <a
href="https://gitlab.gnome.org/GNOME/gobject-introspection";>GObject Introspection</a> project.<br>
+ An experiment demoed at the Developer Experience hackfest 2016.
+
<h2 class="_block-heading" id="copyright">Copyright and License</h2>
<p class="_note">
<strong>Copyright 2013–2021 Thibaut Courouble and <a
href="https://github.com/freeCodeCamp/devdocs/graphs/contributors";>other contributors</a></strong><br>
@@@ -33,9 -28,8 +33,8 @@@
For more information, see the <a
href="https://github.com/freeCodeCamp/devdocs/blob/main/COPYRIGHT";>COPYRIGHT</a>
and <a href="https://github.com/freeCodeCamp/devdocs/blob/main/LICENSE";>LICENSE</a> files.
- <h2 class="_block-heading" id="plugins">Plugins and Extensions</h2>
+ <!--h2 class="_block-heading" id="plugins">Plugins and Extensions</h2>
<ul>
- <li><a href="https://chrome.google.com/webstore/detail/devdocs/mnfehgbmkapmjnhcnbodoamcioleeooe";>Chrome
web app</a>
<li><a href="https://github.com/egoist/devdocs-app";>Desktop app</a>
<li><a href="https://sublime.wbond.net/packages/DevDocs";>Sublime Text package</a>
<li><a href="https://atom.io/packages/devdocs";>Atom package</a>
diff --cc assets/javascripts/templates/pages/root_tmpl.coffee.erb
index ba149165,559a30c9..90dce025
--- a/assets/javascripts/templates/pages/root_tmpl.coffee.erb
+++ b/assets/javascripts/templates/pages/root_tmpl.coffee.erb
@@@ -36,14 -33,13 +36,15 @@@ app.templates.intro = ""
<ol class="_intro-list">
<li>Open the <a href="/settings">Preferences</a> to enable more docs and customize the UI.
<li>You don't have to use your mouse — see the list of <a href="/help#shortcuts">keyboard
shortcuts</a>.
- <li>The search supports fuzzy matching (e.g. "bgcp" brings up "background-clip").
+ <li>The search supports fuzzy matching (e.g. "floadc" brings up "File.load_contents()").
<li>To search a specific documentation, type its name (or an abbr.), then Tab.
<li>You can search using your browser's address bar — <a href="/help#browser_search">learn
how</a>.
- <li>DevDocs works <a href="/offline">offline</a>, on mobile, and can be installed on <a
href="https://chrome.google.com/webstore/detail/devdocs/mnfehgbmkapmjnhcnbodoamcioleeooe";>Chrome</a>.
+ <li>DevDocs works <a href="/offline">offline</a>, on mobile, and can be installed as web app.
+ <li>For the latest news, follow <a href="https://twitter.com/DevDocs";>@DevDocs</a>.
<li>DevDocs is free and <a href="https://github.com/freeCodeCamp/devdocs";>open source</a>.
<object data="https://img.shields.io/github/stars/freeCodeCamp/devdocs.svg?style=social";
type="image/svg+xml" aria-hidden="true" height="20"></object>
+ This is a <a href="https://gitlab.gnome.org/GNOME/devdocsgjs";>modified version</a>.
+ <li>If any API documentation is incorrect, please file bugs on this <a
href="https://gitlab.gnome.org/GNOME/devdocsgjs/issues";>issue tracker</a>.
<li>And if you're new to coding, check out <a href="https://www.freecodecamp.org/";>freeCodeCamp's
open source curriculum</a>.
</ol>
<p>Happy coding!
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
![https://img.shields.io/github/stars/freeCodeCamp/devdocs.svg?style=social"](https://img.shields.io/github/stars/freeCodeCamp/devdocs.svg?style=social"){kind=link}