README | 2 +- configure.ac | 4 ++-- debian/control | 2 +- loleaflet/README | 4 ++-- loolwsd.service | 2 +- loolwsd.spec.in | 2 +- sysconfig.loolwsd | 2 +- tools/Stress.cpp | 2 +- tools/Tool.cpp | 2 +- wsd/LOOLWSD.cpp | 2 +- wsd/README | 4 ++-- wsd/reference.txt | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 1f2d04a5e496d03d6a69fe3dea097dec894bb2f0 Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Date: Fri Feb 3 13:28:48 2017 +0000 Online, not on-line Change-Id: I93a8322dceca7c1ed95449c6aeb4ae854b982957 Reviewed-on: https://gerrit.libreoffice.org/33886 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/README b/README index 9a7f327..6efc238 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -LibreOffice on-line. +LibreOffice Online. This project has several components: diff --git a/configure.ac b/configure.ac index f65b8e6..b389d69 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_SUBST([LOOLWSD_VERSION_MINOR]) AC_SUBST([LOOLWSD_VERSION_MICRO]) AC_SUBST([LOOLWSD_VERSION]) -AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice On-Line WebSocket server version]) +AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice Online WebSocket server version]) # try to add a git hash for a version if we're developing LOOLWSD_VERSION_HASH="$LOOLWSD_VERSION" @@ -30,7 +30,7 @@ if test "z$git_hash" != "z"; then fi AC_SUBST([LOOLWSD_VERSION_HASH]) -AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[LibreOffice On-Line git hash if present]) +AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[LibreOffice Online git hash if present]) AC_CONFIG_SRCDIR([wsd/LOOLWSD.cpp]) diff --git a/debian/control b/debian/control index 80af0eb..9a60115 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,6 @@ Package: loolwsd Section: web Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc, collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw, collaboraofficebasis5.1-extension-beanshell-script-provider, collaboraofficebasis5.1-extension-ct2n, collaboraofficebasis5.1-extension-javascript-script-provider, collaboraofficebasis5.1-extension-mediawiki-publisher, collaboraofficebasis5.1-extension-nlpsolver, collaboraofficebasis5.1-extension-numbertext, collaboraofficebasis5.1-extension-pdf-import, collaboraofficebasis5.1-extension-report-builder, collaboraofficebasis5.1-gnome-integration, collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images, collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo, collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans, collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-oooling uistic, collaboraofficebasis5.1-postgresql-sdbc, collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno, collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter, collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc, collaboraoffice5.1-dict-en, collaboraoffice5.1-draw, collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress, collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer, collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base, collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math, collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer, collaboraoffice5.1-en-us -Description: LibreOffice On-Line WebSocket Daemon +Description: LibreOffice Online WebSocket Daemon LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice services. diff --git a/loleaflet/README b/loleaflet/README index 714f7d5..1c08241 100644 --- a/loleaflet/README +++ b/loleaflet/README @@ -1,7 +1,7 @@ -Leaflet platform for LibreOffice On-Line +Leaflet platform for LibreOffice Online ======================================== -This is the client part of LibreOffice On-Line. For the server part, see the +This is the client part of LibreOffice Online. For the server part, see the ../loolwsd/README, and install it first. Build dependencies diff --git a/loolwsd.service b/loolwsd.service index 34b1bb8..327ffc8 100644 --- a/loolwsd.service +++ b/loolwsd.service @@ -1,5 +1,5 @@ [Unit] -Description=LibreOffice On-Line WebSocket Daemon +Description=LibreOffice Online WebSocket Daemon After=network.target [Service] diff --git a/loolwsd.spec.in b/loolwsd.spec.in index 69204c0..d92599e 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -14,7 +14,7 @@ Name: loolwsd Version: @PACKAGE_VERSION@ Release: 1%{?dist} Vendor: Collabora -Summary: LibreOffice On-Line WebSocket Daemon +Summary: LibreOffice Online WebSocket Daemon License: MPL Source0: loolwsd-@package_vers...@.tar.gz Source1: loleaflet-@package_vers...@.tar.gz diff --git a/sysconfig.loolwsd b/sysconfig.loolwsd index 497d575..a2747d2 100644 --- a/sysconfig.loolwsd +++ b/sysconfig.loolwsd @@ -1,5 +1,5 @@ ## Path: Network/Remote access/LOOLWSD -## Description: LibreOffice On-Line WebSocket Daemon settings +## Description: LibreOffice Online WebSocket Daemon settings ## Type: string ## Default: "" ## ServiceRestart: loolwsd diff --git a/tools/Stress.cpp b/tools/Stress.cpp index 06bbeb1..bb6a6ac 100644 --- a/tools/Stress.cpp +++ b/tools/Stress.cpp @@ -441,7 +441,7 @@ void Stress::handleOption(const std::string& optionName, helpFormatter.setCommand(commandName()); helpFormatter.setUsage("OPTIONS"); - helpFormatter.setHeader("LibreOffice On-Line tool."); + helpFormatter.setHeader("LibreOffice Online tool."); helpFormatter.format(std::cerr); std::exit(Application::EXIT_OK); } diff --git a/tools/Tool.cpp b/tools/Tool.cpp index aeda094..3bb6b77 100644 --- a/tools/Tool.cpp +++ b/tools/Tool.cpp @@ -189,7 +189,7 @@ void Tool::handleOption(const std::string& optionName, helpFormatter.setCommand(commandName()); helpFormatter.setUsage("OPTIONS"); - helpFormatter.setHeader("LibreOffice On-Line tool."); + helpFormatter.setHeader("LibreOffice Online tool."); helpFormatter.format(std::cout); std::exit(Application::EXIT_OK); } diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index ffaf669..82ba7e8 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -2092,7 +2092,7 @@ void LOOLWSD::displayHelp() HelpFormatter helpFormatter(options()); helpFormatter.setCommand(commandName()); helpFormatter.setUsage("OPTIONS"); - helpFormatter.setHeader("LibreOffice On-Line WebSocket server."); + helpFormatter.setHeader("LibreOffice Online WebSocket server."); helpFormatter.format(std::cout); } diff --git a/wsd/README b/wsd/README index be60604..ab8ea06 100644 --- a/wsd/README +++ b/wsd/README @@ -1,10 +1,10 @@ -LibreOffice On-Line WebSocket server +LibreOffice Online WebSocket server ==================================== Dependencies ------------ -LibreOffice On-Line WebSocket server has the following dependencies: +LibreOffice Online WebSocket server has the following dependencies: * libpng * Poco library: http://pocoproject.org/index.html. diff --git a/wsd/reference.txt b/wsd/reference.txt index 4e9f5b4..fe6f598 100644 --- a/wsd/reference.txt +++ b/wsd/reference.txt @@ -1,4 +1,4 @@ -LibreOffice On-Line API +LibreOffice Online API ======================= Document conversion: @@ -14,7 +14,7 @@ integrate LibreOffice Online in them. Refer to WOPI docs[https://wopi.readthedocs.io/en/latest/] for detailed information. This documentation only mentions extensions to upstream WOPI protocol, -WOPI extensions, that are implemented by LibreOffice-Online backend in addition to +WOPI extensions, that are implemented by LibreOffice Online backend in addition to upstream WOPI protocol. (Please note that upstream WOPI implementation is also not 100% complete) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits