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

namecoin · Oct 23, 2023 · 8d7a6db · 8d7a6db
2 parents 044bd64 + f14fe4d
commit 8d7a6db
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 25)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 1)
+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" "October 2023" "namecoin-cli v25.1.0rc1" "User Commands"
+.TH NAMECOIN-CLI "1" "October 2023" "namecoin-cli v25.1.0" "User Commands"
 .SH NAME
-namecoin-cli \- manual page for namecoin-cli v25.1.0rc1
+namecoin-cli \- manual page for namecoin-cli v25.1.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 v25.1.0rc1
 .B namecoin-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Namecoin Core RPC client version v25.1.0rc1
+Namecoin Core RPC client version v25.1.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" "October 2023" "namecoin-qt v25.1.0rc1" "User Commands"
+.TH NAMECOIN-QT "1" "October 2023" "namecoin-qt v25.1.0" "User Commands"
 .SH NAME
-namecoin-qt \- manual page for namecoin-qt v25.1.0rc1
+namecoin-qt \- manual page for namecoin-qt v25.1.0
 .SH SYNOPSIS
 .B namecoin-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Namecoin Core version v25.1.0rc1
+Namecoin Core version v25.1.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" "October 2023" "namecoin-tx v25.1.0rc1" "User Commands"
+.TH NAMECOIN-TX "1" "October 2023" "namecoin-tx v25.1.0" "User Commands"
 .SH NAME
-namecoin-tx \- manual page for namecoin-tx v25.1.0rc1
+namecoin-tx \- manual page for namecoin-tx v25.1.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 v25.1.0rc1
+Namecoin Core namecoin\-tx utility version v25.1.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" "October 2023" "namecoin-util v25.1.0rc1" "User Commands"
+.TH NAMECOIN-UTIL "1" "October 2023" "namecoin-util v25.1.0" "User Commands"
 .SH NAME
-namecoin-util \- manual page for namecoin-util v25.1.0rc1
+namecoin-util \- manual page for namecoin-util v25.1.0
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,commands\/\fR]  \fI\,Do stuff\/\fR
 .SH DESCRIPTION
-Namecoin Core bitcoin\-util utility version v25.1.0rc1
+Namecoin Core bitcoin\-util utility version v25.1.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" "October 2023" "namecoin-wallet v25.1.0rc1" "User Commands"
+.TH NAMECOIN-WALLET "1" "October 2023" "namecoin-wallet v25.1.0" "User Commands"
 .SH NAME
-namecoin-wallet \- manual page for namecoin-wallet v25.1.0rc1
+namecoin-wallet \- manual page for namecoin-wallet v25.1.0
 .SH DESCRIPTION
-Namecoin Core namecoin\-wallet version v25.1.0rc1
+Namecoin Core namecoin\-wallet version v25.1.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" "October 2023" "namecoind v25.1.0rc1" "User Commands"
+.TH NAMECOIND "1" "October 2023" "namecoind v25.1.0" "User Commands"
 .SH NAME
-namecoind \- manual page for namecoind v25.1.0rc1
+namecoind \- manual page for namecoind v25.1.0
 .SH SYNOPSIS
 .B namecoind
 [\fI\,options\/\fR]                     \fI\,Start Namecoin Core\/\fR
 .SH DESCRIPTION
-Namecoin Core version v25.1.0rc1
+Namecoin Core version v25.1.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -1,11 +1,11 @@
-25.1rc1 Release Notes
+25.1 Release Notes
 ==================
 
-Bitcoin Core version 25.1rc1 is now available from:
+Bitcoin Core version 25.1 is now available from:
 
-  <https://bitcoincore.org/bin/bitcoin-core-25.1/test.rc1>
+  <https://bitcoincore.org/bin/bitcoin-core-25.1/>
 
-This release includes new features, various bug fixes and performance
+This release includes various bug fixes and performance
 improvements, as well as updated translations.
 
 Please report bugs using the issue tracker at GitHub: