Merge pull request #13 from jhipster/sync-889326bb

Merge sync-889326bb into main

_layouts/default.html

@@ -260,8 +260,8 @@
                                         <ul class="nav navbar-nav">
                                             <li {% if '/microservices-architecture/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/microservices-architecture/"><i class="fa fa-fw fa-map-signs"></i> 概要</a></li>
                                             <li {% if '/api-gateway/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/api-gateway/"><i class="fa fa-fw fa-exchange"></i> APIゲートウェイ</a></li>
-                                            <li {% if '/jhipster-registry/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/jhipster-registry/"><i class="fa fa-fw  fa-dashboard"></i> JHipster レジストリ</a></li>
                                             <li {% if '/consul/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/consul/"><i class="fa fa-fw fa-bullseye"></i> Consul</a></li>
+                                            <li {% if '/jhipster-registry/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/jhipster-registry/"><i class="fa fa-fw  fa-dashboard"></i> JHipster レジストリ</a></li>
                                             <li {% if '/creating-microservices/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/creating-microservices/"><i class="fa fa-fw fa-bolt"></i> マイクロサービスの構築</a></li>
                                             <li {% if '/microservices-in-production/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/microservices-in-production/"><i class="fa fa-fw fa-cloud"></i> プロダクション環境</a></li>
                                             <li {% if '/jhipster-control-center/' == page.url %}class="active" {% endif %}><a href="{{ site.url }}/jhipster-control-center/"><i class="fa fa-fw fa-codepen"></i> JHipster コントロールセンター</a></li>
@@ -430,21 +430,7 @@
                                     </div>
                                 </div>
                                 <div class="row">
-                                    <div class="col-sm-12 text-center">
-                                        <div class="thumbnail no-margin-bottom">
-                                            <div class="logo-container">
-                                                <a href="https://developer.okta.com/?utm_campaign=display_website_all_multiple_dev_dev_jhipster-q2_&utm_source=jhipster&utm_medium=cpc" target="_blank" rel="noopener"><img src="{{ site.url }}/images/open-collective/okta.png" width="550px" height="186px"></a>
-                                            </div>
-                                        </div>
-                                        <div>
-                                            <div>
-                                                <a href="https://developer.okta.com/blog/2021/01/20/reactive-java-microservices?utm_campaign=text_website_all_multiple_dev_dev_jhipster-q2_&utm_source=jhipster&utm_medium=cpc" target="_blank" rel="noopener">Build Reactive Microservices with JHipster and OAuth 2.0</a>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col-sm-12 col-md-4">
+                                    <div class="col-sm-12 col-md-12">
                                         <div class="thumbnail no-margin-bottom">
                                             <div class="logo-container">
                                                 <a href="https://dev.entando.org/jhipster" target="_blank" rel="noopener"><img src="{{ site.url }}/images/open-collective/entandoe.png" width="180px" height="175px"></a>
@@ -454,16 +440,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-12 col-md-4">
-                                        <div class="thumbnail no-margin-bottom">
-                                            <div class="logo-container">
-                                                <a href="https://www.datastax.com/" target="_blank" rel="noopener"><img src="{{ site.url }}/images/open-collective/datastax.png" width="180px" height="175px"></a>
-                                            </div>
-                                            <div class="caption">
-                                                <a href="https://www.datastax.com/" target="_blank" rel="noopener">DataStax is the open, multi-cloud stack for modern data apps.</a>
-                                            </div>
-                                        </div>
-                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -504,7 +480,7 @@ <h5 class="text-left"><i class="fa fa-database fa-fw"></i> <a class="link" href=
                             <div class="container">
                                 <div class="row">
                                     <div class="col-lg-12">
-                                        Copyright &copy; JHipster 2013-2021 | <a href="https://github.com/IronSummitMedia/startbootstrap-freelancer" target="_blank" rel="noopener">Freelancer</a> と <a href="https://github.com/dulumao/flat-admin-bootstrap-templates" target="_blank" rel="noopener">Flat admin</a> に基づくテーマ
+                                        Copyright &copy; JHipster 2013-2023 | <a href="https://github.com/IronSummitMedia/startbootstrap-freelancer" target="_blank" rel="noopener">Freelancer</a> と <a href="https://github.com/dulumao/flat-admin-bootstrap-templates" target="_blank" rel="noopener">Flat admin</a> に基づくテーマ
                                     </div>
                                 </div>
                             </div>
@@ -571,21 +547,13 @@ <h5 class="text-left"><i class="fa fa-database fa-fw"></i> <a class="link" href=
     </script>
     <script type="text/javascript" src="{{ site.url }}/js/climate-strike.js" async></script>
     <!-- end Climate strike JS -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-4L9RJVPGJT"></script>
     <script>
-        (function (i, s, o, g, r, a, m) {
-            i['GoogleAnalyticsObject'] = r;
-            i[r] = i[r] || function () {
-                (i[r].q = i[r].q || []).push(arguments)
-            }, i[r].l = 1 * new Date();
-            a = s.createElement(o),
-                m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m)
-        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
 
-        ga('create', 'UA-46075199-1', 'auto');
-        ga('send', 'pageview');
+    gtag('config', 'G-4L9RJVPGJT');
     </script>
     <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
     <script type="text/javascript">

_posts/2013-12-05-jhipster-release-0.2.1.md

@@ -8,4 +8,4 @@ JHipster release 0.2.1
 
 *JHipster gives you Yeoman + Maven + Spring + AngularJS all working together in one handy generator.*
 
-This is mostly a bug-fix release, which corrects an error occuring when using Grunt on Windows, due to a bug in the grunt-contrib-imagemin NPM package.
+This is mostly a bug-fix release, which corrects an error occurring when using Grunt on Windows, due to a bug in the grunt-contrib-imagemin NPM package.

_posts/2014-02-19-jhipster-release-0.11.0.md

@@ -26,7 +26,7 @@ All those are possible thanks to a lot of very complex code that is generated in
 This version also comes with some less important changes:
 
 - Many improvements on the Metrics page
-- All Grunt libraries are now fixed, as we had to many issues with broken JavaScript libraires. This is the same thing we have done with Bower in the previous release
+- All Grunt libraries are now fixed, as we had to many issues with broken JavaScript libraries. This is the same thing we have done with Bower in the previous release
 - We have switched from HSQLDB to H2, as it provides a nice Web console, available with the "/console" URL of your application. This allows you to check that hot reload really updated your database!
 - Several bugfixes, most noticeably in the Atmosphere code
 

_posts/2014-04-01-jhipster-release-2.0.0.md

@@ -16,7 +16,7 @@ JHipster 2 breaks compatibility, new focus on the [Golo language](http://golo-la
 Announcing JHipster for Golo
 ----------
 
-JHipster's goal has always be to provide the hippest tools to developpers. Yeoman, Grunt, Bower, AngularJS, Spring Boot, you name it...
+JHipster's goal has always be to provide the hippest tools to developers. Yeoman, Grunt, Bower, AngularJS, Spring Boot, you name it...
 A lot of tension has arised with the release of Java 8, as many people wanted JHipster to drop Java 7 support.
 
 After careful consideration, we have in fact decided to deprecate the whole Java language and focus instead on the [Golo language](http://golo-lang.org/).
@@ -31,7 +31,7 @@ This also means we will break compatibility with the 1.0 version:
 JHipster lead developers joining TypeUnsafe
 ------------
 
-As a result, our top developpers ([@juliendubois](https://twitter.com/juliendubois) and [@jmirc](https://twitter.com/jmirc)) will join the [TypeUnsafe](http://www.typeunsafe.org/) team:
+As a result, our top developers ([@juliendubois](https://twitter.com/juliendubois) and [@jmirc](https://twitter.com/jmirc)) will join the [TypeUnsafe](http://www.typeunsafe.org/) team:
 
 - This will ensure that we can start monetizing the framework by selling support contracts to our users
 - In the long run, the TypeUnsafe stack should attract some bigger software vendor, who will buy the company for an insane amount of money.  This should allow us to stop coding and follow Mark Fleury's example and become DJs in Spain.

_posts/2014-05-26-jhipster-release-0.15.0.md

@@ -14,7 +14,7 @@ What's new
 JHipster 0.15.0 comes with two important updates:
 
 - A new "registration" page, that was one of our most requested features: [#309](https://github.com/jhipster/generator-jhipster/pull/309)
-- Corrected a database error that was occuring in production mode: [#305](https://github.com/jhipster/generator-jhipster/issues/305)
+- Corrected a database error that was occurring in production mode: [#305](https://github.com/jhipster/generator-jhipster/issues/305)
 
 And of course several minor bugfixes and improvements, which are listed [here](https://github.com/jhipster/generator-jhipster/issues?milestone=4&page=1&state=closed)
 

_posts/2014-11-14-jhipster-release-1.9.0.md

@@ -14,7 +14,7 @@ What's new
 The highlights of this release are:
 
 - We upgraded to the latest Spring Boot 1.1.9
-- We now __recommend__ the use of Maven over Gradle, and the use of Grunt over Gulp.js. Both Gradle and Gulp.js were community-driven add-ons, and we find them hard to maintain, while it is clear that very few people are using them. So we are looking for volonteers to maintain those tools (it you like one of them, speak up! Become a maintainer!).
+- We now __recommend__ the use of Maven over Gradle, and the use of Grunt over Gulp.js. Both Gradle and Gulp.js were community-driven add-ons, and we find them hard to maintain, while it is clear that very few people are using them. So we are looking for volunteers to maintain those tools (it you like one of them, speak up! Become a maintainer!).
 - We have reworked the generator options, so they are in a more logical order
 - We now have Java 8 by default, instead of Java 7. As Java 7 will be end-of-life'd in April 2015, we feel it is the right time to switch!
 

_posts/2015-01-30-jhipster-release-2.1.0.md

@@ -22,7 +22,7 @@ The most important parts concern the security:
 
 - We have a new "token" security mechanism, that is stateless and does not require a data store. This is a specific JHipster mechanism, close to what you will find in the node.js community.
 - If you use the more classical "session" security, which is the default Spring Security mechanism, we now have a successful CSRF protection. This is quite unique, as most people think that as both Spring Security and AngularJS provide CSRF protection, they should be safe. In fact, as both technologies don't use the same tokens, it just doesn't work! This has been a very complex work.
-- As all this is quite complicated, we now have a new documentation page explaning our security options
+- As all this is quite complicated, we now have a new documentation page explaining our security options
 
 __WARNING__ As our security mechanisms have changed, your .yo-rc.json files need to be changed! The "authenticationType" property is now different, and you need to upgrade it: the easiest way is to delete it and answer the questions again.
 

_posts/2015-05-07-jhipster-release-2.10.0.md

@@ -16,7 +16,7 @@ Looking for the (old) JHipster v2.x documentation? It's [Here]({{ post.url }}/do
 What's new
 ----------
 
-The biggest news in this release is that we have the [password reset feature](https://github.com/jhipster/generator-jhipster/pull/1343) working, thanks to the great work of [Frederik Hahne](https://twitter.com/atomfrede). Frederik is also our Gradle maintainer, and is one of our [top contibutors](https://github.com/jhipster/generator-jhipster/graphs/contributors), many thanks to him!!
+The biggest news in this release is that we have the [password reset feature](https://github.com/jhipster/generator-jhipster/pull/1343) working, thanks to the great work of [Frederik Hahne](https://twitter.com/atomfrede). Frederik is also our Gradle maintainer, and is one of our [top contributors](https://github.com/jhipster/generator-jhipster/graphs/contributors), many thanks to him!!
 
 And as always, __[you can check all the closed tickets here](https://github.com/jhipster/generator-jhipster/issues?q=milestone%3A2.10.0+is%3Aclosed)__.
 

_posts/2016-03-23-jhipster-release-3.0.0.md

@@ -36,7 +36,7 @@ Other important changes
 - The entity sub-generator got many new features like option to update existing entities, custom table name, AngularJS suffix etc. Check the documentation [here]({{ site.url }}/creating-an-entity/) for details.
 - The `fast` profile has been removed and instead you now have profile switches. Check the documentation [here]({{ site.url }}/profiles/) for details.
 - We have changed the way application is packaged, to improve performance. Find more details [here]({{ site.url }}/production/).
-- You can now choose a base language and additional languages during application generation if you have choosen internationalization.
+- You can now choose a base language and additional languages during application generation if you have chosen internationalization.
 
 Closed tickets
 ------------

_posts/2016-08-17-jhipster-release-3.6.0.md

@@ -9,7 +9,7 @@ JHipster release 3.6.0
 What's new
 ----------
 
-This is a very big release, with some important changes (but which don't break too much code, so this isn't a major release), some incredible new features, and the usual bug fixes and upgrades. In total, this is [121 closed tickets and PRs](https://github.com/jhipster/generator-jhipster/issues?q=milestone%3A3.6.0+is%3Aclosed), which is  better than most commerical vendors do in the middle of August!
+This is a very big release, with some important changes (but which don't break too much code, so this isn't a major release), some incredible new features, and the usual bug fixes and upgrades. In total, this is [121 closed tickets and PRs](https://github.com/jhipster/generator-jhipster/issues?q=milestone%3A3.6.0+is%3Aclosed), which is  better than most commercial vendors do in the middle of August!
 
 Important change: DTOs refactoring
 ------------
@@ -55,7 +55,7 @@ If you need complete information on your JHipster setup, you can run the new "in
 
     yo jhipster:info
 
-Remember to use it when submiting a bug the project!
+Remember to use it when submitting a bug the project!
 
 Upgrades
 -------------

_posts/2017-08-23-jhipster-release-4.7.0.md

@@ -14,7 +14,7 @@ What's new
 - Spring dependencies upgrades - see [#6268](https://github.com/jhipster/generator-jhipster/pull/6268)
 - Bootstrap, ng-bootstrap and Webpack upgrades - see [#6233](https://github.com/jhipster/generator-jhipster/pull/6233)
 - Upgrade to JHipster Console v2.2.1 - see [#6175](https://github.com/jhipster/generator-jhipster/pull/6175)
-- Migratation of Logstash appender from UDP to TCP - see [#6102](https://github.com/jhipster/generator-jhipster/issues/6102)
+- Migration of Logstash appender from UDP to TCP - see [#6102](https://github.com/jhipster/generator-jhipster/issues/6102)
 - Many minor bugs and small new features
 
 Closed tickets and merged pull requests

_posts/2018-09-17-jhipster-release-5.3.2.md

@@ -8,7 +8,7 @@ JHipster release v5.3.2
 
 JHipster v5.3.2 is a patch release, with [134 tickets and pull requests closed](https://github.com/jhipster/generator-jhipster/issues?q=milestone%3A5.3.2+is%3Aclosed), so if you had any bugs in JHipster v5.3.1, this update will hopefully solve them!
 
-This release is the first one where we used extensively our [bug bounty program](https://www.jhipster.tech/bug-bounties/), and this worked remarquably well, with [$1,100 in paid bounties](https://github.com/jhipster/generator-jhipster/issues?q=is%3Aissue+milestone%3A5.3.2+is%3Aclosed+label%3A%24100) - and which also explains why this release has so many fixed bugs! As this has been a great success, we will continue to push this program forward: if you or your company benefit from JHipster, please consider [sponsoring the project](https://www.jhipster.tech/sponsors/), as the sponsor money fuels the bug bounty program.
+This release is the first one where we used extensively our [bug bounty program](https://www.jhipster.tech/bug-bounties/), and this worked remarkably well, with [$1,100 in paid bounties](https://github.com/jhipster/generator-jhipster/issues?q=is%3Aissue+milestone%3A5.3.2+is%3Aclosed+label%3A%24100) - and which also explains why this release has so many fixed bugs! As this has been a great success, we will continue to push this program forward: if you or your company benefit from JHipster, please consider [sponsoring the project](https://www.jhipster.tech/sponsors/), as the sponsor money fuels the bug bounty program.
 
 Here are the most important bug fixes and enhancements from this release:
 

_posts/2018-11-12-jhipster-release-5.7.0.md

@@ -9,7 +9,7 @@ JHipster release v5.7.0
 This new minor release comes with 55 closed tickets and pull requests. It has 2 major improvements:
 
 - JHipster now uses UTC timestamps everywhere thanks to [#8284](https://github.com/jhipster/generator-jhipster/issues/8284). This follows our goal of generating full-stack, high quality applications. This will cause a few issues in existing applications, as we now force UTC (for example in the Hibernate configuration and in the Liquibase scripts), but the migration should be easy as this doesn't touch a lot of lines of code.
-- The JDL has been refined, firstly by fixing several bugs (including in [#8547](https://github.com/jhipster/generator-jhipster/issues/8547)), and secondly by adding support for deploying applications straight from the JDL. Depoyments only work with Docker-based tools for the moment, so we support Docker Compose, Kubernetes, Openshift and Rancher Compose. If you want more information the documentation is already updated in the [JDL documentation]({{ site.url }}/jdl/).
+- The JDL has been refined, firstly by fixing several bugs (including in [#8547](https://github.com/jhipster/generator-jhipster/issues/8547)), and secondly by adding support for deploying applications straight from the JDL. Deployments only work with Docker-based tools for the moment, so we support Docker Compose, Kubernetes, Openshift and Rancher Compose. If you want more information the documentation is already updated in the [JDL documentation]({{ site.url }}/jdl/).
 
 Closed tickets and merged pull requests
 ------------