Skip to content

Commit 097d531

Browse files
Merge PR rocq-prover#20026: Rename Coq -> Rocq in various comments and doc
Reviewed-by: ppedrot Ack-by: silene Co-authored-by: ppedrot <[email protected]>
2 parents 042078b + 6925c62 commit 097d531

File tree

182 files changed

+528
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+528
-529
lines changed

.gitlab-ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ before_script:
6464
- dev/tools/list-potential-artifacts.sh > downloaded_artifacts.txt
6565
- dev/ci/gitlab-section.sh end before_script
6666

67-
# Regular "release" build of Coq, with final installed layout
67+
# Regular "release" build of Rocq, with final installed layout
6868
.build-template:
6969
stage: build-0
7070
interruptible: true
@@ -141,7 +141,7 @@ before_script:
141141
name: "$CI_JOB_NAME"
142142
expire_in: 2 months
143143

144-
# The used Coq must be set explicitly for each job with "needs:".
144+
# The used Rocq must be set explicitly for each job with "needs:".
145145
# We add a spurious dependency `not-a-real-job` that must be
146146
# overridden otherwise the CI will fail (to help debugging missing needs).
147147

@@ -607,7 +607,7 @@ validate:edge+flambda:
607607
OPAM_VARIANT: "+flambda"
608608
only: *full-ci
609609

610-
# Libraries are by convention the projects that depend on Coq
610+
# Libraries are by convention the projects that depend on Rocq
611611
# but not on its ML API
612612

613613
library:ci-argosy:
@@ -1054,7 +1054,7 @@ library:ci-trakt:
10541054
- plugin:ci-elpi_hb
10551055
stage: build-2
10561056

1057-
# Plugins are by definition the projects that depend on Coq's ML API
1057+
# Plugins are by definition the projects that depend on Rocq's ML API
10581058

10591059
plugin:ci-aac_tactics:
10601060
extends: .ci-template-flambda

.mailmap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Coq contributors
1+
## Rocq contributors
22
##
33
## This file allows joining the different accounts of a same person.
44
## Cf for instance: git shortlog -nse. More details via: man git shortlog

CODE_OF_CONDUCT.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Coq Code of Conduct #
1+
# Rocq Code of Conduct #
22

3-
The Coq development team and the user community are made up of a mixture of
3+
The Rocq development team and the user community are made up of a mixture of
44
professionals and volunteers from all over the world.
55
Diversity brings variety of perspectives that can be very valuable, but it can
66
also lead to communication issues and unhappiness. Therefore, we have a few
@@ -9,12 +9,12 @@ participation in our community a positive experience for
99
everyone.
1010
These rules apply equally to core developers (who should lead by example),
1111
occasional contributors and those seeking help and guidance.
12-
Their goal is that everyone feels safe and welcome when contributing to Coq or
13-
interacting with others in Coq related forums.
12+
Their goal is that everyone feels safe and welcome when contributing to Rocq or
13+
interacting with others in Rocq related forums.
1414

15-
These rules apply to all spaces managed by the Coq development team.
15+
These rules apply to all spaces managed by the Rocq development team.
1616
This includes the GitHub repository, the Discourse forum, the Zulip chat, the mailing lists,
17-
physical events like Coq working groups and workshops, and any other forums
17+
physical events like Rocq working groups and workshops, and any other forums
1818
created or managed by the development team which the community uses for
1919
communication. In addition, violations of these rules outside these spaces may
2020
affect a person's ability to participate within them.
@@ -34,7 +34,7 @@ affect a person's ability to participate within them.
3434
behavior and poor manners. We might all experience some frustration now and
3535
then, but we cannot allow that frustration to turn into a personal attack.
3636
It's important to remember that a community where people feel uncomfortable
37-
or threatened is not a productive one. Members of the Coq development team
37+
or threatened is not a productive one. Members of the Rocq development team
3838
and user community should be respectful when dealing with other members as
3939
well as with people outside the community.
4040
- **Be careful in the words that you choose.**
@@ -55,11 +55,11 @@ affect a person's ability to participate within them.
5555
Consider what image your words will give to outsiders of the development
5656
team / the user community as a whole. Try to avoid references to private
5757
knowledge to be understandable by anyone.
58-
- **Coq online forums are only to discuss Coq-related subjects.**
58+
- **Rocq online forums are only to discuss Rocq-related subjects.**
5959
Unrelated political discussions or long digressions are unwelcome,
6060
even for illustration or comparison purposes.
6161
- **When we disagree, try to understand why.**
62-
Disagreements, both social and technical, happen all the time and Coq is no
62+
Disagreements, both social and technical, happen all the time and Rocq is no
6363
exception. It is important that we resolve disagreements and differing views
6464
constructively. Remember that we are different. Different people
6565
have different perspectives on issues. Being unable to understand why someone
@@ -93,13 +93,13 @@ affect a person's ability to participate within them.
9393
harmless individually but, over time, contribute to a hostile
9494
environment.
9595

