Merge remote-tracking branch 'origin/topic/etyp/minor-docs-fixes'

* origin/topic/etyp/minor-docs-fixes:
  Remove `bro-pkg.meta` reference
  Touchup quickstart and packages doc sections

Author: evantypanski

CHANGES

@@ -1,3 +1,12 @@
+3.1.0-13 | 2025-09-16 15:56:14 -0400
+
+  * Remove `bro-pkg.meta` reference (Evan Typanski, Corelight)
+
+  * Touchup quickstart and packages doc sections (Evan Typanski, Corelight)
+
+    Mainly removing some `bro` references that will be considered outdated
+    because versioning is different and fixing minor typos.
+
 3.1.0-10 | 2025-08-17 21:32:00 +0200
 
   * Bump pre-commit hooks (Benjamin Bannier, Corelight)

VERSION

@@ -1 +1 @@
-3.1.0-10
+3.1.0-13

doc/man/zkg.1

@@ -22,12 +22,6 @@ This is the package's metadata file in INI file format and may contain
 :ref:`additional fields <metadata-fields>` that describe the package as well
 as how it inter-operates with Zeek, the package manager, or other packages.
 
-.. note::
-
-   :file:`zkg.meta` is the canonical metadata file name used :program:`since
-   zkg v2.0`.  The previous metadata file name of :file:`bro-pkg.meta` is also
-   accepted when no :file:`zkg.meta` exists.
-
 .. _package-shorthand-name:
 
 Note that the shorthand name for your package that may be used by :ref:`zkg
@@ -47,7 +41,7 @@ The easiest way to start a new Zeek package is via :program:`zkg`
 itself: its ``zkg create`` command lets you generate new Zeek packages
 from the command line.
 
-This functionality is available since :program:`since zkg v2.9`.  See the
+This functionality is available since :program:`zkg` v2.9.  See the
 :ref:`Walkthroughs <manual-package-creation>` section for step-by-step
 processes that show how to manually create packages (e.g. perhaps when using
 older :program:`zkg` versions).
@@ -399,8 +393,6 @@ The low-level details of the way this field operates is that, for each alias,
 it simply creates a symlink of the same name within the directory associated
 with the ``script_dir`` path in the :ref:`config file <zkg-config-file>`.
 
-Available :program:`since bro-pkg v1.5`.
-
 `credits` field
 ~~~~~~~~~~~~~~~
 
@@ -484,7 +476,7 @@ added to :file:`{<user_script_dir>}/packages/packages.zeek`.
 You may place any valid Zeek script code within :file:`__load__.zeek`, but a
 package that contains many Zeek scripts will typically have :file:`__load__.zeek`
 just contain a list of ``@load`` directives to load other Zeek scripts within the
-package.  E.g. if you have a package named **foo** installed, then it's
+package.  E.g. if you have a package named **foo** installed, then its
 :file:`__load__.zeek` will be what Zeek loads when doing ``@load foo`` or running
 ``zeek foo`` on the command-line.
 
@@ -551,8 +543,6 @@ were also building an executable ``a.out``::
 The package manager makes executables available by maintaining symbolic
 links referring from :file:`bin_dir` to the actual files.
 
-Available :program:`since bro-pkg v2.8`.
-
 `build_command` field
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -603,7 +593,7 @@ Another pre-defined config key is `package_base`, which points to the top-level
 directory where :program:`zkg` stores all installed packages (i.e.  clones of
 each package's git repository). This can be used to gain access to the content
 of another package that was installed as a dependency.  Note that
-`package_base` is only available :program:`since zkg v2.3`
+`package_base` is only available since :program:`zkg` v2.3.
 
 Internally, the value substitution and metadata parsing is handled by Python's
 `configparser interpolation`_.  See its documentation if you're interested in
@@ -667,8 +657,6 @@ located in the environment. The user may also provide `user_vars` via
 priority over environment variables, which in turn take precedence over any
 values in the user's :ref:`package manager config file <zkg-config-file>`.
 
-Available :program:`since bro-pkg v1.1`.
-
 `test_command` field
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -803,8 +791,6 @@ name and version specification for an external dependency are only used
 for display purposes -- to help users understand extra pre-requisites
 that are needed for proceeding with package installation/upgrades.
 
-Available :program:`since bro-pkg v1.1`.
-
 `suggests` field
 ~~~~~~~~~~~~~~~~
 
@@ -820,8 +806,6 @@ except in the way it's presented to users in various prompts during
 suggestions by supplying an additional ``--nosuggestions`` flag to
 :program:`zkg` commands.
 
-Available :program:`since bro-pkg v1.3`.
-
 .. _package-versioning:
 
 Package Versioning

doc/package.rst

@@ -132,8 +132,7 @@ also automatically distribute installed package scripts/plugins to all nodes.
 
   .. code-block:: console
 
-    $ sudo chgrp $USER $(zeek-config --site_dir) $(zeek-config
-    --plugin_dir) $(zeek-config --prefix)/bin
+    $ sudo chgrp $USER $(zeek-config --site_dir) $(zeek-config --plugin_dir) $(zeek-config --prefix)/bin
     $ sudo chmod g+rwX $(zeek-config --site_dir) $(zeek-config --plugin_dir) $(zeek-config --prefix)/bin
 
 The final step is to edit your :file:`site/local.zeek`.  If you want to

doc/quickstart.rst

@@ -9,7 +9,7 @@
 
 import logging
 
-__version__ = "3.1.0-10"
+__version__ = "3.1.0-13"
 __all__ = ["manager", "package", "source", "template", "uservar"]  # noqa: F405
 
 LOG: logging.Logger = logging.getLogger(__name__)