From 53e6ed74492dc09e0ae4317227daa65d42d1887c Mon Sep 17 00:00:00 2001 From: Yu Feng Date: Wed, 25 Jan 2017 14:21:46 -0800 Subject: [PATCH 1/4] Update and rename README.md to README.rst --- README.md | 2 -- README.rst | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) delete mode 100644 README.md create mode 100644 README.rst diff --git a/README.md b/README.md deleted file mode 100644 index a9b0d89..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# workshops -Websites of BCCP workshops diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..b9ff25c --- /dev/null +++ b/README.rst @@ -0,0 +1,10 @@ +# Websites of BCCP workshops + +This is the hosting repository for BCCP workshops. The idea is borrowed from Scipy-Conferences. + +Here, each workshop is set up as a branch. To start a new workshop, branch off from an existing workshop: + +1. Select the base workshop from the branches menu + +.. image : + alt From 6a30c5c36c8667a0879c1f9dbe4cdbddb8eedca5 Mon Sep 17 00:00:00 2001 From: Yu Feng Date: Wed, 25 Jan 2017 14:28:29 -0800 Subject: [PATCH 2/4] Update README.rst --- README.rst | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index b9ff25c..5ce1323 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,22 @@ This is the hosting repository for BCCP workshops. The idea is borrowed from Sci Here, each workshop is set up as a branch. To start a new workshop, branch off from an existing workshop: -1. Select the base workshop from the branches menu +1. Select the base workshop from the branches menu of the github interface + +2. Type a new branch name, in a format like `2017-non-linear-universe`. Github will ask you if you are to create a new branch. Select yes. + +3. Now we are on the `2017-non-linear-universe` (or any branch name you decided). Edit the website to make sure information is accurate. (Sponser, Venue, Links to Schedule, Organizers, etc). + +4. Edit this file [subsites]_ to add an entry for the website. The format of a line is + +``` +Branch-name | URL on the bccp website | html | . +``` + +The last two words must be `html` and `.` -- those will be useful for future updates. + +.. [subsites] https://github.com/bccp/website/blob/master/subsites.txt + + + -.. image : - alt From 3c8cd0012424c776f754ce27617480e03e06f5af Mon Sep 17 00:00:00 2001 From: Yu Feng Date: Wed, 25 Jan 2017 14:31:29 -0800 Subject: [PATCH 3/4] Update README.rst --- README.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.rst b/README.rst index 5ce1323..9c470e3 100644 --- a/README.rst +++ b/README.rst @@ -16,7 +16,18 @@ Here, each workshop is set up as a branch. To start a new workshop, branch off f Branch-name | URL on the bccp website | html | . ``` +For example, +``` +2017-non-linear-universe | 2017-non-linear-universe | html | . +``` + + The last two words must be `html` and `.` -- those will be useful for future updates. +After the file is edited and committed, you shall soon be able to find the website online. +For our example, the url is `http://bccp.berkeley.edu/2017-non-linear-universe`. + +5. Remember to add a link to the website to the workshops page of the bccp website. + .. [subsites] https://github.com/bccp/website/blob/master/subsites.txt From e77143ce7f69cf565009ed27ab6f9422ad553dd0 Mon Sep 17 00:00:00 2001 From: Yu Feng Date: Wed, 25 Jan 2017 14:33:25 -0800 Subject: [PATCH 4/4] Update README.rst --- README.rst | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 9c470e3..9d3d745 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,5 @@ -# Websites of BCCP workshops +Website of BCCP Workshops +========================= This is the hosting repository for BCCP workshops. The idea is borrowed from Scipy-Conferences. @@ -12,14 +13,17 @@ Here, each workshop is set up as a branch. To start a new workshop, branch off f 4. Edit this file [subsites]_ to add an entry for the website. The format of a line is -``` -Branch-name | URL on the bccp website | html | . -``` +.. code :: + + Branch-name | URL on the bccp website | html | . + For example, -``` -2017-non-linear-universe | 2017-non-linear-universe | html | . -``` + +.. code :: + + 2017-non-linear-universe | 2017-non-linear-universe | html | . + The last two words must be `html` and `.` -- those will be useful for future updates.