This is an automated email from the ASF dual-hosted git repository.
swapnilmmane pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/roller-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new fb0710b Improved: Updated the build instruction since now 'asf-site'
is default branch of website repository
fb0710b is described below
commit fb0710bc571f6fcd8e811014e13aa7bace7cc0ea
Author: Swapnil M Mane <swapnil.m...@hotwaxsystems.com>
AuthorDate: Fri Sep 20 17:35:51 2019 +0530
Improved: Updated the build instruction since now 'asf-site' is default
branch of website repository
The Apache Roller community decided to mark the 'master' branch as Stale.
And make the 'asf-site' branch as default for Roller website GitHub repository
https://github.com/apache/roller-website/branches
So, now the asf-site is default branch of this repo, thus updated the build
instructions according to this.
Reference mail thread - https://s.apache.org/3jkbf
Jira ticket for INFRA team https://issues.apache.org/jira/browse/INFRA-19115
---
content/getinvolved/edit_website.html | 8 ++++----
sources/src/main/jbake/content/getinvolved/edit_website.md | 9 ++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/content/getinvolved/edit_website.html
b/content/getinvolved/edit_website.html
index 3a979f7..7ffeac9 100644
--- a/content/getinvolved/edit_website.html
+++ b/content/getinvolved/edit_website.html
@@ -117,8 +117,8 @@
<p><code>git clone
https://git-wip-us.apache.org/repos/asf/roller-website.git</code></p>
</li>
<li>
- <p>Go to the roller-website directory, make sure you are on the master
branch:</p>
- <p><code>cd roller-website</code><br/><code>git checkout master</code></p>
+ <p>Go to the roller-website directory, make sure you are on the asf-site
branch:</p>
+ <p><code>cd roller-website</code><br/><code>git checkout
asf-site</code></p>
</li>
<li>
<p>Make your changes to Markdowna (.md) and FreeMarker (.ftl) files under
the source directory.</p></li>
@@ -128,8 +128,8 @@
<p>Or alternatively, run <code>mvn jbake:inline</code> so you can view the
website locally at <a href="http://localhost:8080";>http://localhost:8080</a></p>
</li>
<li>
- <p>Once the site looks good, commit your changes and merge them into the
asf_site branch.</p>
- <p><code>git commit -m "my wonderful changes"
.</code><br/><code>git checkout asf_site</code><br/><code>git merge
master</code></p>
+ <p>Once the site looks good, commit your changes to the asf_site
branch.</p>
+ <p><code>git commit -m "my wonderful changes"
.</code><br/><code>git push origin asf-site</code></p>
</li>
<li>
<p>Push your changes to the ASF Git repo. The ASF website infrastructure
will pick up your changes and publish them to the website.</p></li>
diff --git a/sources/src/main/jbake/content/getinvolved/edit_website.md
b/sources/src/main/jbake/content/getinvolved/edit_website.md
index 0109682..6f095d1 100644
--- a/sources/src/main/jbake/content/getinvolved/edit_website.md
+++ b/sources/src/main/jbake/content/getinvolved/edit_website.md
@@ -42,10 +42,10 @@ This page is not a tutorial. To update the website you will
have to understand h
```git clone https://git-wip-us.apache.org/repos/asf/roller-website.git```
-2. Go to the roller-website directory, make sure you are on the master branch:
+2. Go to the roller-website directory, make sure you are on the asf-site
branch:
```cd roller-website```
- ```git checkout master```
+ ```git checkout asf-site```
2. Make your changes to Markdowna (.md) and FreeMarker (.ftl) files under the
source directory.
@@ -56,11 +56,10 @@ This page is not a tutorial. To update the website you will
have to understand h
Or alternatively, run ```mvn jbake:inline``` so you can view the website
locally at http://localhost:8080
-4. Once the site looks good, commit your changes and merge them into the
asf_site branch.
+4. Once the site looks good, commit your changes to the asf_site branch.
```git commit -m "my wonderful changes" .```
- ```git checkout asf_site```
- ```git merge master```
+ ```git push origin asf-site```
5. Push your changes to the ASF Git repo. The ASF website infrastructure will
pick up your changes and publish them to the website.
