commit | aea7db3a146808c13035e77b1a82fbf267ed842b | [log] [tgz] |
---|---|---|
author | Will Stevens <williamstevens@gmail.com> | Mon Jul 10 12:40:38 2017 -0400 |
committer | Will Stevens <williamstevens@gmail.com> | Mon Jul 10 12:40:38 2017 -0400 |
tree | 22f5ffde5c59fdfb383e6a49771b7a5b07336eef | |
parent | 644cc15f1246d1e191c821139fb71608763ef03d [diff] |
resolving a whitespace diff with the master branch
This is built using middleman
$ gem install middleman $ bundle install
All sources are in the /source
directory
Build the site with:
$ middleman build
To serve it locally:
$ middleman server
#Building To build the HTML files, you just need to execute the build.sh
. The script will automatically generate the HTML files and then move them to the content
folder.
Use GitHub PR to make changes. No one should commit directly to Apache remote repositories without opening a PR and waiting for proper review. If you got the feedback and have amended the changes (if needed), it is time to commit the changes to Apache Software Foundation (AFS) remote repository. The ASF remote repository for this project is: https://git-wip-us.apache.org/repos/asf/cloudstack-www.git
IMPORTANT: To publish your changes, you should commit into the asf-site branch (pay attention, this is the name of the branch in the remote repository). Do not forget, you also have to commit the same changes to the master; so, master and asf-site branches are synchronized.
The asf-site branch is synchronized with a web server that delivers the Apache CloudStack web pages.
GOTCHA, the build
directory needs to be renamed to content
in the asf-site branch for the site to be served properly; If you use the build.sh
script, this step is already taken care of.
<your_github_user>
. To do that, you can access https://github.com/apache/cloudstack-www
and click on fork
on the right upper corner of the page.git clone
; e.g. git clone https://github.com/apache/cloudstack-www.git
or git clone https://github.com/<your_github_user>/cloudstack-www.git
cd cloudstack-www
git remote add upstream https://git-wip-us.apache.org/repos/asf/cloudstack-www.git
git remote add <your_github_user> https://github.com/<your_github_user>/cloudstack-www.git
git checkout -b master origin/master
or git checkout -b master <your_github_user>/master
middleman build
will build/“compile” the HTML files from the sources middleman server [-p <portnumber>]
. This will serve/deliver your HTML files over HTTP. You just gotta access them using a browser; e.g. http://localhost:[port_configured]
. Check your changes!!./build.sh
git add -A
git commit -am "your commit message"
git push
<your_github_user> master
cloudstack-www
repo.git remote add <friend_contributor> https://github.com/<friend_contributor>/cloudstack-www.git
git checkout asf-site
git merge <repo_where_the_changes_are>/master
; e.g. git merge <friend_contributor>/master
or git merge <your_github_user>/master
git log -p
. Check if the changes were properly merged.git push upstream asf-site
git push upstream master
devs
mailing list.