96-
## Interaction on Coq forums (Zulip, Discourse, etc.) ##
96+
## Interaction on Rocq forums (Zulip, Discourse, etc.) ##
9797

9898
Anyone is welcome to ask questions and bring answers, provided they
9999
respect the aforementioned rules. In addition we ask that
100100
- you do your best to put your questions into their context by
101-
providing Coq code or pointers to it, and enough indications to
102-
understand where the Coq goals or error message come from.
101+
providing Rocq code or pointers to it, and enough indications to
102+
understand where the Rocq goals or error message come from.
103103
- if you are running through educational material, we kindly ask you
104104
to explicitly state it, and that answers do not solve such exercises
105105
for you, but only provide hints.
@@ -119,7 +119,7 @@ what answers they are likely to receive.
119119
## Enforcement ##
120120

121121
If you believe someone is violating the code of conduct, we ask that you report
122-
it by emailing the Coq Code of Conduct enforcement team at
122+
it by emailing the Rocq Code of Conduct enforcement team at
123123
<[email protected]> or, at your discretion, any member of the team.
124124
Confidentiality with regard to the reporter of an
125125
incident will be maintained while dealing with it.
@@ -135,9 +135,9 @@ communications brought to their attention.
135135

136136
Depending on the violation, the team can choose to address a private or public
137137
warning to the offender, request an apology, or ban them for a short or a long
138-
period from interacting on one or all spaces managed by the Coq
138+
period from interacting on one or all spaces managed by the Rocq
139139
development team (both online and offline).
140-
The ban may apply to anyone, including members of the Coq development
140+
The ban may apply to anyone, including members of the Rocq development
141141
team, in which case the developer will lose their privileges for the
142142
duration of the ban and may need to rebuild trust to regain them.
143143

Makefile

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
## # (see LICENSE file for the text of the license) ##
99
##########################################################################
1010

11-
# Dune Makefile for Coq
11+
# Dune Makefile for Rocq
1212

1313
.PHONY: help help-install states world coqide watch check # Main developer targets
1414
.PHONY: refman-html refman-pdf corelib-html apidoc # Documentation targets
@@ -35,15 +35,15 @@ HIDE := $(if $(VERBOSE),,@)
3535

3636
help:
3737
@echo ""
38-
@echo "Welcome to Coq's Dune-based build system. If you are final user type"
38+
@echo "Welcome to Rocq's Dune-based build system. If you are final user type"
3939
@echo "make help-install for installation instructions. Common developer targets are:"
4040
@echo ""
41-
@echo " - states: build a minimal functional coqtop"
41+
@echo " - states: build a minimal functional rocq repl"
4242
@echo " - world: build main public binaries and libraries in developer mode (no coqide)"
4343
@echo " - watch: build main public binaries and libraries [continuous build]"
4444
@echo " - coqide: build coqide binary in developer mode"
4545
@echo " - check: build all ML files as fast as possible"
46-
@echo " - test-suite: run Coq's test suite [env NJOBS=N to set job parallelism]"
46+
@echo " - test-suite: run Rocq's test suite [env NJOBS=N to set job parallelism]"
4747
@echo " - dunestrap: Generate the dune rules for vo files"
4848
@echo ""
4949
@echo " Note: running ./configure is not recommended for developers,"
@@ -58,9 +58,9 @@ help:
5858
@echo ""
5959
@echo " Documentation targets:"
6060
@echo ""
61-
@echo " - refman-html: build Coq's reference manual [HTML version]"
62-
@echo " - refman-pdf: build Coq's reference manual [PDF version]"
63-
@echo " - corelib-html: build Coq's Corelib documentation [HTML version]"
61+
@echo " - refman-html: build Rocq's reference manual [HTML version]"
62+
@echo " - refman-pdf: build Rocq's reference manual [PDF version]"
63+
@echo " - corelib-html: build Rocq's Corelib documentation [HTML version]"
6464
@echo " - apidoc: build ML API documentation"
6565
@echo ""
6666
@echo " Miscellaneous targets:"
@@ -77,7 +77,7 @@ help:
7777

7878
dev-targets:
7979
@echo ""
80-
@echo "In order to get a functional Coq install layout, the world target is required."
80+
@echo "In order to get a functional Rocq install layout, the world target is required."
8181
@echo "However, This is often inconvenient for developers, due to the large amount of"
8282
@echo "files that world will build. We provide some useful subtargets here:"
8383
@echo ""
@@ -86,8 +86,8 @@ dev-targets:
8686

8787
help-install:
8888
@echo ""
89-
@echo "The Dune-based Coq build is split into several packages; see Dune and dev/doc"
90-
@echo "documentation for more details. A quick install of Coq alone can be done with"
89+
@echo "The Dune-based Rocq build is split into several packages; see Dune and dev/doc"
90+
@echo "documentation for more details. A quick install of Rocq alone can be done with"
9191
@echo ""
9292
@echo " $$ ./configure -prefix <install_prefix>"
9393
@echo " $$ make dunestrap"
@@ -98,12 +98,12 @@ help-install:
9898
@echo ""
9999
@echo " - rocq-runtime: base Rocq package, toplevel compilers, plugins, tools, no corelib, no stdlib, no GTK"
100100
@echo " - coq-core: compat binaries (coqc instead of rocq compile, etc)"
101-
@echo " - rocq-core: Coq's prelude and corelib"
101+
@echo " - rocq-core: Rocq's prelude and corelib"
102102
@echo " - coqide-server: XML protocol language server"
103103
@echo " - coqide: CoqIDE gtk application"
104104
@echo " - rocq: meta package depending on rocq-runtime rocq-core rocq-stdlib"
105105
@echo " (also calls the test suite when using --with-test)"
106-
@echo " - coq: meta package depending on rocq-runtime coq-core rocq-core rocq-stdlib coq-stdlib"
106+
@echo " - coq: meta package depending on rocq coq-core coq-stdlib"
107107
@echo " (also calls the test suite when using --with-test)"
108108
@echo ""
109109
@echo " To build a package, you can use:"
@@ -116,7 +116,7 @@ help-install:
116116
@echo " - 'dune install --prefix=<install_prefix> package'"
117117
@echo ""
118118
@echo " Note that '--prefix' must be passed to dune install. The '-prefix' passed to"
119-
@echo " configure tells Coq where to look for libraries."
119+
@echo " configure tells Rocq where to look for libraries."
120120
@echo ""
121121
@echo " Note that building a package in release mode ignores other packages present in"
122122
@echo " the worktree. See Dune documentation for more information."
@@ -197,7 +197,7 @@ release: theories/dune
197197

198198
# We define this target as to override Make's built-in one
199199
install:
200-
@echo "To install Coq using dune, use 'dune build -p P && dune install P'"
200+
@echo "To install Rocq using dune, use 'dune build -p P && dune install P'"
201201
@echo "where P is any of the packages defined by opam files in the root dir"
202202
@false
203203

@@ -252,9 +252,9 @@ export CI_PURE_DUNE
252252
include Makefile.ci
253253

