revert branding

diff --git a/NEWS b/NEWS
index 5464ad058d2efbe160b9b4eb209114b6fec5737b..c81398b209790d6eb400db9f09ec07399cd11177 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-v1.3.2-an 2022-01-14  Ailin Nemui <Nei>
+v1.3.2 2022-xx-xx The Irssi team <staff@irssi.org>
        - CHANTYPES take precedence over (missing) STATUSMSG in /join
           (#1358, an#54)
        - Fix crash in Perl's $view->set_bookmark (freebsd#254237,

diff --git a/README.md b/README.md
index 21fa14e8bd4db0923c9b44b0adaa5cc50183e847..475caeaa52c19b18bbebebf8582d345363a3bebe 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# Neırssi
+# [Irssi](https://irssi.org)
 
-![Build Status](https://github.com/ailin-nemui/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
+![Build Status](https://github.com/irssi/irssi/workflows/Check%20Irssi/badge.svg?branch=master)
 
-Neırssi is a modular text mode chat client mostly compatible with
-[Irssi](https://irssi.org). It comes with IRC support built in, and
-there are third party [ICB](https://github.com/jperkin/irssi-icb),
+Irssi is a modular text mode chat client. It comes with IRC support
+built in, and there are third party
+[ICB](https://github.com/jperkin/irssi-icb),
 [SILC](http://www.silcnet.org/),
 [XMPP](http://cybione.org/~irssi-xmpp/) (Jabber),
 [PSYC](http://about.psyc.eu/Irssyc) and
@@ -13,14 +13,14 @@ available.
 
 ![irssi](https://user-images.githubusercontent.com/5665186/32180643-cf127f60-bd92-11e7-8aa2-882313ce1d8e.png)
 
-## [Download information](https://ailin-nemui.github.io/irssi/Getting.html)
+## [Download information](https://irssi.org/download/)
 
 #### Development source installation
 
 [Ninja](https://ninja-build.org/) 1.5 and [Meson](https://mesonbuild.com/) 0.49
 
 ```
-git clone https://github.com/ailin-nemui/irssi
+git clone https://github.com/irssi/irssi
 cd irssi
 meson Build
 ninja -C Build && sudo ninja -C Build install
@@ -28,7 +28,7 @@ ninja -C Build && sudo ninja -C Build install
 
 #### Release source installation
 
-* Download [release](https://github.com/ailin-nemui/irssi/releases)
+* Download [release](https://github.com/irssi/irssi/releases)
 * Verify signature
 ```
 tar xJf irssi-*.tar.xz
@@ -46,17 +46,17 @@ ninja -C Build && sudo ninja -C Build install
 
 #### See the [INSTALL](INSTALL) file for details
 
-## Documentation
+## [Documentation](https://irssi.org/documentation/)
 
-* [New users guide](https://ailin-nemui.github.io/irssi/New-users.html)
+* [Frequently Asked Questions](https://irssi.org/documentation/faq)
+* [Startup How-To](https://irssi.org/documentation/startup)
 * Check the built-in `/HELP`, it has all the details on command syntax
-* Other random Irssi documentation on https://irssi.org/documentation/
 
 ## [Themes](https://irssi-import.github.io/themes/)
 
 ## [Scripts](https://scripts.irssi.org/)
 
-## [Modules](https://ailin-nemui.github.io/irssi/Modules.html)
+## [Modules](https://irssi.org/modules/)
 
 ## [Security information](https://irssi.org/security/)
 

diff --git a/configure.ac b/configure.ac
index 87dcbc32d7237d3de1a0ebff89ce92cba99829f8..c91bde95702c3cd2313cba9804407f89bb16fdd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.3.2-an)
+AC_INIT(irssi, 1.3.2)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)

diff --git a/meson.build b/meson.build
index 64dd04cf9fbcfb2dab619e4af2e161fde63180c7..58052054fcc24bdf9075e4f5cd6028c430bdd343 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.3.2-an',
+  version : '1.3.2',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 

diff --git a/src/fe-text/module-formats.c b/src/fe-text/module-formats.c
index e9d4fab90682ce68a6c23f276e4a5433d7c9f352..e9111c2db6bca0cba8850cdc57c077a8c1b7a623 100644 (file)
--- a/src/fe-text/module-formats.c
+++ b/src/fe-text/module-formats.c
@@ -84,7 +84,7 @@ FORMAT_REC gui_text_formats[] =
        { NULL, "Welcome", 0 },
 
        { "irssi_banner",
-         "Neırssi v$J", 0 },
+         "Irssi v$J", 0 },
        { "welcome_firsttime",
          "- - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"
          "Hi there! If this is your first time using Irssi, you%:"