Merge remote-tracking branch 'matt-davis/master'

[workshop-organization.git] / repository

diff --git a/gistfile1.txt b/repository
similarity index 67%
rename from gistfile1.txt
rename to repository
index 4f11eeb5da6ee1cd4d378a45803dd8c76f4e5e4b..6294e0dce20121f10b1ae8c7cc93871d23ee102d 100644 (file)
--- a/gistfile1.txt
+++ b/repository
@@ -5,7 +5,7 @@ There is a central repository for boot camp material:
 
   https://github.com/swcarpentry/workshop
 
-The "Â\80Â\9cmaster"Â\80Â\9d branch has the current state-of-the-art source for the
+The â\80\9cmasterâ\80\9d branch has the current state-of-the-art source for the
 instructors' projected content, handouts, workshop homepage, etc.
 Different "editions" of material can live side-by-side in subdirectories.
 
@@ -13,26 +13,26 @@ Topics will live in per-subject subdirectories, ideally organized in
 half-day-sized chunks.
 
   .
-  âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 README.md
-  âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 debugging
-  âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 README.md
-  âÂ\94Â\82   âÂ\80¦
-  âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 make
-  âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 README.md
-  âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 example-project
-  âÂ\94Â\82   âÂ\80¦
-  âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 python
-  âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 README.md
-  âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 animals.txt
-  âÂ\94Â\82   âÂ\80¦
-  âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 shell
-  âÂ\94Â\82   âÂ\80¦
-  âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 version-control
-  âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 git
-  âÂ\94Â\82   âÂ\94Â\82   âÂ\94Â\9câÂ\94Â\80âÂ\94Â\80 basic
-  âÂ\94Â\82   âÂ\94Â\82   âÂ\94Â\82   âÂ\80¦
-  âÂ\94Â\82   âÂ\94Â\82   âÂ\94Â\94âÂ\94Â\80âÂ\94Â\80 advanced
-  âÂ\80¦   âÂ\80¦       âÂ\80¦
+  â\94\9câ\94\80â\94\80 README.md
+  â\94\9câ\94\80â\94\80 debugging
+  â\94\82   â\94\9câ\94\80â\94\80 README.md
+  â\94\82   â\80¦
+  â\94\9câ\94\80â\94\80 make
+  â\94\82   â\94\9câ\94\80â\94\80 README.md
+  â\94\82   â\94\9câ\94\80â\94\80 example-project
+  â\94\82   â\80¦
+  â\94\9câ\94\80â\94\80 python
+  â\94\82   â\94\9câ\94\80â\94\80 README.md
+  â\94\82   â\94\9câ\94\80â\94\80 animals.txt
+  â\94\82   â\80¦
+  â\94\9câ\94\80â\94\80 shell
+  â\94\82   â\80¦
+  â\94\9câ\94\80â\94\80 version-control
+  â\94\82   â\94\9câ\94\80â\94\80 git
+  â\94\82   â\94\82   â\94\9câ\94\80â\94\80 basic
+  â\94\82   â\94\82   â\94\82   â\80¦
+  â\94\82   â\94\82   â\94\94â\94\80â\94\80 advanced
+  â\80¦   â\80¦       â\80¦
 
   Figure 1: Example directory tree for the current 2012-12-my-workshop
   tip.  Sections should be in half-day-ish chunks.  Complicated topics
@@ -49,7 +49,7 @@ Developing workshop content
 
 If you don't have strong ideas about the content, there's probably not
 much to do here besides tweaking a few workshop-specific bits
-(location, dates, master-index, âÂ\80¦).  These changes should go into the
+(location, dates, master-index, â\80¦).  These changes should go into the
 workshop repository.
 
 If you plan to make significant (but not workshop specific)
@@ -72,4 +72,4 @@ Post-workshop archival
 ======================
 
 The workshop repositories are already on the SWC GitHub page, so
-there's nothing to do here.
\ No newline at end of file
+there's nothing to do here.