Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

[civicrm-core.git] / README.txt

diff --git a/README.txt b/README.txt
index 168c56d1e3d7a925f40739bec0aa062aabc9fe35..92c387413038127141675c165d2bcd81af2f4108 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,32 +1,33 @@
-************************
+*************************
 README file for CiviCRM
 *************************
-1. Who
-2. What
+1. About
+2. Installation
 3. Documentation
-4. Installation
-5. Support
-6. Developers
+4. Support
+5. Development
 
 
 
 *************************
-1. Who
+1. About
 *************************
 CiviCRM is a constituent relationship management system designed to
 meet the needs of advocacy, non-profit and non-governmental groups.
 It is an open source project, licensed under GNU AGPL 3, and
 coordinated by CiviCRM LLC. The project website is http://civicrm.org/
 
+CiviCRM is released as a module that runs within the Drupal, Joomla,
+and WordPress content management systems.
+
 
 *************************
-2. What
+2. Installation
 *************************
-CiviCRM is released as a module that runs within the Drupal, Joomla,
-and WordPress content management systems.
+The download URLs and installation instructions are available on our
+website:
 
-It can be downloaded from
-http://downloads.civicrm.org/
+http://civicrm.org/go/download
 
 
 *************************
@@ -40,26 +41,22 @@ Our main documentation site is the wiki at http://wiki.civicrm.org/
 
 
 *************************
-4. Installation
-*************************
-The main installation documentation is available on our documentation web site
-under the Install section:
-http://wiki.civicrm.org/confluence/display/CRMDOC/Installation+and+Upgrades
-
-
-*************************
-5. Support
+4. Support
 *************************
 All support is on the CiviCRM forums:
 http://forum.civicrm.org/
 
 
 *************************
-6. Developers
+5. Development
 *************************
 Developers are highly encouraged to join the CiviCRM forums and post
 questions and ideas on the Developer Discussion board:
 http://forum.civicrm.org/index.php/board,20.0.html
 
-You can check out the CiviCRM source from
-http://svn.civicrm.org/
+Installing the latest developmental code requires some special steps. Full
+instructions are on the wiki:
+http://wiki.civicrm.org/confluence/display/CRMDOC/Github+for+CiviCRM
+
+Report all issues to CiviCRM via JIRA:
+http://issues.civicrm.org