From 137371aeedead21b61e26796a9174b13c4a49185 Mon Sep 17 00:00:00 2001 From: Spencer Nelson Date: Tue, 22 Dec 2015 09:53:20 -0500 Subject: [PATCH 1/5] docs/what: minor grammatical and copyediting fixes --- content/docs/what/contents.lr | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/content/docs/what/contents.lr b/content/docs/what/contents.lr index bf61628a..4b916bc6 100644 --- a/content/docs/what/contents.lr +++ b/content/docs/what/contents.lr @@ -6,8 +6,8 @@ sort_key: 20 --- body: -When it comes to creating websites, there is a ludicrous amount of tools available. -They range from full blown content management solutions like Drupal over +When it comes to creating websites, there is a ludicrous number of tools available. +They range from full-blown content management solutions like Drupal to desktop solutions like Google Web Designer to Cloud Hosted Website solutions like WIX to more programmer focused approaches like Jekyll which generate websites out of templates and markdown files. @@ -17,31 +17,31 @@ websites out of templates and markdown files. ## Lektor is Static Lektor learned from the huge range of static file generators like Jekyll, -Pelican, Hugo, Middleman and many more about the values of generating a +Pelican, Hugo, Middleman and many more about the value of generating a completely static website. This means that unlike WordPress or similar solutions it does not run on a server, but your local computer (or a build -server) and generates out static HTML that can be uploaded to any web server -or content distribution platform like S3 with CloudFront. +server), and generates static HTML that can be uploaded to any web server or +content distribution platform like S3 with CloudFront. Why go static? Because the vast, vast majority of websites will be read many -more times than they will update. This is crucial because dynamic does not -come for free. It needs server resources and because program code is running -there it needs to be kept up to date for to ensure there are no security -problems that are left unpatched. Also when a website gets a sudden spike -of traffic a static website will stay up for longer on the same server than -a dynamic one that needs to execute code. +more times than they will be updated. This is crucial because dynamic content +does not come for free. It needs server resources and because program code is +running there it needs to be kept up to date for to ensure there are no security +problems that are left unpatched. Also when a website gets a sudden spike of +traffic a static website will stay up for longer on the same server than a +dynamic one that needs to execute code. -Sure, there are some things you cannot do on a static website, but those +Sure, there are some things you cannot do on a static website, but those are not things you would not use Lektor for. For small dynamic sections, JavaScript -and pairing up with other services is a good solution. +paired up with other services is a good solution. ## Lektor is a CMS -However Lektor also takes from content management systems like WordPress -and provides a flexible browser based admin interface from which you can -edit your website's contents. Unlike traditional CMS solutions however it +However, Lektor also takes from content management systems like WordPress +and provides a flexible browser-based admin interface from which you can +edit your website's contents. Unlike traditional CMS solutions, however, it runs entirely on your own computer. This means you can give a Lektor website to people that have no understanding @@ -51,7 +51,7 @@ of programming and they can still modify the content and update the website. ## Lektor is a Framework -Lastly however Lektor learns from experience in writing web frameworks. Lektor +Lastly, Lektor learns from experience in writing web frameworks. Lektor is much more than a website generator because it is based on a very flexible internal flat file database which can be used to model any website content. Unlike static blog generators which are based on some markdown content and From 510b9ed7697bc7f9181019c2b2eec240f32b08b8 Mon Sep 17 00:00:00 2001 From: Spencer Nelson Date: Tue, 22 Dec 2015 09:56:22 -0500 Subject: [PATCH 2/5] docs/installation: minor grammatical and copyediting fixes --- content/docs/installation/contents.lr | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/docs/installation/contents.lr b/content/docs/installation/contents.lr index cc9787f6..fb8fd6fe 100644 --- a/content/docs/installation/contents.lr +++ b/content/docs/installation/contents.lr @@ -6,10 +6,10 @@ sort_key: 50 --- body: -Lektor comes in two flavors: the command line executable as well as as a -desktop application. The desktop version also contains the command line -executable however it bundles together all dependencies of Lektor in an -easy to use package which heavily simplifies installation. +Lektor comes in two flavors: as a command line executable and as a +desktop application. The desktop version also contains the command +line executable, but it also bundles together all dependencies of Lektor +in an easy to use package which heavily simplifies installation. ## Desktop Application @@ -24,9 +24,9 @@ and then click on *Lektor ➤ Install Shell Command*. ## Command Line Application -If you do not want to install the desktop app you can just install the command -line executable. This one runs on more operating systems (OSX, Linux and -Windows) but the installation is a bit more involved. +If you do not want to install the desktop app then you can just install the command +line executable. This runs on more operating systems (OSX, Linux and Windows) but +the installation is a bit more involved. You need to make sure you have the following software installed on your computer: @@ -36,7 +36,7 @@ You need to make sure you have the following software installed on your computer install imagemagick`, which requires [chocolatey :ext](https://chocolatey.org/), or [download from here :ext](http://www.imagemagick.org)). -Once you have that installed and made sure that they are on your `PATH` you can +Once you have those installed and have made sure that they are on your `PATH`, you can get Lektor installed with our installation script: ``` From 65a19975c1422177bd524675ec28cfe88fa0dafc Mon Sep 17 00:00:00 2001 From: Spencer Nelson Date: Tue, 22 Dec 2015 10:01:10 -0500 Subject: [PATCH 3/5] docs/quickstart: minor grammatical and copyediting fixes --- content/docs/quickstart/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/quickstart/contents.lr b/content/docs/quickstart/contents.lr index cd4a3d1b..0dbe2bb4 100644 --- a/content/docs/quickstart/contents.lr +++ b/content/docs/quickstart/contents.lr @@ -50,7 +50,7 @@ $ lektor server ``` This will automatically start the server and you can navigate to -[localhost:5000](http://localhost:5000/) go open the project. +[localhost:5000](http://localhost:5000/) open the project. You can keep the server running, it will automatically rebuild your files as they change. From 1121f945228e78083cb673d3c420cf991cd9b670 Mon Sep 17 00:00:00 2001 From: Spencer Nelson Date: Tue, 22 Dec 2015 10:12:36 -0500 Subject: [PATCH 4/5] docs/project: fix typo --- content/docs/project/structure/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/project/structure/contents.lr b/content/docs/project/structure/contents.lr index 4b139f9c..645dd5c6 100644 --- a/content/docs/project/structure/contents.lr +++ b/content/docs/project/structure/contents.lr @@ -87,7 +87,7 @@ but are contained within a field of a model. ### `packages/` For local plugin development the `packages/` folder can be used. Any plugin -stored in there is automatically actviated in the system. +stored in there is automatically activated in the system. ### `configs/` From a19f646838e23ac01387ee0266ca9d7e3059d559 Mon Sep 17 00:00:00 2001 From: Spencer Nelson Date: Tue, 22 Dec 2015 10:18:18 -0500 Subject: [PATCH 5/5] docs/plugins/list: inofficial -> unofficial --- content/docs/plugins/list/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/plugins/list/contents.lr b/content/docs/plugins/list/contents.lr index 8dcbb78d..69ce7056 100644 --- a/content/docs/plugins/list/contents.lr +++ b/content/docs/plugins/list/contents.lr @@ -18,9 +18,9 @@ project: * [webpack-support :ext](https://github.com/lektor/lektor-webpack-support): adds support for building websites with webpack. -## Inofficial +## Unofficial -There are currently no inofficial plugins listed here, but if you have some +There are currently no unofficial plugins listed here, but if you have some you can [edit this page on github :ext](https://github.com/lektor/lektor-website/edit/master/content/docs/plugins/list/contents.lr) and send a pull request.