More correct spelling

diff --git a/cmd/warc-extract/main.go b/cmd/warc-extract/main.go
index 560aefa2d62e815d8518fee0d38e27db49ee129a..9ebc6419b5fd9f5417f8053ead1138deda53f070 100644 (file)
--- a/cmd/warc-extract/main.go
+++ b/cmd/warc-extract/main.go
@@ -34,7 +34,7 @@ import (
 func main() {
        uri := flag.String("uri", "", "URI to extract, if specified")
        hdr := flag.Bool("hdr", false, "Also extract WARC's header")
-       idx := flag.Bool("idx", false, "Save WARC indexes")
+       idx := flag.Bool("idx", false, "Save WARC indices")
        recompress := flag.Bool("for-enzstd", false, "Output for enzstd utility")
        flag.Parse()
        log.SetFlags(log.Lshortfile)
@@ -89,7 +89,7 @@ func main() {
                }
                log.Println("added", p, len(warc.WARCs[p]), "URIs")
                if *idx {
-                       if err := warc.SaveIndexes(); err != nil {
+                       if err := warc.SaveIndices(); err != nil {
                                log.Fatalln(err)
                        }
                }

diff --git a/doc/index.texi b/doc/index.texi
index ae61d9f03966e08d92433ee664fb6fe3f77d9786..6ffbfea2f2adf7ebb16dd33170bad853e671f156 100644 (file)
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -14,7 +14,7 @@ Copyright @copyright{} 2021-2022 @email{stargrave@@stargrave.org, Sergey Matveev
 flexible HTTP/HTTPS proxy server, TLS terminator, X.509 TOFU manager,
 @url{https://en.wikipedia.org/wiki/Web_ARChive, WARC} and
 @url{https://en.wikipedia.org/wiki/Gemini_(protocol), geminispace}
-browser, written on @url{https://golang.org/, Go} with following
+browser, written on @url{https://go.dev/, Go} with following
 capabilities:
 
 @itemize

diff --git a/doc/warcs.texi b/doc/warcs.texi
index b86e3f3b8be9a3d09e72b8c8b1140bea93304c71..a3bfbce2c6d6a2147c4913de6330d4b89acbf207 100644 (file)
--- a/doc/warcs.texi
+++ b/doc/warcs.texi
@@ -81,7 +81,7 @@ without expensive WARC parsing.
 @code{redo warc-extract.cmd} utility uses exactly the same code for
 parsing WARCs. It can be used to check if WARCs can be successfully
 loaded, to list all URIs after, to extract some specified URI and to
-pre-generate @file{.idx.gob} indexes.
+pre-generate @file{.idx.gob} indices.
 
 @example
 $ warc-extract.cmd -idx \

diff --git a/fifos/warcs.go b/fifos/warcs.go
index 46b6fda383d9cea0d620959bcc7d24dde8bd620d..7e10c93f86d4b37b214b565781d5ba70904845ee 100644 (file)
--- a/fifos/warcs.go
+++ b/fifos/warcs.go
@@ -48,7 +48,7 @@ func addWARC(p string) {
        for {
                for _, warcPath := range readLinesFromFIFO(p) {
                        if warcPath == "SAVE" {
-                               if err := warc.SaveIndexes(); err != nil {
+                               if err := warc.SaveIndices(); err != nil {
                                        log.Printf("%s: can not save index %s: %+v\n", p, warcPath, err)
                                }
                                continue

diff --git a/rounds/redirectHTML.go b/rounds/redirectHTML.go
index 2e286d3208ba3da10ab100ac09fe466a98f8abe6..e20f7b282bbbb115f40960c935d31b57bb25eac9 100644 (file)
--- a/rounds/redirectHTML.go
+++ b/rounds/redirectHTML.go
@@ -48,7 +48,7 @@ func isFeeder(req *http.Request) bool {
        if strings.Contains(req.Header.Get("User-Agent"), "newsboat/") {
                return true
        }
-       if strings.Contains(req.Header.Get("User-Agent"), "go.stargrave.org-feeder/") {
+       if strings.Contains(req.Header.Get("User-Agent"), "stargrave.org-feeder/") {
                return true
        }
        return false

diff --git a/warc/uris.go b/warc/uris.go
index d5f5139a2188f861c6d79e1bc7d8b1b775952302..03f5678bb0503d4f6798c943489ea6d7283036ff 100644 (file)
--- a/warc/uris.go
+++ b/warc/uris.go
@@ -123,7 +123,7 @@ func Add(warcPath string) error {
        return nil
 }
 
-func SaveIndexes() error {
+func SaveIndices() error {
        WARCsM.RLock()
        defer WARCsM.RUnlock()
        for warcPath, uris := range WARCs {