From 5796ed225e0cd48693fc39723c764133f3072f2e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 17 May 2013 00:35:28 +0200 Subject: [PATCH] Updated github path --- README.md | 2 +- docs/en/installation/from-source.md | 6 +++--- docs/en/misc/contributing.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 44920ab33..30d9e7230 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # SilverStripe Framework (a.k.a "sapphire") -[![Build Status](https://secure.travis-ci.org/silverstripe/sapphire.png?branch=2.4)](https://travis-ci.org/silverstripe/sapphire) \ No newline at end of file +[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-framework.png?branch=2.4)](https://travis-ci.org/silverstripe/silverstripe-framework) \ No newline at end of file diff --git a/docs/en/installation/from-source.md b/docs/en/installation/from-source.md index 38258c7f3..2a41303ad 100644 --- a/docs/en/installation/from-source.md +++ b/docs/en/installation/from-source.md @@ -24,7 +24,7 @@ See [frequently asked questions](/installation/from-source#frequently-asked-ques SilverStripe core is currently hosted on [github.com/silverstripe](http://github.com/silverstripe). The core consists of four parts: * The `installer` project ([github.com/silverstripe/silverstripe-installer](http://github.com/silverstripe/silverstripe-installer)) - * The `sapphire` module ([github.com/silverstripe/sapphire](http://github.com/silverstripe/sapphire)) + * The `sapphire` module ([github.com/silverstripe/silverstripe-framework](http://github.com/silverstripe/silverstripe-framework)) * The `cms` module ([github.com/silverstripe/silverstripe-cms](http://github.com/silverstripe/silverstripe-cms)) * A sample theme called `blackcandy` ([github.com/silverstripe-themes/silverstripe-blackcandy](http://github.com/silverstripe-themes/silverstripe-blackcandy)) @@ -147,7 +147,7 @@ Please replace `` below with your github username. git clone git@github.com:/silverstripe-installer.git my-silverstripe-project cd my-silverstripe-project - git clone git@github.com:/sapphire.git sapphire + git clone git@github.com:/silverstripe-framework.git sapphire git clone git@github.com:/silverstripe-cms.git cms git clone git@github.com:/silverstripe-blackcandy.git themes/blackcandy @@ -155,7 +155,7 @@ Now you need to add the original repository as `upstream`, so you can keep your cd my-silverstripe-project (git remote add upstream git://github.com/silverstripe/silverstripe-installer.git && git fetch upstream) - (cd sapphire && git remote add upstream git://github.com/silverstripe/sapphire.git && git fetch upstream) + (cd sapphire && git remote add upstream git://github.com/silverstripe/silverstripe-framework.git && git fetch upstream) (cd cms && git remote add upstream git://github.com/silverstripe/silverstripe-cms.git && git fetch upstream) (cd themes/blackcandy && git remote add upstream git://github.com/silverstripe-themes/silverstripe-blackcandy.git) diff --git a/docs/en/misc/contributing.md b/docs/en/misc/contributing.md index 595729619..14682887e 100644 --- a/docs/en/misc/contributing.md +++ b/docs/en/misc/contributing.md @@ -64,7 +64,7 @@ Now you have two choices: Smaller fixes (e.g. typos) can be edited directly in t The module authors will get notified automatically, review your patch, and merge it back as appropriate. For new features, we recommend creating a ["feature branch"](http://progit.org/book/ch3-3.html) rather than a really big patch. -On github, you can review outstanding [sapphire pull requests](https://github.com/silverstripe/sapphire/pulls) and [cms pull requests](https://github.com/silverstripe/silverstripe-cms/pulls)). +On github, you can review outstanding [sapphire pull requests](https://github.com/silverstripe/silverstripe-framework/pulls) and [cms pull requests](https://github.com/silverstripe/silverstripe-cms/pulls)). If you want to learn more about git, please have a look at the [free online git book](http://progit.org/book/) and the [git crash course](http://gitref.org/). @@ -160,7 +160,7 @@ Modifying documentation requires basic [PHPDoc](http://en.wikipedia.org/wiki/PHP If you have downloaded SilverStripe or a module, chances are that you already have the documentation files - they are kept alongside the source code (in the `docs/` subfolder). -In general, you have to "[fork](http://help.github.com/forking/)" the [github.com/silverstripe/sapphire](http://github.com/silverstripe/sapphire) +In general, you have to "[fork](http://help.github.com/forking/)" the [github.com/silverstripe/silverstripe-framework](http://github.com/silverstripe/silverstripe-framework) and [github.com/silverstripe/silverstripe-cms](http://github.com/silverstripe/silverstripe-cms) repositories and send us "[pull requests](http://help.github.com/pull-requests/)". Note: Smaller edits can be performed in the github.com web interface on your fork,