From 5b53fda9b0d9a6afecd176fb53eb7f3de47ac5c8 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sat, 2 Apr 2022 00:39:04 -0400 Subject: [PATCH] docs: README formatting tweaks --- README.md | 264 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index 990ddbf14..bd7052e0a 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,79 @@ -# A real-time collaborative editor for the web +# Etherpad: A real-time collaborative editor for the web ![Demo Etherpad Animated Jif](doc/images/etherpad_demo.gif "Etherpad in action") -# About -Etherpad is a real-time collaborative editor [scalable to thousands of simultaneous real time users](http://scale.etherpad.org/). It provides [full data export](https://github.com/ether/etherpad-lite/wiki/Understanding-Etherpad's-Full-Data-Export-capabilities) capabilities, and runs on _your_ server, under _your_ control. +## About -# Try it out -Etherpad is extremely flexible providing you the means to modify it to solve whatever problem your community has. We provide some demo instances for you try different experiences available within Etherpad. Pad content is automatically removed after 24 hours. +Etherpad is a real-time collaborative editor [scalable to thousands of +simultaneous real time users](http://scale.etherpad.org/). It provides [full +data +export](https://github.com/ether/etherpad-lite/wiki/Understanding-Etherpad's-Full-Data-Export-capabilities) +capabilities, and runs on _your_ server, under _your_ control. -* [Rich Editing](https://rich.etherpad.com) - A full rich text WYSIWYG editor. -* [Minimalist editor](https://minimalist.etherpad.com) - A minimalist editor that can be embedded within your tool. -* [Dark Mode](https://dark.etherpad.com) - Theme settings to have Etherpad start in dark mode, ideal for using Etherpad at night or for long durations. -* [Images](https://image.etherpad.com) - Plugins to improve provide Image support within a pad. -* [Video Chat](https://video.etherpad.com) - Plugins to enable Video and Audio chat in a pad. -* [Collaboration++](https://collab.etherpad.com) - Plugins to improve the really-real time collaboration experience, suitable for busy pads. -* [Document Analysis](https://analysis.etherpad.com) - Plugins to improve author and document analysis during and post creation. -* [Scale](https://shard.etherpad.com) - Etherpad running at scale with pad sharding which allows Etherpad to scale to ∞ number of Active Pads with up to ~20,000 edits per second, per pad. +## Try it out -# Project Status +Etherpad is extremely flexible providing you the means to modify it to solve +whatever problem your community has. We provide some demo instances for you try +different experiences available within Etherpad. Pad content is automatically +removed after 24 hours. + + * [Rich Editing](https://rich.etherpad.com) - A full rich text WYSIWYG editor. + * [Minimalist editor](https://minimalist.etherpad.com) - A minimalist editor + that can be embedded within your tool. + * [Dark Mode](https://dark.etherpad.com) - Theme settings to have Etherpad + start in dark mode, ideal for using Etherpad at night or for long durations. + * [Images](https://image.etherpad.com) - Plugins to improve provide Image + support within a pad. + * [Video Chat](https://video.etherpad.com) - Plugins to enable Video and Audio + chat in a pad. + * [Collaboration++](https://collab.etherpad.com) - Plugins to improve the + really-real time collaboration experience, suitable for busy pads. + * [Document Analysis](https://analysis.etherpad.com) - Plugins to improve + author and document analysis during and post creation. + * [Scale](https://shard.etherpad.com) - Etherpad running at scale with pad + sharding which allows Etherpad to scale to ∞ number of Active Pads with up + to ~20,000 edits per second, per pad. + +## Project Status ### Code Quality -[![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml) [![Total alerts](https://img.shields.io/lgtm/alerts/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/alerts/) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/context:javascript) [![package.lock](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml) + +[![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml) +[![Total alerts](https://img.shields.io/lgtm/alerts/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/alerts/) +[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/context:javascript) +[![package.lock](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml) ### Testing -[![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml) [![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml) [![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml) [![Windows Zip](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml) [![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml) -[![Frontend admin tests powered by Sauce Labs](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) [![Frontend tests powered by Sauce Labs](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml) [![Sauce Test Status](https://saucelabs.com/buildstatus/etherpad.svg)](https://saucelabs.com/u/etherpad) [![Windows Installer](https://github.com/ether/etherpad-lite/actions/workflows/windows-installer.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-installer.yml) + +[![Backend tests](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/backend-tests.yml) +[![Simulated Load](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/load-test.yml) +[![Rate Limit](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/rate-limit.yml) +[![Windows Zip](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-zip.yml) +[![Docker file](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/dockerfile.yml) +[![Frontend admin tests powered by Sauce Labs](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-admin-tests.yml) +[![Frontend tests powered by Sauce Labs](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/frontend-tests.yml) +[![Sauce Test Status](https://saucelabs.com/buildstatus/etherpad.svg)](https://saucelabs.com/u/etherpad) +[![Windows Installer](https://github.com/ether/etherpad-lite/actions/workflows/windows-installer.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/windows-installer.yml) ### Engagement -Docker Pulls [![Discord](https://img.shields.io/discord/741309013593030667?color=%2344b492)](https://discord.com/invite/daEjfhw) [![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json&color=%2344b492 "Etherpad plugins")](https://static.etherpad.org/index.html) ![Languages](https://img.shields.io/static/v1?label=Languages&message=105&color=%2344b492) ![Translation Coverage](https://img.shields.io/static/v1?label=Languages&message=98%&color=%2344b492) -# Installation +[![Docker Pulls](https://img.shields.io/docker/pulls/etherpad/etherpad?color=%2344b492)](https://hub.docker.com/r/etherpad/etherpad) +[![Discord](https://img.shields.io/discord/741309013593030667?color=%2344b492)](https://discord.com/invite/daEjfhw) +[![Etherpad plugins](https://img.shields.io/endpoint?url=https%3A%2F%2Fstatic.etherpad.org%2Fshields.json&color=%2344b492 "Etherpad plugins")](https://static.etherpad.org/index.html) +![Languages](https://img.shields.io/static/v1?label=Languages&message=105&color=%2344b492) +![Translation Coverage](https://img.shields.io/static/v1?label=Languages&message=98%&color=%2344b492) -## Requirements -- [Node.js](https://nodejs.org/) >= **12.17.0**. +## Installation -## GNU/Linux and other UNIX-like systems +### Requirements -### Quick install on Debian/Ubuntu -``` +[Node.js](https://nodejs.org/) >= **12.17.0**. + +### GNU/Linux and other UNIX-like systems + +#### Quick install on Debian/Ubuntu + +```sh curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - sudo apt install -y nodejs git clone --branch master https://github.com/ether/etherpad-lite.git && @@ -45,7 +81,7 @@ cd etherpad-lite && src/bin/run.sh ``` -### Manual install +#### Manual install You'll need Git and [Node.js](https://nodejs.org/) installed. @@ -61,90 +97,115 @@ You'll need Git and [Node.js](https://nodejs.org/) installed. To update to the latest released version, execute `git pull origin`. The next start with `src/bin/run.sh` will update the dependencies. -[Next steps](#next-steps). +### Windows -## Windows +#### Prebuilt Windows package -### Prebuilt Windows package -This package runs on any Windows machine. You can perform a manual installation via git for development purposes, but as this uses symlinks which performs unreliably on Windows, please stick to the prebuilt package if possible. +This package runs on any Windows machine. You can perform a manual installation +via git for development purposes, but as this uses symlinks which performs +unreliably on Windows, please stick to the prebuilt package if possible. -1. [Download the latest Windows package](https://etherpad.org/#download) -2. Extract the folder + 1. [Download the latest Windows package](https://etherpad.org/#download) + 2. Extract the folder -Run `start.bat` and open in your browser. You like it? [Next steps](#next-steps). +Run `start.bat` and open in your browser. -### Manually install on Windows -You'll need [node.js](https://nodejs.org) and (optionally, though recommended) git. +#### Manually install on Windows -1. Grab the source, either - - download - - or `git clone --branch master https://github.com/ether/etherpad-lite.git` -2. With a "Run as administrator" command prompt execute - `src\bin\installOnWindows.bat` +You'll need [Node.js](https://nodejs.org) and (optionally, though recommended) +git. -Now, run `start.bat` and open in your browser. + 1. Grab the source, either: + * download + * or `git clone --branch master + https://github.com/ether/etherpad-lite.git` + 2. With a "Run as administrator" command prompt execute + `src\bin\installOnWindows.bat` + +Now, run `start.bat` and open http://localhost:9001 in your browser. Update to the latest version with `git pull origin`, then run `src\bin\installOnWindows.bat`, again. -If cloning to a subdirectory within another project, you may need to do the following: +If cloning to a subdirectory within another project, you may need to do the +following: -1. Start the server manually (e.g. `node src/node/server.js`) -2. Edit the db `filename` in `settings.json` to the relative directory with the file (e.g. `application/lib/etherpad-lite/var/dirty.db`) -3. Add auto-generated files to the main project `.gitignore` + 1. Start the server manually (e.g. `node src/node/server.js`) + 2. Edit the db `filename` in `settings.json` to the relative directory with + the file (e.g. `application/lib/etherpad-lite/var/dirty.db`) + 3. Add auto-generated files to the main project `.gitignore` -## Docker container +### Docker container Find [here](doc/docker.md) information on running Etherpad in a container. -# Next Steps +## Next Steps -## Tweak the settings -You can modify the settings in `settings.json`. -If you need to handle multiple settings files, you can pass the path to a -settings file to `src/bin/run.sh` using the `-s|--settings` option: this allows -you to run multiple Etherpad instances from the same installation. -Similarly, `--credentials` can be used to give a settings override file, `--apikey` to give a different APIKEY.txt file and `--sessionkey` to give a non-default SESSIONKEY.txt. -**Each configuration parameter can also be set via an environment variable**, using the syntax `"${ENV_VAR}"` or `"${ENV_VAR:default_value}"`. For details, refer to `settings.json.template`. -Once you have access to your `/admin` section settings can be modified through the web browser. +### Tweak the settings -If you are planning to use Etherpad in a production environment, you should use a dedicated database such as `mysql`, since the `dirtyDB` database driver is only for testing and/or development purposes. +You can modify the settings in `settings.json`. If you need to handle multiple +settings files, you can pass the path to a settings file to `src/bin/run.sh` +using the `-s|--settings` option: this allows you to run multiple Etherpad +instances from the same installation. Similarly, `--credentials` can be used to +give a settings override file, `--apikey` to give a different APIKEY.txt file +and `--sessionkey` to give a non-default `SESSIONKEY.txt`. **Each configuration +parameter can also be set via an environment variable**, using the syntax +`"${ENV_VAR}"` or `"${ENV_VAR:default_value}"`. For details, refer to +`settings.json.template`. Once you have access to your `/admin` section, +settings can be modified through the web browser. -## Secure your installation -If you have enabled authentication in `users` section in `settings.json`, it is a good security practice to **store hashes instead of plain text passwords** in that file. This is _especially_ advised if you are running a production installation. +If you are planning to use Etherpad in a production environment, you should use +a dedicated database such as `mysql`, since the `dirtyDB` database driver is +only for testing and/or development purposes. -Please install [ep_hash_auth plugin](https://www.npmjs.com/package/ep_hash_auth) and configure it. -If you prefer, `ep_hash_auth` also gives you the option of storing the users in a custom directory in the file system, without having to edit `settings.json` and restart Etherpad each time. +### Secure your installation -## Customize functionalities with plugins +If you have enabled authentication in `users` section in `settings.json`, it is +a good security practice to **store hashes instead of plain text passwords** in +that file. This is _especially_ advised if you are running a production +installation. + +Please install [ep_hash_auth plugin](https://www.npmjs.com/package/ep_hash_auth) +and configure it. If you prefer, `ep_hash_auth` also gives you the option of +storing the users in a custom directory in the file system, without having to +edit `settings.json` and restart Etherpad each time. + +### Customize functionalities with plugins ![Basic install](doc/images/etherpad_basic.png "Basic Installation") ![Full Features](doc/images/etherpad_full_features.png "You can add a lot of plugins !") -Etherpad is very customizable through plugins. Instructions for installing themes and plugins can be found in [the plugin wiki article](https://github.com/ether/etherpad-lite/wiki/Available-Plugins). +Etherpad is very customizable through plugins. Instructions for installing +themes and plugins can be found in [the plugin wiki +article](https://github.com/ether/etherpad-lite/wiki/Available-Plugins). -## Getting the full features -Run the following command in your Etherpad folder to get all of the features visible in the demo gif: +### Getting the full features + +Run the following command in your Etherpad folder to get all of the features +visible in the demo gif: ``` npm install --no-save --legacy-peer-deps ep_headings2 ep_markdown ep_comments_page ep_align ep_font_color ep_webrtc ep_embedded_hyperlinks2 ``` -## Customize the style with skin variants +### Customize the style with skin variants -Open in your browser and start playing ! +Open http://127.0.0.1:9001/p/test#skinvariantsbuilder in your browser and start +playing! ![Skin Variant](doc/images/etherpad_skin_variants.gif "Skin variants") ## Helpful resources -The [wiki](https://github.com/ether/etherpad-lite/wiki) is your one-stop resource for Tutorials and How-to's. + +The [wiki](https://github.com/ether/etherpad-lite/wiki) is your one-stop +resource for Tutorials and How-to's. Documentation can be found in `doc/`. -# Development +## Development -## Things you should know +### Things you should know You can debug Etherpad using `src/bin/debugRun.sh`. @@ -153,36 +214,63 @@ developers and advanced users. Be aware that it will skip the dependencies update, so remember to run `src/bin/installDeps.sh` after installing a new dependency or upgrading version. -If you want to find out how Etherpad's `Easysync` works (the library that makes it really realtime), start with this [PDF](https://github.com/ether/etherpad-lite/raw/master/doc/easysync/easysync-full-description.pdf) (complex, but worth reading). +If you want to find out how Etherpad's `Easysync` works (the library that makes +it really realtime), start with this +[PDF](https://github.com/ether/etherpad-lite/raw/master/doc/easysync/easysync-full-description.pdf) +(complex, but worth reading). -## Contributing -Read our [**Developer Guidelines**](https://github.com/ether/etherpad-lite/blob/master/CONTRIBUTING.md) +### Contributing -# Get in touch -The official channel for contacting the development team is via the [Github issues](https://github.com/ether/etherpad-lite/issues). +Read our [**Developer +Guidelines**](https://github.com/ether/etherpad-lite/blob/master/CONTRIBUTING.md) -For **responsible disclosure of vulnerabilities**, please write a mail to the maintainers (a.mux@inwind.it and contact@etherpad.org). -Join the official [Etherpad Discord Channel](https://discord.com/invite/daEjfhw) +### HTTP API -# HTTP API -Etherpad is designed to be easily embeddable and provides a [HTTP API](https://github.com/ether/etherpad-lite/wiki/HTTP-API) -that allows your web application to manage pads, users and groups. It is recommended to use the [available client implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) in order to interact with this API. +Etherpad is designed to be easily embeddable and provides a [HTTP +API](https://github.com/ether/etherpad-lite/wiki/HTTP-API) that allows your web +application to manage pads, users and groups. It is recommended to use the +[available client +implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) +in order to interact with this API. -OpenAPI (previously swagger) definitions for the API are exposed under `/api/openapi.json`. +OpenAPI (previously swagger) definitions for the API are exposed under +`/api/openapi.json`. -# jQuery plugin -There is a [jQuery plugin](https://github.com/ether/etherpad-lite-jquery-plugin) that helps you to embed Pads into your website. +### jQuery plugin -# Plugin Framework -Etherpad offers a plugin framework, allowing you to easily add your own features. By default your Etherpad is extremely light-weight and it's up to you to customize your experience. Once you have Etherpad installed you should [visit the plugin page](https://static.etherpad.org/) and take control. +There is a [jQuery plugin](https://github.com/ether/etherpad-lite-jquery-plugin) +that helps you to embed Pads into your website. -# Translations / Localizations (i18n / l10n) -Etherpad comes with translations into all languages thanks to the team at [TranslateWiki](https://translatewiki.net/). +### Plugin Framework -If you require translations in [plugins](https://static.etherpad.org/) please send pull request to each plugin individually. +Etherpad offers a plugin framework, allowing you to easily add your own +features. By default your Etherpad is extremely light-weight and it's up to you +to customize your experience. Once you have Etherpad installed you should [visit +the plugin page](https://static.etherpad.org/) and take control. + +### Translations / Localizations (i18n / l10n) + +Etherpad comes with translations into all languages thanks to the team at +[TranslateWiki](https://translatewiki.net/). + +If you require translations in [plugins](https://static.etherpad.org/) please +send pull request to each plugin individually. + +## FAQ -# FAQ Visit the **[FAQ](https://github.com/ether/etherpad-lite/wiki/FAQ)**. -# License +## Get in touch + +The official channel for contacting the development team is via the [GitHub +issues](https://github.com/ether/etherpad-lite/issues). + +For **responsible disclosure of vulnerabilities**, please write a mail to the +maintainers (a.mux@inwind.it and contact@etherpad.org). + +Join the official [Etherpad Discord +Channel](https://discord.com/invite/daEjfhw). + +## License + [Apache License v2](http://www.apache.org/licenses/LICENSE-2.0.html)