changeset 31874:1979288f086d

version.cc: Use shorter URLs, update text, reduce spacing version.cc: Use shorter URLs and shorter link descriptions. Align all URLs vertically when printed.
author Arun Giridhar <arungiridhar@gmail.com>
date Thu, 02 Mar 2023 14:18:42 -0500
parents 5eb1f1a77614
children ca670a0765c8
files liboctave/version.cc
diffstat 1 files changed, 16 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/version.cc	Thu Mar 02 11:48:34 2023 -0500
+++ b/liboctave/version.cc	Thu Mar 02 14:18:42 2023 -0500
@@ -48,23 +48,22 @@
 std::string
 octave_www_statement (bool html)
 {
-  return "Additional information about Octave is available at "
-         + format_url (html, "https://www.octave.org") + ".";
+  return "Home page:         "
+         + format_url (html, "https://octave.org");
 }
 
 std::string
 octave_contrib_statement (bool html)
 {
-  return "Please contribute if you find this software useful.\n\
-For more information, visit "
-         + format_url (html, "https://www.octave.org/get-involved.html");
+  return "Improve Octave:    "
+         + format_url (html, "https://octave.org/get-involved");
 }
 
 std::string
 octave_bugs_statement (bool html)
 {
-  return "Read " + format_url (html, "https://www.octave.org/bugs.html")
-         + " to learn how to submit bug reports.";
+  return "Tech support:      "
+         + format_url (html, "https://octave.org/support");
 }
 
 std::string
@@ -99,21 +98,15 @@
 octave_name_version_copyright_copying_warranty_and_bugs
   (bool html, const std::string& extra_info)
 {
-  std::string sep = (html ? "\n</p>\n<p>\n" : "\n\n");
-
-  std::string msg;
-
-  if (html)
-    msg = "<p>\n";
-
-  msg += octave_name_version_copyright_copying_and_warranty (html, extra_info)
-         + sep
-         + octave_www_statement (html)
-         + sep
-         + octave_contrib_statement (html)
-         + sep
-         + octave_bugs_statement (html)
-         + (html ? "\n</p>" : "");
+  std::string sep = (html ? "\n</p>\n<p>\n" : "\n");
+  std::string msg =
+        (html ? "<p>\n" : "")
+        + octave_name_version_copyright_copying_and_warranty (html, extra_info)
+        + (html ? "" : "\n")               + sep
+        + octave_www_statement (html)      + sep
+        + octave_bugs_statement (html)     + sep
+        + octave_contrib_statement (html)  + sep
+        + (html ? "\n</p>" : "");
 
   return msg;
 }
@@ -127,7 +120,7 @@
 
   msg += (html ? "<p>\n" : "\n");
 
-  msg += "For information about changes from previous versions, type 'news'.";
+  msg += "For changes from previous versions, type 'news'.";
 
   msg += (html ? "\n</p>" : "");