254254
# Custom targets to create subsets of the world target but with less
255-
# compiled files. This is desired when we want to have our Coq Dune
256-
# build with Coq developments that are not dunerized and thus still
257-
# expect an install layout with a working Coq setup, but smaller than
255+
# compiled files. This is desired when we want to have our Rocq Dune
256+
# build with Rocq developments that are not dunerized and thus still
257+
# expect an install layout with a working Rocq setup, but smaller than
258258
# world.
259259
#
260260
# Unfortunately, Dune still lacks the capability to refer to install

boot/dune

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
; This library must have no dependencies except config, as it is a
2-
; dependency for most Coq command line tools.
2+
; dependency for most Rocq command line tools.
33
(library
44
(name boot)
55
(public_name rocq-runtime.boot)
6-
(synopsis "Coq Enviroment and Paths facilities")
6+
(synopsis "Rocq Enviroment and Paths facilities")
77
; until ocaml/dune#4892 fixed
88
; (private_modules util)
99
(libraries rocq-runtime.config))

boot/env.mli

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
(* * (see LICENSE file for the text of the license) *)
99
(************************************************************************)
1010

11-
(** Coq runtime enviroment API.
11+
(** Rocq runtime enviroment API.
1212
13-
This module provides functions for manipulation of Coq's runtime
13+
This module provides functions for manipulation of Rocq's runtime
1414
enviroment, including the standard directories and support files.
1515
1616
This API is similar in spirit to findlib's or dune-sites API,
@@ -21,7 +21,7 @@ see their documentation for more information:
2121
2222
It is important that this library has a minimal dependency set.
2323
24-
The Coq runtime enviroment needs to be properly initialized before use;
24+
The Rocq runtime enviroment needs to be properly initialized before use;
2525
we detail the rules below. It is recommended that applications requiring
2626
multiple accesses to the environment, do initialize it once and keep a ref
2727
to it. We don't forbid yet double initialization, (second time is a noop)
@@ -44,7 +44,7 @@ as of now this sets both [coqlib] and [coqcorelib]; this part of the initializat
4444
will be eventually moved here.
4545
4646
The error handling policy of this module is simple for now: failing to
47-
initialize Coq's env will produce a fatal error, and the application will exit with
47+
initialize Rocq's env will produce a fatal error, and the application will exit with
4848
code 1. No error handling is thus required on the client yet.
4949
5050
*)
@@ -72,10 +72,10 @@ module Path : sig
7272

7373
end
7474

75-
(** Coq runtime enviroment, including location of Coq's stdlib *)
75+
(** Rocq runtime enviroment, including location of Rocq's stdlib *)
7676
type t
7777

78-
(** [init ()] will initialize the Coq environment. *)
78+
(** [init ()] will initialize the Rocq environment. *)
7979
val init : unit -> t
8080

8181
(** [stdlib directory] *)

clib/cString.mli

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ sig
3434
(** Remove the eventual first surrounding simple quotes of a string. *)
3535

3636
val quote_coq_string : string -> string
37-
(** Quote a string according to Coq conventions (i.e. doubling
37+
(** Quote a string according to Rocq conventions (i.e. doubling
3838
double quotes and surrounding by double quotes) *)
3939

4040
val unquote_coq_string : string -> string option
41-
(** Unquote a quoted string according to Coq conventions
41+
(** Unquote a quoted string according to Rocq conventions
4242
(i.e. removing surrounding double quotes and undoubling double
4343
quotes); returns [None] if not a quoted string *)
4444

clib/unicode.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type status
1515
(** Classify a unicode char into 3 classes or unknown. *)
1616
val classify : int -> status
1717

18-
(** Return [None] if a given string can be used as a (Coq) identifier.
18+
(** Return [None] if a given string can be used as a (Rocq) identifier.
1919
Return [Some (b,s)] otherwise, where [s] is an explanation and [b] is severity. *)
2020
val ident_refutation : string -> (bool * string) option
2121

config/coq_config.mli

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ val arch : string (* architecture *)
3434
(* dubious use in envars, use in coqmakefile *)
3535
val arch_is_win32 : bool
3636

37-
val version : string (* version number of Coq *)
38-
val caml_version : string (* OCaml version used to compile Coq *)
39-
val caml_version_nums : int list (* OCaml version used to compile Coq by components *)
37+
val version : string (* version number of Rocq *)
38+
val caml_version : string (* OCaml version used to compile Rocq *)
39+
val caml_version_nums : int list (* OCaml version used to compile Rocq by components *)
4040
val vo_version : int32
4141

4242
(* used in envars for coq_makefile *)

config/dune

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(library
22
(name config)
3-
(synopsis "Coq Configuration Variables")
3+
(synopsis "Rocq Configuration Variables")
44
(public_name rocq-runtime.config)
55
(modules coq_config)
66
(wrapped false))
@@ -11,7 +11,7 @@
1111

1212
(library
1313
(name byte_config)
14-
(synopsis "Coq Configuration Variables (for bytecode only)")
14+
(synopsis "Rocq Configuration Variables (for bytecode only)")
1515
(public_name rocq-runtime.config.byte)
1616
(modules coq_byte_config)
1717
(wrapped false)

coq-core.opam

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
opam-version: "2.0"
33
version: "dev"
44
synopsis: "Compatibility binaries for Coq after the Rocq renaming"
5-
maintainer: ["The Coq development team <[email protected]>"]
6-
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
5+
maintainer: ["The Rocq development team <[email protected]>"]
6+
authors: ["The Rocq development team, INRIA, CNRS, and contributors"]
77
license: "LGPL-2.1-only"
88
homepage: "https://coq.inria.fr/"
99
doc: "https://coq.github.io/doc/"

coq-doc.opam

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ algorithms and theorems together with an environment for
99
semi-interactive development of machine-checked proofs.
1010

1111
This package provides the Coq Reference Manual."""
12-
maintainer: ["The Coq development team <[email protected]>"]
13-
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
12+
maintainer: ["The Rocq development team <[email protected]>"]
13+
authors: ["The Rocq development team, INRIA, CNRS, and contributors"]
1414
license: "OPUBL-1.0"
1515
homepage: "https://coq.inria.fr/"
1616
doc: "https://coq.github.io/doc/"

coq.opam

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
opam-version: "2.0"
33
version: "dev"
44
synopsis: "Compatibility metapackage for Coq after the Rocq renaming"
5-
maintainer: ["The Coq development team <[email protected]>"]
6-
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
5+
maintainer: ["The Rocq development team <[email protected]>"]
6+
authors: ["The Rocq development team, INRIA, CNRS, and contributors"]
77
license: "LGPL-2.1-only"
88
homepage: "https://coq.inria.fr/"
99
doc: "https://coq.github.io/doc/"

coqide-server.opam

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ This package provides the `coqidetop` language server, an
1212
implementation of Coq's [XML protocol](https://github.com/coq/coq/blob/master/dev/doc/xml-protocol.md)
1313
which allows clients, such as CoqIDE, to interact with Coq in a
1414
structured way."""
15-
maintainer: ["The Coq development team <[email protected]>"]
16-
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
15+
maintainer: ["The Rocq development team <[email protected]>"]
16+
authors: ["The Rocq development team, INRIA, CNRS, and contributors"]
1717
license: "LGPL-2.1-only"
1818
homepage: "https://coq.inria.fr/"
1919
doc: "https://coq.github.io/doc/"

coqide.opam

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ semi-interactive development of machine-checked proofs.
1010

1111
This package provides the CoqIDE, a graphical user interface for the
1212
development of interactive proofs."""
13-
maintainer: ["The Coq development team <[email protected]>"]
14-
authors: ["The Coq development team, INRIA, CNRS, and contributors"]
13+
maintainer: ["The Rocq development team <[email protected]>"]
14+
authors: ["The Rocq development team, INRIA, CNRS, and contributors"]
1515
license: "LGPL-2.1-only"
1616
homepage: "https://coq.inria.fr/"
1717
doc: "https://coq.github.io/doc/"

0 commit comments

Comments
 (0)