Merge branch 'irc-notes' into 'master'

Update and clarify IRC/Matrix bridge instructions

See merge request !5

howto/irc.md

@@ -90,27 +90,24 @@ for example with:
 Since mid-April 2021, many `#tor-*` channels are bridged (or
 "[plumbed](https://matrix.org/bridges/)") between the [OFTC IRC network](https://oftc.net) and the
 [Matrix.org](https://matrix.org/) home server. This is still somewhat of an experimental
-status (e.g. `#tor` itself is not bridge yet), but so far it seems to
-be working well.
+status, but so far it seems to be working well.
 
-Internal channels are not bridge directly yet either, but they can
-still be joined if you authenticate with `NickServ` through the IRC
-bridge bot. The following might get you going:
+By default, you will appear on IRC as a user like "YourMatrixName \[m\]".
+You can override this by sending `!nick <yournick>` to "OFTC IRC Bridge
+status". If your nick is registered, you will get a PM from NickServ stating
+that you need to authenticate. Do so by responding with `identify
+\<yourpassword\>`.
 
-    !nick <yournick>
-    !storepass <yourpass>
-    !join #secret-channel <channel password>
+Also note that you can join *any* channel on bridged IRC networks (Freenode and
+OFTC) through the [Portal rooms](https://matrix.org/bridges/) functionality.
+For example, `#freenode_#channelname:matrix.org` corresponds to `#channelname`
+on Freenode. This is the only supported way to access Tor's internal channels
+through Matrix (you will need to set your nick first; see above). To join a portal room, send
+`!join #channel \<channel password\>` to "OFTC IRC Bridge status".
 
-The [IRC bot documentation](https://matrix-org.github.io/matrix-appservice-irc/latest/) might provide more information on that
-functionality.
-
-Also note that you can join *any* channel on bridged IRC networks
-(Freenode and OFTC) through the "Portal rooms" functionality. For
-example, `#freenode_#channelname:matrix.org` corresponds to
-`#channelname` on Freenode.
-
-See also the [bridges documentation](https://matrix.org/bridges/) for more information on the
-different types of bridges on Matrix.
+For more information see the general [Matrix bridge
+documentation](https://matrix.org/bridges/) and the [IRC bridge
+documentation](https://matrix-org.github.io/matrix-appservice-irc/latest/).
 
 ## Pager playbook
 
@@ -318,10 +315,10 @@ decisions:
       [ ** ] as the IRC server password like this: user/network:pass.
       [ ** ]
       [ ** ] Try something like this in your IRC client...
-      [ ** ] /server <znc_server_ip> 2000 pastly:<pass>
+      [ ** ] /server \<znc_server_ip\> 2000 pastly:\<pass\>
       [ ** ]
       [ ** ] To manage settings, users and networks, point your web browser to
-      [ ** ] http://<znc_server_ip>:2000/
+      [ ** ] http://\<znc_server_ip\>:2000/
       [ ** ]
       [ ?? ] Launch ZNC now? (yes/no) [yes]: no