From 8f124cf1e096d75996265af8018b36da4c6babc5 Mon Sep 17 00:00:00 2001 From: Hassan Khan Date: Fri, 15 Nov 2013 18:10:43 +0000 Subject: [PATCH] Updated README.md Updated composer.json to fix issues when installing from Composer --- README.md | 10 +++++----- composer.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c23129b..b645363 100644 --- a/README.md +++ b/README.md @@ -6,20 +6,20 @@ Master: [![Build Status](https://travis-ci.org/hassankhan/Zepto.png?branch=maste [![Coverage Status](https://coveralls.io/repos/hassankhan/Zepto/badge.png)](https://coveralls.io/r/hassankhan/Zepto) -Zepto is a stupidly simple, blazing fast, flat-file CMS based on [Pico](http://pico.dev7studios.com) and loosely based on [Slim](http://slimframework.com/). +Zepto is a stupidly simple, blazing fast, flat-file CMS based on [Pico](http://pico.dev7studios.com). -Zepto is a flat file CMS - this means there is no administration backend and database to deal with. You simply create ``.md`` files in the "content" folder and that becomes a page. +Zepto is a flat-file CMS - this means there is no administration backend and database to deal with. You simply create ``.md`` files in the "content" folder and that becomes a page. Its interface is _supposed_ to be simple and is in process of documentation. Thank you for choosing Zepto for your next project. ## Features * Uses Markdown for content -* Powerful(ish) router +* Uses a powerful(ish) [Slim](http://slimframework.com/)/[Silex](http://silex.sensiolabs.org/)-style router * Standard and custom HTTP methods * Route parameters with wildcards and conditions -* Resource Locator and DI container -* Template rendering +* Dependency injection container using [Pimple]() +* Template rendering using [Twig]() * HTTP caching * Error handling and debugging * Application hooks and extensible components for extending functionality diff --git a/composer.json b/composer.json index 5dff2f8..f841594 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ "homepage": "https://github.com/hassankhan/Zepto", "require": { "php": ">=5.3", - "twig/twig": "dev-master", + "twig/twig": "1.15.*@dev", "erusev/parsedown": "dev-master", - "pimple/pimple": "dev-master" + "pimple/pimple": "2.0.*@dev" }, "require-dev": { "filp/whoops": "1.*",