From 4e0e34c82c8b03ddf39d81815434f967eb9bc920 Mon Sep 17 00:00:00 2001 From: Vincent Davis Date: Wed, 20 Apr 2016 09:06:24 -0600 Subject: [PATCH 1/4] Correct link to wikipedia --- wiki/User_Matzke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/User_Matzke.md b/wiki/User_Matzke.md index c6b36fbee..2a1dd9db7 100644 --- a/wiki/User_Matzke.md +++ b/wiki/User_Matzke.md @@ -15,5 +15,5 @@ page](http://ib.berkeley.edu/people/students/person_detail.php?person=370) -- [Lab page](http://fisher.berkeley.edu/cteg/members/matzke.html). He has also done some other strange and interesting things. See -[1](http://en.wikipedia.org/wiki/Nick_Matzke%7Cwikipedia) and +[1](http://en.wikipedia.org/wiki/Nick_Matzke) and [2](http://www.google.com/search?hl=en&rlz=1B3GGGL_enUS239US239&q=evolution+matzke&btnG=Search%7Cgoogle). From a70826299ac763f718d8549ff9c908c12d3e95b1 Mon Sep 17 00:00:00 2001 From: Vincent Davis Date: Wed, 20 Apr 2016 09:11:51 -0600 Subject: [PATCH 2/4] updated link to point to David Kidd Postdoctoral Fellow page at NESCent --- wiki/Active_projects.md | 2 +- wiki/BioGeography.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wiki/Active_projects.md b/wiki/Active_projects.md index 9e94989ff..29ac0881e 100644 --- a/wiki/Active_projects.md +++ b/wiki/Active_projects.md @@ -64,7 +64,7 @@ See the project proposal at: [Biogeographical Phylogenetics for BioPython](http://socghop.appspot.com/student_project/show/google/gsoc2009/nescent/t124022798250). The mentors were [Stephen Smith](http://blackrim.org/) (primary), [Brad Chapman](http://bcbio.wordpress.com/), and [David -Kidd](http://evoviz.nescent.org/). The new module is documented on this +Kidd](https://www.nescent.org/science/awards_summary.php-id=59.html). The new module is documented on this wiki as [BioGeography](BioGeography "wikilink"). The code currently lives at the Bio/Geography directory of Nick's diff --git a/wiki/BioGeography.md b/wiki/BioGeography.md index 241f727d1..d19d459b4 100644 --- a/wiki/BioGeography.md +++ b/wiki/BioGeography.md @@ -16,7 +16,7 @@ See the project proposal at: [Biogeographical Phylogenetics for BioPython](http://socghop.appspot.com/student_project/show/google/gsoc2009/nescent/t124022798250). The mentors are [Stephen Smith](http://blackrim.org/) (primary), [Brad Chapman](http://bcbio.wordpress.com/), and [David -Kidd](http://evoviz.nescent.org/). The source code is in the +Kidd](https://www.nescent.org/science/awards_summary.php-id=59.html). The source code is in the Bio/Geography directory of the [Geography fork of the nmatzke branch on GitHub](http://github.com/nmatzke/biopython/tree/Geography), and you can see a timeline and other info about ongoing development of the module @@ -53,7 +53,7 @@ See the project proposal at: [Biogeographical Phylogenetics for BioPython](http://socghop.appspot.com/student_project/show/google/gsoc2009/nescent/t124022798250). The mentors are [Stephen Smith](http://blackrim.org/) (primary), [Brad Chapman](http://bcbio.wordpress.com/), and [David -Kidd](http://evoviz.nescent.org/). The source code is in the +Kidd](https://www.nescent.org/science/awards_summary.php-id=59.html). The source code is in the Bio/Geography directory of the [Geography fork of the nmatzke branch on GitHub](http://github.com/nmatzke/biopython/tree/Geography), and you can see a timeline and other info about ongoing development of the module From da6fd2253dd0f41791adbb2bd3685438b66ab8a3 Mon Sep 17 00:00:00 2001 From: Vincent Davis Date: Wed, 20 Apr 2016 09:22:38 -0600 Subject: [PATCH 3/4] Updated broken link and current bio and page for Nick Matzke --- wiki/User_Matzke.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wiki/User_Matzke.md b/wiki/User_Matzke.md index 2a1dd9db7..be9872dfb 100644 --- a/wiki/User_Matzke.md +++ b/wiki/User_Matzke.md @@ -9,10 +9,9 @@ Nick Matzke is working on the [Google/Phyloinformatics Summer of Code project "[Biogeographical Phylogenetics for BioPython](https://www.nescent.org/wg_phyloinformatics/Phyloinformatics_Summer_of_Code_2009#Biogeographical_Phylogenetics_for_BioPython)." -Nick is a Ph.D. candidate in the Department of Integrative Biology at -University of California, Berkeley. [Departmental -page](http://ib.berkeley.edu/people/students/person_detail.php?person=370) --- [Lab page](http://fisher.berkeley.edu/cteg/members/matzke.html). +Nicholas Matzke is currently a Discovery Early Career Researcher Award fellow in the Division of Evolution, Ecology, +and Genetics, Research School of Biology, at the Australian National University in Canberra, Australian Capital Territory. +[PhyloWiki](http://phylo.wikidot.com/nicholas-j-matzke) He has also done some other strange and interesting things. See [1](http://en.wikipedia.org/wiki/Nick_Matzke) and From a47b0c235196ad8007b40f76f4d0a787e74f4d01 Mon Sep 17 00:00:00 2001 From: Vincent Davis Date: Wed, 20 Apr 2016 09:26:20 -0600 Subject: [PATCH 4/4] Update installer information for windows version of git --- wiki/GitUsage.md | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/wiki/GitUsage.md b/wiki/GitUsage.md index f4a33b909..41768bec8 100644 --- a/wiki/GitUsage.md +++ b/wiki/GitUsage.md @@ -88,27 +88,8 @@ Download the `.dmg` disk image from ### Windows -Two options exist for Windows: -[msysGit](http://code.google.com/p/msysgit/) and running Git under -[Cygwin](http://www.cygwin.com/). - -#### msysGit (Recommended) - -[msysGit](http://code.google.com/p/msysgit/) is a port of Git that runs -natively on Windows via the MinGW library. Because Git was not -originally designed to run on Windows, and since this is a port, some -bugs exist, though are rarely encountered in everyday use of Git. See -their website for download and installation instructions. Additionally, -you can watch [Scott Chacon's screencast on installing msysGit on -Windows](http://gitcasts.com/posts/git-on-windows), and see [this GitHub -guide](http://github.com/guides/using-git-and-github-for-the-windows-for-newbies). - -#### Cygwin - -[Cygwin](http://www.cygwin.com/) provides a Linux-like environment for -Windows. It includes access to repositories of many software packages -available commonly in Linux distributions, including Git. You can find -the `git` package under the "devel" category. +Download the official installers from +[Windows installers](https://git-scm.com/download/win) Testing your git installation -----------------------------