Skip to content

Commit 8e6bd74

Browse files
committed
chore: replace mentions of master branch with main
1 parent f06d38e commit 8e6bd74

Some content is hidden

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

48 files changed

+25900
-27310
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RVERSION?=1.3.5
99
PYVERSION?=0.10.1
1010

1111
# Available versions
12-
CVERSIONS ?= '0.9.0 0.9.4 0.9.5 0.9.6 0.9.7 0.9.8 0.9.9 0.9.10 0.10.0 0.10.1 0.10.2 0.10.3 0.10.4 0.10.5 0.10.6 0.10.7 0.10.8 0.10.9 0.10.10 0.10.11 0.10.12 0.10.13 0.10.15 0.10.16 0.10.17 master develop'
12+
CVERSIONS ?= '0.9.0 0.9.4 0.9.5 0.9.6 0.9.7 0.9.8 0.9.9 0.9.10 0.10.0 0.10.1 0.10.2 0.10.3 0.10.4 0.10.5 0.10.6 0.10.7 0.10.8 0.10.9 0.10.10 0.10.11 0.10.12 0.10.13 0.10.15 0.10.16 0.10.17 main develop'
1313
RVERSIONS ?= '1.2.3 1.2.4 1.2.5 1.2.6 1.2.7 1.3.0 1.3.1 1.3.2 1.3.3 1.3.4 1.3.5'
1414
PYVERSIONS ?= '0.9.6 0.9.7 0.9.8 0.9.9 0.9.10 0.9.11 0.10.0 0.10.1'
1515
PYCVERSIONS ?= '0.9.4 0.9.4 0.9.4 0.9.6 0.9.8 0.9.9 0.10.0 0.10.1'

_includes/igraph-cversions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.9.0 0.9.4 0.9.5 0.9.6 0.9.7 0.9.8 0.9.9 0.9.10 0.10.0 0.10.1 0.10.2 0.10.3 0.10.4 0.10.5 0.10.6 0.10.7 0.10.8 0.10.9 0.10.10 0.10.11 0.10.12 0.10.13 0.10.15 0.10.16 0.10.17 master develop
1+
0.9.0 0.9.4 0.9.5 0.9.6 0.9.7 0.9.8 0.9.9 0.9.10 0.10.0 0.10.1 0.10.2 0.10.3 0.10.4 0.10.5 0.10.6 0.10.7 0.10.8 0.10.9 0.10.10 0.10.11 0.10.12 0.10.13 0.10.15 0.10.16 0.10.17 main develop

_tools/c_build_versioned.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ CFOLDER=${1}
55
CVERSIONS=${2}
66

77
CFOLDER_ABS=$(realpath $CFOLDER)
8-
IFS=' '; read -ra CVERSIONS <<< $CVERSIONS
8+
IFS=' '
9+
read -ra CVERSIONS <<<$CVERSIONS
910

1011
ROOT_ABS=$(pwd)
1112

@@ -17,7 +18,7 @@ mkdir -p build/doc/pdf
1718
for i in "${!CVERSIONS[@]}"; do
1819
version=${CVERSIONS[$i]}
1920

20-
if [ "${version}" != "master" -a "${version}" != "develop" ]; then
21+
if [ "${version}" != "main" -a "${version}" != "develop" ]; then
2122
SKIP=0
2223
if [ -f "${ROOT_ABS}/c/html/${version}/index.html" -a -d "${ROOT_ABS}/c/pdf/${version}" ]; then
2324
SKIP=1
@@ -34,8 +35,8 @@ for i in "${!CVERSIONS[@]}"; do
3435
echo "Building version: $version"
3536

3637
git checkout $version
37-
if [ "${version}" = "master" -o "${version}" = "develop" ]; then
38-
# 'master' and 'develop' are "moving targets", we need to pull
38+
if [ "${version}" = "main" -o "${version}" = "develop" ]; then
39+
# 'main' and 'develop' are "moving targets", we need to pull
3940
git pull
4041
fi
4142

c/html/develop/igraph-Games.html

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ <h3 class="title">Warning</h3>
12511251
<a class="indexterm" name="id-1.13.3.12.2"></a><p>
12521252
</p>
12531253
<div class="informalexample"><pre class="programlisting">
1254-
igraph_error_t igraph_correlated_game(const igraph_t *old_graph, igraph_t *new_graph,
1254+
igraph_error_t igraph_correlated_game(igraph_t *new_graph, const igraph_t *old_graph,
12551255
igraph_real_t corr, igraph_real_t p,
12561256
const igraph_vector_int_t *permutation);
12571257
</pre></div>
@@ -1274,15 +1274,15 @@ <h3 class="title">Warning</h3>
12741274
</colgroup>
12751275
<tbody>
12761276
<tr>
1277-
<td><p><span class="term"><em class="parameter"><code>old_graph</code></em>:</span></p></td>
1277+
<td><p><span class="term"><em class="parameter"><code>new_graph</code></em>:</span></p></td>
12781278
<td><p>
1279-
The original graph, it must be simple.
1279+
The new graph to initialize based on an existing graph.
12801280
</p></td>
12811281
</tr>
12821282
<tr>
1283-
<td><p><span class="term"><em class="parameter"><code>new_graph</code></em>:</span></p></td>
1283+
<td><p><span class="term"><em class="parameter"><code>old_graph</code></em>:</span></p></td>
12841284
<td><p>
1285-
The new graph will be stored here.
1285+
The original graph, which must be a simple graph.
12861286
</p></td>
12871287
</tr>
12881288
<tr>
@@ -1304,8 +1304,10 @@ <h3 class="title">Warning</h3>
13041304
<td><p><span class="term"><em class="parameter"><code>permutation</code></em>:</span></p></td>
13051305
<td><p>
13061306
A permutation to apply to the vertices of the
1307-
generated graph. It can also be a null pointer, in which case
1308-
the vertices will not be permuted.
1307+
generated graph. The i-th element of the permutation vector
1308+
encodes the index of the vertex in the <span class="emphasis"><em>original</em></span> graph that will
1309+
become the i-th vertex in the generated graph. It can also be a null
1310+
pointer, in which case the vertices will not be permuted.
13091311
</p></td>
13101312
</tr>
13111313
</tbody>
@@ -1417,8 +1419,10 @@ <h3 class="title">Warning</h3>
14171419
<td><p><span class="term"><em class="parameter"><code>permutation</code></em>:</span></p></td>
14181420
<td><p>
14191421
A permutation to apply to the vertices of the
1420-
second graph. It can also be a null pointer, in which case
1421-
the vertices will not be permuted.
1422+
second graph. The i-th element of the permutation vector
1423+
encodes the index of the vertex in the <span class="emphasis"><em>first</em></span> graph that will
1424+
become the i-th vertex in the second graph. It can also be a null
1425+
pointer, in which case the vertices will not be permuted.
14221426
</p></td>
14231427
</tr>
14241428
</tbody>

c/html/develop/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ <h3 class="author">
6363
</div>
6464
</div>
6565
</div></div>
66-
<div><p class="releaseinfo">1.0.0-rc1-107-g0454d55f5</p></div>
66+
<div><p class="releaseinfo">1.0.0-rc1-109-ga72dcdce5</p></div>
6767
<div><div class="legalnotice">
68-
<a name="id-1.1.4"></a><p>This manual is for igraph, version 1.0.0-rc1-107-g0454d55f5.</p>
68+
<a name="id-1.1.4"></a><p>This manual is for igraph, version 1.0.0-rc1-109-ga72dcdce5.</p>
6969
<p>
7070
Copyright (C) 2005-2019 Gábor Csárdi and Tamás Nepusz.
7171
Copyright (C) 2020-2025 igraph development team.

0 commit comments

Comments
 (0)