This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch site
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/site by this push:
     new 659326b5f Remove instructions for syncing site and master and fix 
formatting issue in howto
659326b5f is described below

commit 659326b5fa4c6667315ca3e1af5ad7f8d6050e03
Author: Francis Chuang <[email protected]>
AuthorDate: Thu Apr 21 14:30:34 2022 +1000

    Remove instructions for syncing site and master and fix formatting issue in 
howto
---
 site/_docs/howto.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 4aac63dbd..61a203577 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -693,11 +693,6 @@ Before you start:
   is starting and therefore `master` branch is in code freeze until further 
notice.
 * Set up signing keys as described above.
 * Make sure you are using JDK 8 (not 9 or 10).
-* Make sure `master` branch and `site` branch are in sync, i.e. there is no
-  commit on `site` that has not been applied also to `master`.
-  We are talking about the commit content, you need to pay attention to the 
commit message
-  and change, not hash: it is normal to have the same change in `site` and
-  `master`, but with different hashes. If you spot missing commits then port 
them to `master`.
 * Check that `README` and `site/_docs/howto.md` have the correct version 
number.
 * Check that `site/_docs/howto.md` has the correct Gradle version.
 * Check that `NOTICE` has the current copyright year.
@@ -721,7 +716,7 @@ Before you start:
 * Optional tests using tasks:
   * `./gradlew testSlow`
 * Add release notes to `site/_docs/history.md`. If release notes already exist 
for the version to be released, but
-  are commented out, remove the comments (`{% comment %}` and `{% endcomment 
%}`). Include the commit history,
+  are commented out, remove the comments (`{% raw %}{% comment %}{% endraw %}` 
and `{% raw %}{% endcomment %}{% endraw %}`). Include the commit history,
   names of people who contributed to the release, and say which versions of 
Java, Guava and operating systems the
   release is tested against.
 * Make sure that

Reply via email to