Register warning and error flash types

[rails.git] / README.md

diff --git a/README.md b/README.md
index 9162a38de691c33a979bfa68938c9bebb339fe50..81b8ce7bf6edea94cffd08b203083e6f224a43e5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ The software is also known as "openstreetmap-website".
 
 This repository consists of:
 
 
 This repository consists of:
 

-* The web site, including user accounts, diary entries, user-to-user messaging
-* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6)
-* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors
-* The Browse pages - a web front-end to the OpenStreetMap data
+* The web site, including user accounts, diary entries, user-to-user messaging.
+* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6).
+* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors.
+* The Browse pages - a web front-end to the OpenStreetMap data.

 * The GPX uploads, browsing and API.
 
 A fully-functional Rails Port installation depends on other services, including map tile
 * The GPX uploads, browsing and API.
 
 A fully-functional Rails Port installation depends on other services, including map tile


@@ -27,15 +27,15 @@ a copy of which can be found in the [LICENSE](LICENSE) file.
 # Installation
 
 The Rails Port is a Ruby on Rails application that uses PostgreSQL as its database, and has a large
 # Installation
 
 The Rails Port is a Ruby on Rails application that uses PostgreSQL as its database, and has a large

-number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md)
+number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md).

 
 # Development
 
 We're always keen to have more developers! Pull requests are very welcome.
 
 * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues).
 
 # Development
 
 We're always keen to have more developers! Pull requests are very welcome.
 
 * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues).

-* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components
-* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap)
+* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components.
+* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap).

 * There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.
 * IRC - there is the #osm-dev channel on irc.oftc.net.
 
 * There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.
 * IRC - there is the #osm-dev channel on irc.oftc.net.