diff --git a/docs/4.5-changelog.docx b/docs/4.5-changelog.docx deleted file mode 100644 index fdb16e74cd..0000000000 Binary files a/docs/4.5-changelog.docx and /dev/null differ diff --git a/docs/GettingStarted.txt b/docs/GettingStarted.txt deleted file mode 100644 index 3f8f2ef52c..0000000000 --- a/docs/GettingStarted.txt +++ /dev/null @@ -1,24 +0,0 @@ -Hi! Thanks for grabbing the Umbraco sourcecode. - -=========================================== -NOTE - DEFAULT BRANCH EMPTY - December 2010 -=========================================== - - -- With the help of CodePlex we have migrated much of our previous changesets (as of Dec 13th 2010) from TFS to Mercurial. - -- However, not everything could be migrated to our new branching workflow. So for each nominal group of 4.x changes, we've created named branches. For upcoming 5.x changesets, we'll adhere to our new workflow which we'll describe on the Wiki for contributors. - -- FOR THE MOMENT, the 'default' branch is empty - pending the addition of the 5.0 changesets - -- To switch to the codebase on which you want to work, 'hg update' to the named branch (e.g. "4.6.0") or tag (e.g. "Release-4.5.2") and browse or work from that point. - - -Thanks to Matt Hawley at CodePlex for his help in our migration! - -Cheers, -The Umbraco Team - -http://umbraco.org -http://our.umbraco.org -http://umbraco.codeplex.com \ No newline at end of file diff --git a/docs/README.txt b/docs/README.txt index 6fb37d5510..7321809543 100644 --- a/docs/README.txt +++ b/docs/README.txt @@ -1,9 +1,33 @@ -!! Umbraco - the simple, flexible and friendly ASP.NET CMS +Umbraco - the simple, flexible and friendly ASP.NET CMS +======================================================= For the first time on the Microsoft platform a free user and developer friendly cms that makes it quick and easy to create websites - or a breeze to build complex web applications. umbraco got award-winning integration capabilities and supports your ASP.NET User and Custom Controls out of the box. It's a developers dream and your users will love it too. Used by more than 57.000 active websites including Heinz.com, Peugeot.com, NAIAS.com and Microsofts documentinteropinitiative.org website you can be sure that the technology is proven, stable and scales. -[url:More info at http://umbraco.org|http://umbraco.org] -!! Forums -We have a forum running on [url:http://our.umbraco.org]. The discussions area on CodePlex will be for discussions on developing the core, and not on Umbraco-implementations or extensions in general. For those topics, please use [url:http://our.umbraco.org]. +More info at http://umbraco.com -!! Submitting Issues -Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [url:online guide|http://our.umbraco.org/wiki/how-tos/submitting-bug-reports]. \ No newline at end of file +Exploring the repository +======================== +Most contributors will work on their own fork and should pick the branch in which they need their fix. For more information see: +http://our.umbraco.org/contribute/guidelines-for-core-contribution + +Exploring the source +==================== +The Umbraco source code is never required for you to start building sites. If you are not using the source code for debugging purposes or to contribute to the source then please download the binaries listed at http://umbraco.codeplex.com + +With that said, the Umbraco solution can be opened in Visual Studio 2010 with SP1 installed or Visual Studio 2012. + +Contributing +============ +Umbraco is Open Source which means you can contribute to make it great! +Read all about it at http://our.umbraco.org/contribute + +Forums +====== +We have a forum running on http://our.umbraco.org for friendly community support. + +Documentation +============= +Our documentation section provides help on installing and using Umbraco including API reference documentation: http://our.umbraco.org/documentation + +Submitting Issues +================= +Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our online guide at http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature \ No newline at end of file diff --git a/src/umbraco.sln b/src/umbraco.sln index bef6a9b625..39f88078b6 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -1,7 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0242771-6DE6-4E03-BD3A-7B79BA79105B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" ProjectSection(SolutionItems) = preProject ..\build\Build.bat = ..\build\Build.bat @@ -12,12 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}" ProjectSection(SolutionItems) = preProject - ..\docs\4.5-changelog.docx = ..\docs\4.5-changelog.docx - ..\docs\GettingStarted.txt = ..\docs\GettingStarted.txt ..\docs\IronPython License.Rtf = ..\docs\IronPython License.Rtf ..\docs\License.txt = ..\docs\License.txt ..\docs\README.txt = ..\docs\README.txt - ..\docs\ReleaseNotes.txt = ..\docs\ReleaseNotes.txt EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"