[roller] branch master updated: Remove unnecessary error message and fix use of back-tic quotes in Install guide.

[snoopdave]

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new f7f01e9c7 Remove unnecessary error message and fix use of back-tic 
quotes in Install guide.
f7f01e9c7 is described below

commit f7f01e9c76c94cfb02de1a8da5fd5e9f58268fab
Author: David M. Johnson <snoopd...@apache.org>
AuthorDate: Sun Jul 23 15:53:44 2023 -0400

    Remove unnecessary error message and fix use of back-tic quotes in Install 
guide.
---
 .../org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java | 1 +
 assembly-release/sign-release.sh                                  | 2 +-
 docs/roller-install-guide.adoc                                    | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
index b19ca50c4..f2ffe2b3b 100644
--- 
a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
+++ 
b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
@@ -172,6 +172,7 @@ public class CreateWeblog extends UIAction {
         String safe = CharSetUtils.keep(getBean().getHandle(), allowed);
         if (!safe.equals(getBean().getHandle()) ) {
             addError("createWeblog.error.invalidHandle");
+            return;
         }
         
         // make sure theme was specified and is a valid value
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index ffb3d6a8e..09a7bd015 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export rcstring="r1"
+export rcstring="r2"
 export vstring="6.1.2"
 
 # for rc releases we rename the release files
diff --git a/docs/roller-install-guide.adoc b/docs/roller-install-guide.adoc
index 8e6985319..5b9381ec5 100644
--- a/docs/roller-install-guide.adoc
+++ b/docs/roller-install-guide.adoc
@@ -203,9 +203,9 @@ password: *****
 mysql> create database rollerdb DEFAULT CHARACTER SET utf8 DEFAULT
 COLLATE utf8_general_ci;
 
-mysql> grant all on rollerdb.* to scott@`%' identified by `tiger';
+mysql> grant all on rollerdb.* to scott@'%' identified by 'tiger';
 
-mysql> grant all on rollerdb.* to scott@localhost identified by `tiger';
+mysql> grant all on rollerdb.* to scott@localhost identified by 'tiger';
 
 mysql> exit;
 ----
@@ -215,7 +215,7 @@ If you’re using Derby:
 ----
 % ij
 
-ij> connect `jdbc:derby:/path/to/new/MYROLLERDB;create=true';
+ij> connect 'jdbc:derby:/path/to/new/MYROLLERDB;create=true';
 
 ij> quit;
 ----
@@ -408,7 +408,7 @@ on the Tomcat classpath and therefore available to Roller.
 === Using Server-provided database & mail resources (optional)
 
 It’s easiest to setup your Roller for Tomcat database connection using
-the `jdbc' approach and the mail connection using `properties' but in
+the 'jdbc' approach and the mail connection using 'properties' but in
 some cases you might want to use the datasource and/or mail session
 resources provided by your application server instead. For
 authentication-requiring mail connections like Google’s Gmail service,