You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/12/13 12:24:55 UTC
[myfaces-tobago] branch master updated: TOBAGO-1834: Please use
HTTPS for the KEYS link * also make some textual updates. * optimize google
search filter
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 7d883f1 TOBAGO-1834: Please use HTTPS for the KEYS link * also make some textual updates. * optimize google search filter
7d883f1 is described below
commit 7d883f167c89b33a336c1f7274abe9665fda848d
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Dec 13 10:33:23 2017 +0100
TOBAGO-1834: Please use HTTPS for the KEYS link
* also make some textual updates.
* optimize google search filter
---
src/site/apt/download.apt | 31 ++++++++++------------
src/site/apt/index.apt | 18 ++++++-------
src/site/site.xml | 6 ++---
.../src/main/webapp/script/demo.js | 10 +++----
4 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index dc8ca83..e465afd 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -163,33 +163,30 @@ Nightly builds from SVN repository
Archive of old releases
- Older releases are available in the {{{http://archive.apache.org/dist/myfaces/} archive}}. Those
+ Older releases are available in the {{{https://archive.apache.org/dist/myfaces/} archive}}. Those
releases are only provided as historical artifacts. We strongly
recommend not to use those releases, but upgrade to the most recent release.
Verifying checksums
It is essential that you verify the integrity of the downloaded
- files using the PGP and MD5 signatures. MD5 verification ensures the
- file was not corrupted during the download process. PGP verification
- ensures that the file came from a certain person.
-
- To verify the MD5 signature on the files, you need to use a program
- called <<<md5>>> or <<<md5sum>>>, which is
- included in many UNIX distributions. It is also available as part of
- {{{http://www.gnu.org/software/textutils/textutils.html}GNU Textutils}}.
- Windows users can get binary md5 programs from {{{http://www.fourmilab.ch/md5/}here}},
- {{{http://www.pc-tools.net/win32/freeware/console/}here}}, or
- {{{http://www.slavasoft.com/fsum/}here}}.
+ files using the SHA 256 or MD5 signatures.
+ This verification ensures the
+ file was not corrupted during the download or mirroring process.
+
+ To verify the hash signature on the files, you need to use a program
+ called e. g. <<<sha>>>, <<<shasum>>>, <<<md5>>> or <<<md5sum>>>, which is
+ included in many UNIX distributions and MacOS.
+ It is also available for Windows.
Verifying signatures
- PGP verification ensures that the file came from a certain person. We strongly recommend
- you verify your downloads with both PGP and MD5.
+ PGP verification ensures that the file came from a certain person.
+ We recommend you verify your downloads with PGP.
- The PGP signatures can be verified using {{{http://www.pgpi.org/}PGP}} or
- {{{http://www.gnupg.org/}GPG}}. First download the Apache MyFaces
- {{{http://www.apache.org/dist/myfaces/KEYS}KEYS}} as well as the <<<asc>>> signature file
+ The PGP signatures can be verified using {{{https://www.openpgp.org/}OpenPGP}} or
+ {{{https://www.gnupg.org/}GPG}}. First download the Apache MyFaces
+ {{{https://www.apache.org/dist/myfaces/KEYS}KEYS}} as well as the <<<asc>>> signature file
for the particular distribution. It is important that you get these files from the ultimate
trusted source - the main ASF distribution site, rather than from a mirror.
Then verify the signatures using ...
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index f21ce35..38d6179 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -199,7 +199,7 @@ News
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -239,7 +239,7 @@ News
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -265,7 +265,7 @@ News
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -289,7 +289,7 @@ News
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -336,7 +336,7 @@ News
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -360,7 +360,7 @@ News
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -422,7 +422,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
[]
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -449,7 +449,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
This may be the last version using Bootstrap 3.
The next alpha of Tobago will properly using Bootstrap 4, where the second alpha was released a few days ago.
- Also see section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ Also see section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
@@ -461,7 +461,7 @@ svn switch https://svn.apache.org/repos/asf/myfaces/tobago/trunk/
Release notes can be found in
{{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12325880}Jira}}.
- See section: {{{http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
+ See section: {{{http://tobago-vm.apache.org/demo-4-release/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml} What's new in Tobago 3.0?}}
\ {}
~~ hack for a bit space
diff --git a/src/site/site.xml b/src/site/site.xml
index b449dc6..beb4c4b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -52,10 +52,10 @@
<menu name="Documentation">
<item name="Getting Started" href="http://myfaces.apache.org/tobago/getting-started.html"/>
<item name="Compatibility" href="http://myfaces.apache.org/tobago/compatibility.html"/>
- <item name="New in Tobago 3.0" href="http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml"/>
+ <item name="New in Tobago 4.0" href="http://tobago-vm.apache.org/demo-4-release/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml"/>
<item name="Guide to Tobago" href="http://myfaces.apache.org/tobago/guide.html"/>
- <item name="Test Tobago 3.0 Demo" href="http://myfaces.apache.org/tobago/howto-test.html"/>
- <item name="Migration" href="http://tobago-vm.apache.org/demo-4-snapshot/content/10-intro/50-migration/97-migration/migration30.xhtml"/>
+ <item name="Test Tobago" href="http://myfaces.apache.org/tobago/howto-test.html"/>
+ <item name="Migration" href="http://tobago-vm.apache.org/demo-4-release/content/10-intro/50-migration/migration.xhtml"/>
<item name="Roadmap" href="https://issues.apache.org/jira/browse/TOBAGO?selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel" />
<item name="FAQ" href="http://myfaces.apache.org/tobago/faq.html" />
<item name="API Documentation" href="http://myfaces.apache.org/tobago/api.html" />
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js b/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
index 19ce338..7fbd89a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
@@ -121,18 +121,14 @@ Demo.initGoogleSearch = function () {
var $input = jQuery("#page\\:search\\:searchField");
var $button = jQuery("#page\\:search\\:searchCommand");
+ var search = "+site%3Atobago-vm.apache.org+demo-4";
$input.change(function () {
- $button.attr("href",
- "https://www.google.com/search?q=" +
- encodeURI($input.val())
- + "+site%3Atobago-vm.apache.org%2Fdemo-4-snapshot&oq=site%3Atobago-vm.apache.org%2Fdemo-4-snapshot");
+ $button.attr("href", "https://www.google.com/search?q=" + encodeURI($input.val()) + search);
});
$input.keypress(function (e) {
if (e.which === 13) {
console.log("ENTER");
- window.location.href = "https://www.google.com/search?q=" +
- encodeURI($input.val())
- + "+site%3Atobago-vm.apache.org%2Fdemo-4-snapshot&oq=site%3Atobago-vm.apache.org%2Fdemo-4-snapshot";
+ window.location.href = "https://www.google.com/search?q=" + encodeURI($input.val()) + search;
}
});
};
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].