Merge lp:~jose/charms/precise/subway/add-icon-fix-readme into lp:charms/subway

Proposed by José Antonio Rey
Status: Merged
Merged at revision: 15
Proposed branch: lp:~jose/charms/precise/subway/add-icon-fix-readme
Merge into: lp:charms/subway
Diff against target: 112 lines (+44/-48)
3 files modified
README (+0/-48)
README.md (+42/-0)
metadata.yaml (+2/-0)
To merge this branch: bzr merge lp:~jose/charms/precise/subway/add-icon-fix-readme
Reviewer Review Type Date Requested Status
amir sanjar (community) Needs Resubmitting
charmers Pending
Review via email: mp+215989@code.launchpad.net

Description of the change

 * Added `applications` category
 * Reformatted README to Markdown

To post a comment you must log in.
Revision history for this message
amir sanjar (asanjar) wrote :

+1 .reviewed, looks good ..

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'README'
2--- README 2012-04-03 21:13:09 +0000
3+++ README 1970-01-01 00:00:00 +0000
4@@ -1,48 +0,0 @@
5-
6- _____ _
7-/ ___| | |
8-\ `--. _ _| |____ ____ _ _ _
9- `--. \ | | | '_ \ \ /\ / / _` | | | |
10-/\__/ / |_| | |_) \ V V / (_| | |_| |
11-\____/ \__,_|_.__/ \_/\_/ \__,_|\__, |
12- __/ |
13- Real Geeks Use Ascii |___/
14-
15-Purpose of Charm: This Charm is intended for a simple deployment of a Subway Web-Based IRC Client Cloud Instance.
16-
17-
18-Instructions for Charm:
19-------------------
20-
21-1. Deploy Subway Instance
22-
23- juju deploy subway
24-
25-2. Expose Subway
26-
27- juju expose subway
28-
29-3. Accessing Subway is as simple as going to:
30-
31- http://<your_server_address>:3000
32-
33- To find out the public address of subway, look for it in the output of the
34- `juju status` command.
35-
36-
37-About Subway
38-
39-Subway is a web-based IRC client with a multi-user backend and a JavaScript-heavy UI. Frontend/backend communication is
40-done with websockets (or best available fallback where not available).
41-The backend supports connection persistence and optional logging when the browser disconnects.
42-
43-About Charm Author
44-
45-This charm was authored by Ubuntu Member Benjamin Kerensa who has been a contributor to the Ubuntu Community for
46-a number of years more information on the author can be found at http://benjaminkerensa.com
47-
48-About Subway Author
49-
50-David Petersen is a Student Programmer at Oregon State University and also a member of the OSU LUG and more of his work can be found at https://github.com/thedjpetersen
51-
52-
53
54=== added file 'README.md'
55--- README.md 1970-01-01 00:00:00 +0000
56+++ README.md 2014-04-16 00:33:53 +0000
57@@ -0,0 +1,42 @@
58+# Overview
59+
60+This Charm is intended for a simple deployment of a Subway Web-Based IRC Client
61+Cloud Instance.
62+
63+# Usage
64+
65+Deploy Subway Instance
66+
67+ juju deploy subway
68+
69+Expose Subway
70+
71+ juju expose subway
72+
73+Accessing Subway is as simple as going to:
74+
75+ http://<your_server_address>:3000
76+
77+To find out the public address of subway, look for it in the output of the
78+`juju status` command.
79+
80+# About
81+
82+## Subway
83+
84+Subway is a web-based IRC client with a multi-user backend and a
85+JavaScript-heavy UI. Frontend/backend communication is done with websockets (or
86+best available fallback where not available). The backend supports connection
87+persistence and optional logging when the browser disconnects.
88+
89+## Charm Author
90+
91+This charm was authored by Ubuntu Member Benjamin Kerensa, who has been a
92+contributor to the Ubuntu Community for a number of years. More information on
93+the author can be found at http://benjaminkerensa.com
94+
95+## Subway Author
96+
97+David Petersen is a Student Programmer at Oregon State University and also a
98+member of the OSU LUG. More of his work can be found at [his GitHub profile](https://github.com/thedjpetersen)
99+
100
101=== modified file 'metadata.yaml'
102--- metadata.yaml 2012-05-30 08:03:33 +0000
103+++ metadata.yaml 2014-04-16 00:33:53 +0000
104@@ -7,6 +7,8 @@
105 done with websockets (or best available fallback where not available).
106 The backend supports connection persistence and optional
107 logging when the browser disconnects.
108+categories:
109+ - applications
110 provides:
111 subway:
112 interface: http

Subscribers

People subscribed via source and target branches

to all changes: