Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Misc text updates #140

Merged
merged 1 commit into from
Oct 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MYSQL_IMAGE=mariadb:10.0
SELENIUM_IMAGE=selenium/standalone-firefox
REDIS_IMAGE=redis

# App image name for use if you inted to push it to docker registry/hub.
# App image name for use if you intend to push it to docker registry/hub.
APP_PROD_IMAGE=my-ez-app
APP_DOCKER_FILE=Dockerfile

Expand Down
4 changes: 2 additions & 2 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COPYRIGHT NOTICE: Copyright (C) 1999-2015 eZ Systems AS
COPYRIGHT NOTICE: Copyright (C) 1999-2016 eZ Systems AS
SOFTWARE LICENSE: GNU General Public License v2.0
NOTICE: >
This program is free software; you can redistribute it and/or
Expand All @@ -13,4 +13,4 @@ NOTICE: >
You should have received a copy of version 2.0 of the GNU General
Public License along with this program; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
MA 02110-1301, USA.
2 changes: 2 additions & 0 deletions GETTING_STARTED.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Getting started on eZ Platform

https://doc.ez.no/display/DEVELOPER/Get+Started+with+eZ+Platform

eZ Platform is built on top of **Symfony2 full stack framework** (version **2.x**), and as such all guidelines,
requirements and best practices remain the same.

Expand Down
13 changes: 8 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Installation instructions

NOTE: *For simplified installation, see our Docker Tools Beta instructions in [doc/docker-compose/README.md](https://github.com/ezsystems/ezplatform/blob/master/doc/docker-compose/README.md).
By using those instructions you won't have to setup mysql, php, and nginx yourself, and almost all steps below are done for you.*
By using those instructions you won't have to setup mysql, php, and nginx yourself, and almost all of the steps described below are done for you.*

These installation instructions are kept current in the online docs here:
https://doc.ez.no/display/DEVELOPER/Step+1%3A+Installation


## Terms for future reference:
* `/<root-dir>/`: The filesystem path where eZ Platform is installed in.
Expand All @@ -14,9 +18,8 @@ By using those instructions you won't have to setup mysql, php, and nginx yourse
*a database server* needed for this software. For further information on requirements [see online doc](https://doc.ez.no/display/TECHDOC/Requirements)

**Before you start**:
- Create Database: Installation will ask you for credentials/details for which database to use, example with mysql:
`CREATE DATABASE <database> CHARACTER SET utf8;` *Note: Right now installer only supports MySQL and MariaDB, Postgres
support will be (re)added in one of the upcoming releases.*
- Create Database: Installation will ask you for credentials/details for which database to use, example with mysql:
`CREATE DATABASE <database> CHARACTER SET utf8;` *Note: Right now installer only supports MySQL and MariaDB, Postgres support will be (re)added in one of the upcoming releases.*
- Set php.ini memory_limit=256M before running commands below
- *Optional:* You can also setup Solr to be used by eZ Platform and take note of the url it is accessible on

Expand Down Expand Up @@ -45,7 +48,7 @@ By using those instructions you won't have to setup mysql, php, and nginx yourse

B. **Install via Composer**

You can get eZ Platform using composer with the following commands:
You can get eZ Platform using Composer with the following commands:

*Note: composer will take its time to download all libraries and when done you will be asked to fill in some settings, including database settings.*

Expand Down
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# eZ Platform

## What is eZ Platform ?
*eZ Platform* is a 100% open source professional CMS (Content Management System) developed by eZ Systems AS and the eZ Community.
*eZ Platform* is a 100% open source professional CMS (Content Management System) developed by eZ Systems and the eZ Community.

*eZ Platform* is the 6th generation of *eZ Publish*, it is built on top of the Symfony framework (Full Stack).
It has been in development since 2011, and integral part of the *eZ Publish Platform 5.x* as "Platform stack" since 2012.
Expand Down Expand Up @@ -35,8 +35,7 @@ The [eZ Publish 5](https://github.com/ezsystems/ezpublish-community) repository,
- **PlatformUIBundle**: A modern, extensible "Backend" UI for managing content & administering the site

### Further information:
eZ Platform is 100% open source and is released as companion to a commercial *eZ Studio* software which adds advanced
features for editorial teams and media companies, 100% built on top of *eZ Platform* APIs.
eZ Platform is 100% open source and is the foundation for the commercial *eZ Enterprise* software which adds advanced features for editorial teams and media companies, 100% built on top of *eZ Platform* APIs.

- eZ Platform Developer Hub: [ezplatform.com](https://ezplatform.com/)
- [eZ Studio and eZ Platform RoadMap](http://doc.ez.no/roadmap)
Expand All @@ -63,17 +62,16 @@ If you discover a security issue, please see how to responsibly report such issu
For instruction on how to run the functional tests, see [RUNNING_BEHAT.md](https://github.com/ezsystems/ezplatform/blob/master/RUNNING_BEHAT.md).

## Backwards compatibility
eZ Platform aiming to be **100% content compatible** with eZ Publish 5.x, 4.x and 3.x *(introduced in 2002)*, meaning
that content in those versions of the CMS can be upgraded using
eZ Platform aims to be **100% content compatible** with eZ Publish 5.x, 4.x and 3.x *(introduced in 2002)*, meaning that content in those versions of the CMS can be upgraded using
[online documentation](http://doc.ez.no/eZ-Publish/Upgrading) to eZ Platform.

Unlike eZ Publish Platform 5.x, eZ Platform does not ship with eZ Publish Legacy (4.x). For Platform kernel use combined
with legacy, eZ Publish Platform 5.4 is the most stable choice, offering support and maintenance updates until 2021.
Alternative is releases of eZ Publish Community, latest as of Oct 2015 is v2014.11 found at
Unlike eZ Publish Platform 5.x, eZ Platform does not ship with eZ Publish Legacy (4.x). For Platform kernel use combined with legacy, eZ Publish Platform 5.4 is the most stable choice, offering support and maintenance updates until 2021.

An alternative is releases of eZ Publish Community; the latest as of Oct 2015 is v2014.11, found at
[ezpublish-community](https://github.com/ezsystems/ezpublish-community).

## COPYRIGHT
Copyright (C) 1999-2015 eZ Systems AS. All rights reserved.
Copyright (C) 1999-2016 eZ Systems AS. All rights reserved.

## LICENSE
http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
5 changes: 4 additions & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Upgrade instructions

For upgrade procedures, please go to our online documentation:
Please visit our online documentation for instructions:
https://doc.ez.no/display/DEVELOPER/Updating+eZ+Platform

For legacy upgrade procedures, please go to our legacy documentation:
* Go to https://doc.ez.no/display/MAIN
* Click on the version you have
* Go to "Installation and Upgrade Guides"
Expand Down