Merge branch 'auxpow-26.x' into 26.x

namecoin · Dec 11, 2023 · 60f58ec · 60f58ec
2 parents 108cb70 + 2135216
commit 60f58ec
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 26)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 3)
+define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2023)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git a/doc/man/namecoin-cli.1 b/doc/man/namecoin-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-CLI "1" "November 2023" "namecoin-cli v26.0.0rc3" "User Commands"
+.TH NAMECOIN-CLI "1" "December 2023" "namecoin-cli v26.0.0" "User Commands"
 .SH NAME
-namecoin-cli \- manual page for namecoin-cli v26.0.0rc3
+namecoin-cli \- manual page for namecoin-cli v26.0.0
 .SH SYNOPSIS
 .B namecoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Namecoin Core\/\fR
@@ -15,7 +15,7 @@ namecoin-cli \- manual page for namecoin-cli v26.0.0rc3
 .B namecoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Namecoin Core RPC client version v26.0.0rc3
+Namecoin Core RPC client version v26.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-qt.1 b/doc/man/namecoin-qt.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-QT "1" "November 2023" "namecoin-qt v26.0.0rc3" "User Commands"
+.TH NAMECOIN-QT "1" "December 2023" "namecoin-qt v26.0.0" "User Commands"
 .SH NAME
-namecoin-qt \- manual page for namecoin-qt v26.0.0rc3
+namecoin-qt \- manual page for namecoin-qt v26.0.0
 .SH SYNOPSIS
 .B namecoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Namecoin Core version v26.0.0rc3
+Namecoin Core version v26.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-tx.1 b/doc/man/namecoin-tx.1
@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-TX "1" "November 2023" "namecoin-tx v26.0.0rc3" "User Commands"
+.TH NAMECOIN-TX "1" "December 2023" "namecoin-tx v26.0.0" "User Commands"
 .SH NAME
-namecoin-tx \- manual page for namecoin-tx v26.0.0rc3
+namecoin-tx \- manual page for namecoin-tx v26.0.0
 .SH SYNOPSIS
 .B namecoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded transaction\/\fR
 .br
 .B namecoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded transaction\/\fR
 .SH DESCRIPTION
-Namecoin Core namecoin\-tx utility version v26.0.0rc3
+Namecoin Core namecoin\-tx utility version v26.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-util.1 b/doc/man/namecoin-util.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-UTIL "1" "November 2023" "namecoin-util v26.0.0rc3" "User Commands"
+.TH NAMECOIN-UTIL "1" "December 2023" "namecoin-util v26.0.0" "User Commands"
 .SH NAME
-namecoin-util \- manual page for namecoin-util v26.0.0rc3
+namecoin-util \- manual page for namecoin-util v26.0.0
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Namecoin Core bitcoin\-util utility version v26.0.0rc3
+Namecoin Core bitcoin\-util utility version v26.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/namecoin-wallet.1 b/doc/man/namecoin-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIN-WALLET "1" "November 2023" "namecoin-wallet v26.0.0rc3" "User Commands"
+.TH NAMECOIN-WALLET "1" "December 2023" "namecoin-wallet v26.0.0" "User Commands"
 .SH NAME
-namecoin-wallet \- manual page for namecoin-wallet v26.0.0rc3
+namecoin-wallet \- manual page for namecoin-wallet v26.0.0
 .SH DESCRIPTION
-Namecoin Core namecoin\-wallet version v26.0.0rc3
+Namecoin Core namecoin\-wallet version v26.0.0
 .PP
 namecoin\-wallet is an offline tool for creating and interacting with Namecoin Core wallet files.
 By default namecoin\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

diff --git a/doc/man/namecoind.1 b/doc/man/namecoind.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.1.
-.TH NAMECOIND "1" "November 2023" "namecoind v26.0.0rc3" "User Commands"
+.TH NAMECOIND "1" "December 2023" "namecoind v26.0.0" "User Commands"
 .SH NAME
-namecoind \- manual page for namecoind v26.0.0rc3
+namecoind \- manual page for namecoind v26.0.0
 .SH SYNOPSIS
 .B namecoind
 [\fI\,options\/\fR]                     \fI\,Start Namecoin Core\/\fR
 .SH DESCRIPTION
-Namecoin Core version v26.0.0rc3
+Namecoin Core version v26.0.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,5 +1,5 @@
-26.0 rc3 Release Notes
-======================
+26.0 Release Notes
+==================
 
 Bitcoin Core version 26.0 is now available from: